Skip to content

Commit

Permalink
impoved build script with more logging
Browse files Browse the repository at this point in the history
  • Loading branch information
MehVahdJukaar committed Aug 4, 2024
1 parent 2793551 commit e120cba
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 32 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ dependencies {
runtimeOnly fg.deobf("curse.maven:spark-361579:${deps.spark}")

//implementation fg.deobf("org.violetmoon.zeta:Zeta:1.0-21")
implementation fg.deobf("curse.maven:zeta-968868:5593875")
implementation fg.deobf("curse.maven:zeta-968868:5594191")
implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${deps.terrablender}")
implementation fg.deobf("curse.maven:jei-238222:${deps.jei}")
implementation fg.deobf("curse.maven:flan-forge-493246:${deps.flan}")
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ mod_name=Quark
mc_version=1.20.1
mapping_channel=official
mod_id=quark
build_number=461
build_number=460
dir_output=../Build Output/Quark/
23 changes: 1 addition & 22 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1 @@
Requires Zeta 1.0-20
(sorry for double release i messed up)

-Fallen logs can rarely spawn on water
- Fallen logs can no longer spawn on ice and other non terrain blocks (added tag for them)
- Fallen log decoration (moss and vines) are now biome temperature and humidify dependent. No more moss in snowy biomes
- Freestanding ladders will now break off the wall when you break the top block
- Matrix Enchanting Table appears in creative if automaticallyConvert is off
- Fixed Skull Pikes not functioning when there's a block on top, by lowering the detection point
- Fixed Hanging sign recipes using log instead of stripped log
- Fixed pickarang logic for hardness calculation not using the item correctly. AS a consequence this fixes some exploits with it
- Pickarang will now emit block particles when hitting a block it cant break
- Creative players can break any block with a pickarang
- Added more magnet related configs
- Added unique pickarang damage type and death message
- Added a new beach zombie villager texture
- Added ocean villager type
- Fixed Gray parrot egg being called "Grey"
- Fixed many render and tick events firing twice. Performance goes brr
- Fixed magnets blacklist not working as intented with derived recipes. Shulker boxes are no longer movable
- Chutes can spit out items when they have any block below with enough clearance as opposed to just air and a few selected other blocks
- Added new game nerf feature that allows villages to spawn more rarely around spawn and have also a greater chance of being zombie ones
Re built and published because for some arcane reason previous version didn't work?
23 changes: 15 additions & 8 deletions push_tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
def main():
build = Properties()
with open('build.properties', 'rb') as f:
build.load(f , "utf-8")
build.load(f , "utf-8")

mc_version, mcv_meta = build['mc_version']
version, v_meta = build['version']
Expand All @@ -15,18 +15,25 @@ def main():
print('Version:', version)
print('Build Number', build_number)

changelog = '-m "Changelog:" '
changelog = ''
with open('changelog.txt', 'r') as f:
content = f.read()
content = content.replace('"', '\'')
lines = content.splitlines()
for line in lines:
changelog = changelog + '-m "'+line+'" '

tag_success = os.system('git tag -a release-{}-{}-{} {}'.format(mc_version, version, build_number, changelog))

if tag_success != 0:
print('Failed to create tag')
return
else :
print('Created tag')

content = content.replace('"', '\'');
changelog = changelog + re.sub(r'(- .+)\n?', '-m "\g<1>" ', content)

os.system('git tag -a release-{}-{}-{} {}'.format(mc_version, version, build_number, changelog))

build['build_number'] = str(int(build_number) + 1)
with open("build.properties", "wb") as f:
build.store(f, encoding="utf-8")
build.store(f, encoding="utf-8")

os.system('git commit -a -m build')
os.system('git push origin master release-{}-{}-{}'.format(mc_version, version, build_number))
Expand Down

0 comments on commit e120cba

Please sign in to comment.