Skip to content

Commit e120cba

Browse files
committed
impoved build script with more logging
1 parent 2793551 commit e120cba

File tree

4 files changed

+18
-32
lines changed

4 files changed

+18
-32
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ dependencies {
125125
runtimeOnly fg.deobf("curse.maven:spark-361579:${deps.spark}")
126126

127127
//implementation fg.deobf("org.violetmoon.zeta:Zeta:1.0-21")
128-
implementation fg.deobf("curse.maven:zeta-968868:5593875")
128+
implementation fg.deobf("curse.maven:zeta-968868:5594191")
129129
implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${deps.terrablender}")
130130
implementation fg.deobf("curse.maven:jei-238222:${deps.jei}")
131131
implementation fg.deobf("curse.maven:flan-forge-493246:${deps.flan}")

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ mod_name=Quark
55
mc_version=1.20.1
66
mapping_channel=official
77
mod_id=quark
8-
build_number=461
8+
build_number=460
99
dir_output=../Build Output/Quark/

changelog.txt

+1-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1 @@
1-
Requires Zeta 1.0-20
2-
(sorry for double release i messed up)
3-
4-
-Fallen logs can rarely spawn on water
5-
- Fallen logs can no longer spawn on ice and other non terrain blocks (added tag for them)
6-
- Fallen log decoration (moss and vines) are now biome temperature and humidify dependent. No more moss in snowy biomes
7-
- Freestanding ladders will now break off the wall when you break the top block
8-
- Matrix Enchanting Table appears in creative if automaticallyConvert is off
9-
- Fixed Skull Pikes not functioning when there's a block on top, by lowering the detection point
10-
- Fixed Hanging sign recipes using log instead of stripped log
11-
- Fixed pickarang logic for hardness calculation not using the item correctly. AS a consequence this fixes some exploits with it
12-
- Pickarang will now emit block particles when hitting a block it cant break
13-
- Creative players can break any block with a pickarang
14-
- Added more magnet related configs
15-
- Added unique pickarang damage type and death message
16-
- Added a new beach zombie villager texture
17-
- Added ocean villager type
18-
- Fixed Gray parrot egg being called "Grey"
19-
- Fixed many render and tick events firing twice. Performance goes brr
20-
- Fixed magnets blacklist not working as intented with derived recipes. Shulker boxes are no longer movable
21-
- 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
22-
- Added new game nerf feature that allows villages to spawn more rarely around spawn and have also a greater chance of being zombie ones
1+
Re built and published because for some arcane reason previous version didn't work?

push_tag.py

+15-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
def main():
66
build = Properties()
77
with open('build.properties', 'rb') as f:
8-
build.load(f , "utf-8")
8+
build.load(f , "utf-8")
99

1010
mc_version, mcv_meta = build['mc_version']
1111
version, v_meta = build['version']
@@ -15,18 +15,25 @@ def main():
1515
print('Version:', version)
1616
print('Build Number', build_number)
1717

18-
changelog = '-m "Changelog:" '
18+
changelog = ''
1919
with open('changelog.txt', 'r') as f:
2020
content = f.read()
21+
content = content.replace('"', '\'')
22+
lines = content.splitlines()
23+
for line in lines:
24+
changelog = changelog + '-m "'+line+'" '
25+
26+
tag_success = os.system('git tag -a release-{}-{}-{} {}'.format(mc_version, version, build_number, changelog))
27+
28+
if tag_success != 0:
29+
print('Failed to create tag')
30+
return
31+
else :
32+
print('Created tag')
2133

22-
content = content.replace('"', '\'');
23-
changelog = changelog + re.sub(r'(- .+)\n?', '-m "\g<1>" ', content)
24-
25-
os.system('git tag -a release-{}-{}-{} {}'.format(mc_version, version, build_number, changelog))
26-
2734
build['build_number'] = str(int(build_number) + 1)
2835
with open("build.properties", "wb") as f:
29-
build.store(f, encoding="utf-8")
36+
build.store(f, encoding="utf-8")
3037

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

0 commit comments

Comments
 (0)