Skip to content

Commit 4e9376b

Browse files
OptiJavaOptiJava
committed
chore: add support for 1.21.5
1 parent d095cc5 commit 4e9376b

File tree

14 files changed

+161
-143
lines changed

14 files changed

+161
-143
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -85,62 +85,7 @@ jobs:
8585
retry-attempts: 3
8686
retry-delay: 10000
8787

88-
- name: Publish Minecraft Mods 1.18
89-
uses: Kir-Antipov/mc-publish@v3.3
90-
with:
91-
modrinth-id: SB7oe4aB
92-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
93-
94-
curseforge-id: 891699
95-
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
96-
97-
files: processed_artifacts/1.18.2/*.jar
98-
99-
name: v${{ inputs.version }} For Minecraft 1.18
100-
version: v${{ inputs.version }}
101-
version-type: ${{ inputs.release_type }}
102-
103-
loaders: fabric
104-
game-versions: '1.18.2'
105-
game-version-filter: any
106-
dependencies: |-
107-
carpet(required)
108-
fabric-api(required)
109-
110-
modrinth-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
111-
curseforge-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
112-
113-
retry-attempts: 3
114-
retry-delay: 10000
115-
- name: Publish Minecraft Mods 1.19.3
116-
uses: Kir-Antipov/mc-publish@v3.3
117-
with:
118-
modrinth-id: SB7oe4aB
119-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
120-
121-
curseforge-id: 891699
122-
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
123-
124-
files: processed_artifacts/1.19.3/*.jar
125-
126-
name: v${{ inputs.version }} For Minecraft 1.19.3
127-
version: v${{ inputs.version }}
128-
version-type: ${{ inputs.release_type }}
129-
130-
loaders: fabric
131-
game-versions: '1.19.3'
132-
game-version-filter: any
133-
dependencies: |-
134-
carpet(required)
135-
fabric-api(required)
136-
137-
modrinth-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
138-
curseforge-changelog: 'Got full change logs in [GitHub](https://github.com/OptiJava/OptCarpetAddition/releases).'
139-
140-
retry-attempts: 3
141-
retry-delay: 10000
142-
143-
- name: Publish Minecraft Mods 1.20.1
88+
- name: Publish Minecraft Mods 1.20.4
14489
uses: Kir-Antipov/mc-publish@v3.3
14590
with:
14691
modrinth-id: SB7oe4aB
@@ -149,14 +94,14 @@ jobs:
14994
curseforge-id: 891699
15095
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
15196

152-
files: processed_artifacts/1.20.1/*.jar
97+
files: processed_artifacts/1.20.4/*.jar
15398

154-
name: v${{ inputs.version }} For Minecraft 1.20.1
99+
name: v${{ inputs.version }} For Minecraft 1.20.4
155100
version: v${{ inputs.version }}
156101
version-type: ${{ inputs.release_type }}
157102

158103
loaders: fabric
159-
game-versions: '1.20.1'
104+
game-versions: '1.20.4'
160105
game-version-filter: any
161106
dependencies: |-
162107
carpet(required)
@@ -168,7 +113,7 @@ jobs:
168113
retry-attempts: 3
169114
retry-delay: 10000
170115

171-
- name: Publish Minecraft Mods 1.20.4
116+
- name: Publish Minecraft Mods 1.21
172117
uses: Kir-Antipov/mc-publish@v3.3
173118
with:
174119
modrinth-id: SB7oe4aB
@@ -177,14 +122,14 @@ jobs:
177122
curseforge-id: 891699
178123
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
179124

180-
files: processed_artifacts/1.20.4/*.jar
125+
files: processed_artifacts/1.21/*.jar
181126

182-
name: v${{ inputs.version }} For Minecraft 1.20.4
127+
name: v${{ inputs.version }} For Minecraft 1.21
183128
version: v${{ inputs.version }}
184129
version-type: ${{ inputs.release_type }}
185130

186131
loaders: fabric
187-
game-versions: '1.20.4'
132+
game-versions: '1.21'
188133
game-version-filter: any
189134
dependencies: |-
190135
carpet(required)
@@ -196,7 +141,7 @@ jobs:
196141
retry-attempts: 3
197142
retry-delay: 10000
198143

199-
- name: Publish Minecraft Mods 1.21
144+
- name: Publish Minecraft Mods 1.21.5
200145
uses: Kir-Antipov/mc-publish@v3.3
201146
with:
202147
modrinth-id: SB7oe4aB
@@ -205,14 +150,14 @@ jobs:
205150
curseforge-id: 891699
206151
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
207152

208-
files: processed_artifacts/1.21/*.jar
153+
files: processed_artifacts/1.21.5/*.jar
209154

210-
name: v${{ inputs.version }} For Minecraft 1.21
155+
name: v${{ inputs.version }} For Minecraft 1.21.5
211156
version: v${{ inputs.version }}
212157
version-type: ${{ inputs.release_type }}
213158

214159
loaders: fabric
215-
game-versions: '1.21'
160+
game-versions: '1.21.5'
216161
game-version-filter: any
217162
dependencies: |-
218163
carpet(required)

‎build.gradle‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@ plugins {
77

88
preprocess {
99
def mc117 = createNode('1.17.1' , 1_17_01, 'yarn')
10-
def mc118 = createNode('1.18.2' , 1_18_02, 'yarn')
11-
def mc1193 = createNode('1.19.3' , 1_19_03, 'yarn')
12-
def mc1201 = createNode('1.20.1' , 1_20_01, 'yarn')
1310
def mc1204 = createNode('1.20.4' , 1_20_04, 'yarn')
1411
def mc1210 = createNode('1.21' , 1_21_00, 'yarn')
12+
def mc1215 = createNode('1.21.5' , 1_21_05, 'yarn')
1513

16-
mc117 .link(mc118, null)
17-
mc118 .link(mc1193, null)
18-
mc1193.link(mc1201, null)
19-
mc1201.link(mc1204, null)
14+
mc117 .link(mc1204, null)
2015
mc1204.link(mc1210, null)
16+
mc1210.link(mc1215, null)
2117
}

‎common.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version = simple_version + '-' + project.minecraft_version
1212

1313
group = project.maven_group
1414

15-
if (mcVersion >= 12005) {
15+
if (project.mcVersion >= 12005) {
1616
sourceCompatibility = JavaVersion.VERSION_21
1717
targetCompatibility = JavaVersion.VERSION_21
1818
} else if (project.mcVersion >= 11800) {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.parallel=true
44
org.gradle.workers.max=3
55

66
# Fabric Configurations
7-
loader_version=0.15.11
7+
loader_version=0.16.14
88
loader_requirement_version=>=0.15
99

1010
# Mod Metadata

‎src/main/java/io/github/optijava/opt_carpet_addition/mixins/logger/blockUpdate/ChainRestrictedNeighborUpdater_Mixin.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,30 @@
2828
//$$
2929
//$$ if (entry instanceof ChainRestrictedNeighborUpdater.SimpleEntry simpleEntry) {
3030
//$$ sourceBlock = simpleEntry.sourceBlock();
31-
//$$ centreBlockPos = simpleEntry.sourcePos();
31+
//$$ //#if MC < 12105
32+
//$$ //$$ centreBlockPos = simpleEntry.sourcePos();
33+
//$$ //#endif
3234
//$$ } else if (entry instanceof ChainRestrictedNeighborUpdater.StatefulEntry statefulEntry) {
3335
//$$ sourceBlock = statefulEntry.sourceBlock();
34-
//$$ centreBlockPos = statefulEntry.sourcePos();
36+
//$$ //#if MC < 12105
37+
//$$ //$$ centreBlockPos = statefulEntry.sourcePos();
38+
//$$ //#endif
3539
//$$ } else if (entry instanceof ChainRestrictedNeighborUpdater.SixWayEntry sixWayEntry) {
3640
//$$ sourceBlock = sixWayEntry.sourceBlock;
37-
//$$ centreBlockPos = sixWayEntry.pos;
41+
//$$ //#if MC < 12105
42+
//$$ //$$ centreBlockPos = sixWayEntry.pos;
43+
//$$ //#endif
3844
//$$ } else if (entry instanceof ChainRestrictedNeighborUpdater.StateReplacementEntry stateReplacementEntry) {
3945
//$$ sourceBlock = stateReplacementEntry.neighborState().getBlock();
40-
//$$ centreBlockPos = stateReplacementEntry.neighborPos();
46+
//$$ //#if MC < 12105
47+
//$$ //$$ centreBlockPos = stateReplacementEntry.neighborPos();
48+
//$$ //#endif
4149
//$$ }
42-
//$$
50+
//$$ //#if MC >= 12105
51+
//$$ //$$ BlockUpdateLogger.INSTANCE.logBlockUpdate(updatingBlock, updatingBlockPos, sourceBlock);
52+
//$$ //#else
4353
//$$ BlockUpdateLogger.INSTANCE.logBlockUpdate(updatingBlock, updatingBlockPos, sourceBlock, centreBlockPos);
54+
//$$ //#endif
4455
//$$ }
4556
//$$ }
4657
//$$ }

‎src/main/java/io/github/optijava/opt_carpet_addition/mixins/logger/blockUpdate/SimpleNeighborUpdater_Mixin.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,24 @@
1111
//$$ import org.spongepowered.asm.mixin.injection.At;
1212
//$$ import org.spongepowered.asm.mixin.injection.Inject;
1313
//$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
14+
//$$ //#if MC >= 12105
15+
//$$ //$$ import net.minecraft.world.block.WireOrientation;
16+
//$$ //#endif
1417
//$$
1518
//$$ @Mixin(SimpleNeighborUpdater.class)
1619
//$$ public class SimpleNeighborUpdater_Mixin {
1720
//$$
21+
//$$ //#if MC >= 12105
22+
//$$ //$$ @Inject(
23+
//$$ //$$ method = "updateNeighbor(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/world/block/WireOrientation;Z)V",
24+
//$$ //$$ at = @At("HEAD")
25+
//$$ //$$ )
26+
//$$ //$$ private void injectUpdateNeighbor(BlockState state, BlockPos pos, Block sourceBlock, WireOrientation orientation, boolean notify, CallbackInfo ci) {
27+
//$$ //$$ if (OptCarpetSettings.allowBlockUpdateLogger) {
28+
//$$ //$$ BlockUpdateLogger.INSTANCE.logBlockUpdate(state.getBlock(), pos, sourceBlock);
29+
//$$ //$$ }
30+
//$$ //$$ }
31+
//$$ //#else
1832
//$$ @Inject(
1933
//$$ method = "updateNeighbor(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/Block;Lnet/minecraft/util/math/BlockPos;Z)V",
2034
//$$ at = @At("HEAD")
@@ -24,5 +38,6 @@
2438
//$$ BlockUpdateLogger.INSTANCE.logBlockUpdate(updatingBlockState.getBlock(), updatingBlockPos, sourceBlock, centreBlockPos);
2539
//$$ }
2640
//$$ }
41+
//$$ //#endif
2742
//$$ }
2843
//#endif

‎versions/1.18.2/gradle.properties‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎versions/1.18.2/opt-carpet-addition.accesswidener‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎versions/1.19.3/gradle.properties‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎versions/1.20.1/opt-carpet-addition.accesswidener‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)