Skip to content

Commit 211485e

Browse files
OpenBagTwoOpenBagTwo
committed
Backport to 1.21.5
1 parent 8efaf79 commit 211485e

18 files changed

+169
-186
lines changed

‎gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
org.gradle.jvmargs=-Xmx1G
22
org.gradle.parallel=true
33
# Fabric Properties
4-
minecraft_version=1.21.7-rc2
5-
yarn_mappings=1.21.7-rc2+build.2
4+
minecraft_version=1.21.5
5+
yarn_mappings=1.21.5+build.1
66
loader_version=0.16.14
77
# Mod Properties
88
mod_version=handled.by.jgitver
99
maven_group=io.github.openbagtwo.lighterend
1010
archives_base_name=lighterend
1111
# Dependencies
12-
fabric_version=0.128.1+1.21.7
13-
modmenu_version=15.0.0-beta.2
12+
fabric_version=0.118.6+1.21.5
13+
modmenu_version=14.0.0-rc.2

‎src/client/java/io/github/openbagtwo/lighterend/blocks/AuroraCrystalRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.openbagtwo.lighterend.blocks;
22

33
import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
4-
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
4+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
55
import net.minecraft.client.color.block.BlockColorProvider;
6-
import net.minecraft.client.render.BlockRenderLayer;
6+
import net.minecraft.client.render.RenderLayer;
77
import net.minecraft.util.math.BlockPos;
88
import net.minecraft.util.math.MathHelper;
99
import net.minecraft.util.math.Vec3i;
@@ -42,8 +42,8 @@ public static BlockColorProvider getBlockColor() {
4242
}
4343

4444
public static void initialize() {
45-
BlockRenderLayerMap.putBlocks(
46-
BlockRenderLayer.TRANSLUCENT,
45+
BlockRenderLayerMap.INSTANCE.putBlocks(
46+
RenderLayer.getTranslucent(),
4747
LighterEndBlocks.AURORA_CRYSTAL
4848
);
4949
}

‎src/client/java/io/github/openbagtwo/lighterend/blocks/CutoutRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.github.openbagtwo.lighterend.blocks;
22

33
import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
4-
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
5-
import net.minecraft.client.render.BlockRenderLayer;
4+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
5+
import net.minecraft.client.render.RenderLayer;
66

77
public class CutoutRenderer {
88

99
public static void initialize() {
10-
BlockRenderLayerMap.putBlocks(
11-
BlockRenderLayer.CUTOUT,
10+
BlockRenderLayerMap.INSTANCE.putBlocks(
11+
RenderLayer.getCutout(),
1212
LighterEndBlocks.CREEPING_MOSS,
1313
LighterEndBlocks.UMBRELLA_FERN,
1414
LighterEndBlocks.TALL_UMBRELLA_FERN,

‎src/client/java/io/github/openbagtwo/lighterend/blocks/EndMossRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
44
import io.github.openbagtwo.lighterend.registries.LighterEndTags;
5-
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
5+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
66
import net.minecraft.client.color.block.BlockColorProvider;
77
import net.minecraft.client.color.world.BiomeColors;
8-
import net.minecraft.client.render.BlockRenderLayer;
8+
import net.minecraft.client.render.RenderLayer;
99
import net.minecraft.registry.entry.RegistryEntry;
1010
import net.minecraft.registry.tag.BiomeTags;
1111
import net.minecraft.world.biome.Biome;
@@ -29,8 +29,8 @@ public static BlockColorProvider getBlockColor() {
2929
}
3030

3131
public static void initialize() {
32-
BlockRenderLayerMap.putBlocks(
33-
BlockRenderLayer.CUTOUT_MIPPED,
32+
BlockRenderLayerMap.INSTANCE.putBlocks(
33+
RenderLayer.getCutoutMipped(),
3434
LighterEndBlocks.END_MOSS
3535
);
3636
}

‎src/client/java/io/github/openbagtwo/lighterend/blocks/UmbralithRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.github.openbagtwo.lighterend.blocks;
22

33
import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
4-
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
5-
import net.minecraft.client.render.BlockRenderLayer;
4+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
5+
import net.minecraft.client.render.RenderLayer;
66

77
public class UmbralithRenderer {
88

99
public static void initialize() {
10-
BlockRenderLayerMap.putBlocks(
11-
BlockRenderLayer.CUTOUT_MIPPED,
10+
BlockRenderLayerMap.INSTANCE.putBlocks(
11+
RenderLayer.getCutoutMipped(),
1212
LighterEndBlocks.UMBRALITH.baseBlock
1313
);
1414
}

‎src/client/java/io/github/openbagtwo/lighterend/blocks/UmbrellaMembraneRenderer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.github.openbagtwo.lighterend.blocks;
22

33
import io.github.openbagtwo.lighterend.registries.LighterEndBlocks;
4-
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
5-
import net.minecraft.client.render.BlockRenderLayer;
4+
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
5+
import net.minecraft.client.render.RenderLayer;
66

77
public class UmbrellaMembraneRenderer {
88

99
public static void initialize() {
10-
BlockRenderLayerMap.putBlocks(
11-
BlockRenderLayer.TRANSLUCENT,
10+
BlockRenderLayerMap.INSTANCE.putBlocks(
11+
RenderLayer.getTranslucent(),
1212
LighterEndBlocks.UMBRELLA_MEMBRANE
1313
);
1414
}

‎src/client/java/io/github/openbagtwo/lighterend/datagen/BiomeTagProvider.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@ public BiomeTagProvider(FabricDataOutput output,
2222

2323
@Override
2424
protected void configure(WrapperLookup lookup) {
25-
builder(BiomeTags.IS_END).add(
25+
getOrCreateTagBuilder(BiomeTags.IS_END).add(
2626
LighterEndBiomes.BLOSSOM_FOREST,
2727
LighterEndBiomes.UMBRELLA_JUNGLE,
2828
LighterEndBiomes.GLOWING_GRASSLAND,
2929
LighterEndBiomes.MEGALAKE,
3030
LighterEndBiomes.UMBRA_VALLEY,
3131
LighterEndBiomes.FOGGY_MUSHROOMLANDS
3232
);
33-
builder(BiomeTags.END_CITY_HAS_STRUCTURE).add(
33+
getOrCreateTagBuilder(BiomeTags.END_CITY_HAS_STRUCTURE).add(
3434
LighterEndBiomes.BLOSSOM_FOREST,
3535
LighterEndBiomes.UMBRELLA_JUNGLE,
3636
LighterEndBiomes.GLOWING_GRASSLAND,
3737
LighterEndBiomes.UMBRA_VALLEY,
3838
LighterEndBiomes.FOGGY_MUSHROOMLANDS
3939
);
4040

41-
builder(LighterEndTags.VANILLA_END_BIOMES).add(
41+
getOrCreateTagBuilder(LighterEndTags.VANILLA_END_BIOMES).add(
4242
BiomeKeys.END_BARRENS,
4343
BiomeKeys.SMALL_END_ISLANDS,
4444
BiomeKeys.END_MIDLANDS,
4545
BiomeKeys.END_HIGHLANDS
4646
);
4747

48-
builder(LighterEndTags.HAS_END_LAKES).addTag(
48+
getOrCreateTagBuilder(LighterEndTags.HAS_END_LAKES).addTag(
4949
LighterEndTags.VANILLA_END_BIOMES
5050
);
51-
builder(LighterEndTags.HAS_END_LAKES).add(
51+
getOrCreateTagBuilder(LighterEndTags.HAS_END_LAKES).add(
5252
LighterEndBiomes.UMBRELLA_JUNGLE,
5353
LighterEndBiomes.GLOWING_GRASSLAND,
5454
LighterEndBiomes.FOGGY_MUSHROOMLANDS

‎src/client/java/io/github/openbagtwo/lighterend/datagen/BlockTagProvider.java

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ protected BlockTagProvider(FabricDataOutput output, CompletableFuture<WrapperLoo
2323
@Override
2424
protected void configure(RegistryWrapper.WrapperLookup lookup) {
2525

26-
valueLookupBuilder(BlockTags.IMPERMEABLE).add(LighterEndBlocks.AURORA_CRYSTAL);
27-
valueLookupBuilder(BlockTags.SNIFFER_DIGGABLE_BLOCK).add(LighterEndBlocks.END_MOSS);
26+
getOrCreateTagBuilder(BlockTags.IMPERMEABLE).add(LighterEndBlocks.AURORA_CRYSTAL);
27+
getOrCreateTagBuilder(BlockTags.SNIFFER_DIGGABLE_BLOCK).add(LighterEndBlocks.END_MOSS);
2828

2929
for (Material material : Arrays.asList(
3030
LighterEndBlocks.VIOLECITE,
@@ -34,16 +34,16 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
3434
LighterEndBlocks.UMBRALITH
3535
)) {
3636
for (Block block : material.blocks) {
37-
valueLookupBuilder(BlockTags.PICKAXE_MINEABLE).add(block);
38-
valueLookupBuilder(BlockTags.WALLS)
37+
getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add(block);
38+
getOrCreateTagBuilder(BlockTags.WALLS)
3939
.add(
4040
material.baseWall,
4141
material.brickWall,
4242
material.polishedWall,
4343
material.tileWall
4444
);
45-
valueLookupBuilder(BlockTags.STONE_BUTTONS).add(material.button);
46-
valueLookupBuilder(BlockTags.STONE_PRESSURE_PLATES).add(material.pressurePlate);
45+
getOrCreateTagBuilder(BlockTags.STONE_BUTTONS).add(material.button);
46+
getOrCreateTagBuilder(BlockTags.STONE_PRESSURE_PLATES).add(material.pressurePlate);
4747
}
4848
}
4949

@@ -54,32 +54,32 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
5454
LighterEndBlocks.GLOWSHROOM
5555
)) {
5656
for (Block block : wood.blocks) {
57-
valueLookupBuilder(BlockTags.AXE_MINEABLE).add(block);
57+
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE).add(block);
5858
}
59-
valueLookupBuilder(BlockTags.AXE_MINEABLE).add(wood.wallSign, wood.wallHangingSign);
60-
valueLookupBuilder(BlockTags.PLANKS).add(wood.planks);
61-
valueLookupBuilder(BlockTags.WOODEN_BUTTONS).add(wood.button);
62-
valueLookupBuilder(BlockTags.WOODEN_DOORS).add(wood.door);
63-
valueLookupBuilder(BlockTags.WOODEN_STAIRS).add(wood.stairs);
64-
valueLookupBuilder(BlockTags.WOODEN_SLABS).add(wood.slab);
65-
valueLookupBuilder(BlockTags.WOODEN_FENCES).add(wood.fence);
66-
valueLookupBuilder(BlockTags.FENCE_GATES).add(wood.gate);
67-
valueLookupBuilder(BlockTags.WOODEN_PRESSURE_PLATES).add(wood.pressurePlate);
68-
valueLookupBuilder(BlockTags.LOGS_THAT_BURN).add(
59+
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE).add(wood.wallSign, wood.wallHangingSign);
60+
getOrCreateTagBuilder(BlockTags.PLANKS).add(wood.planks);
61+
getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(wood.button);
62+
getOrCreateTagBuilder(BlockTags.WOODEN_DOORS).add(wood.door);
63+
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).add(wood.stairs);
64+
getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).add(wood.slab);
65+
getOrCreateTagBuilder(BlockTags.WOODEN_FENCES).add(wood.fence);
66+
getOrCreateTagBuilder(BlockTags.FENCE_GATES).add(wood.gate);
67+
getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES).add(wood.pressurePlate);
68+
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(
6969
wood.log,
7070
wood.strippedLog,
7171
wood.wood,
7272
wood.strippedWood
7373
);
74-
valueLookupBuilder(BlockTags.WOODEN_TRAPDOORS).add(wood.trapdoor);
75-
valueLookupBuilder(BlockTags.STANDING_SIGNS).add(wood.sign);
76-
valueLookupBuilder(BlockTags.WALL_SIGNS).add(wood.wallSign);
77-
valueLookupBuilder(BlockTags.CEILING_HANGING_SIGNS).add(wood.hangingSign);
78-
valueLookupBuilder(BlockTags.WALL_HANGING_SIGNS).add(wood.wallHangingSign);
79-
valueLookupBuilder(BlockTags.CLIMBABLE).add(wood.ladder);
74+
getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS).add(wood.trapdoor);
75+
getOrCreateTagBuilder(BlockTags.STANDING_SIGNS).add(wood.sign);
76+
getOrCreateTagBuilder(BlockTags.WALL_SIGNS).add(wood.wallSign);
77+
getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS).add(wood.hangingSign);
78+
getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS).add(wood.wallHangingSign);
79+
getOrCreateTagBuilder(BlockTags.CLIMBABLE).add(wood.ladder);
8080
}
8181

82-
valueLookupBuilder(BlockTags.PICKAXE_MINEABLE)
82+
getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
8383
.add(LighterEndBlocks.ENDER_BLOCK)
8484
.add(LighterEndBlocks.MISSING_TILE)
8585
.add(
@@ -89,7 +89,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
8989
LighterEndBlocks.END_MOSS
9090
);
9191

92-
valueLookupBuilder(BlockTags.NEEDS_IRON_TOOL)
92+
getOrCreateTagBuilder(BlockTags.NEEDS_IRON_TOOL)
9393
.add(LighterEndBlocks.ENDER_BLOCK);
9494

9595
for (Material jadestone : Arrays.asList(
@@ -98,44 +98,44 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
9898
LighterEndBlocks.VIRID_JADESTONE
9999
)) {
100100
for (Block block : jadestone.blocks) {
101-
valueLookupBuilder(BlockTags.NEEDS_IRON_TOOL).add(block);
101+
getOrCreateTagBuilder(BlockTags.NEEDS_IRON_TOOL).add(block);
102102
}
103103
}
104104

105-
valueLookupBuilder(BlockTags.ENDERMAN_HOLDABLE).add(
105+
getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE).add(
106106
LighterEndBlocks.END_MOSS
107107
);
108-
valueLookupBuilder(BlockTags.ENDERMAN_HOLDABLE).addTag(LighterEndTags.FURS);
108+
getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE).addTag(LighterEndTags.FURS);
109109

110-
valueLookupBuilder(BlockTags.ANIMALS_SPAWNABLE_ON).add(LighterEndBlocks.END_MOSS);
111-
valueLookupBuilder(BlockTags.REPLACEABLE_BY_TREES).add(LighterEndBlocks.END_MOSS);
112-
valueLookupBuilder(BlockTags.SCULK_REPLACEABLE).add(LighterEndBlocks.END_MOSS);
110+
getOrCreateTagBuilder(BlockTags.ANIMALS_SPAWNABLE_ON).add(LighterEndBlocks.END_MOSS);
111+
getOrCreateTagBuilder(BlockTags.REPLACEABLE_BY_TREES).add(LighterEndBlocks.END_MOSS);
112+
getOrCreateTagBuilder(BlockTags.SCULK_REPLACEABLE).add(LighterEndBlocks.END_MOSS);
113113

114-
valueLookupBuilder(BlockTags.FLOWERS).add(
114+
getOrCreateTagBuilder(BlockTags.FLOWERS).add(
115115
LighterEndBlocks.CREEPING_MOSS,
116116
LighterEndBlocks.UMBRELLA_FERN,
117117
LighterEndBlocks.TALL_UMBRELLA_FERN,
118118
LighterEndBlocks.TENANEA_FLOWER,
119119
LighterEndBlocks.END_LOTUS_FLOWER
120120
);
121121

122-
valueLookupBuilder(BlockTags.AXE_MINEABLE).add(
122+
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE).add(
123123
LighterEndBlocks.LUMECORN_STEM,
124124
LighterEndBlocks.END_LOTUS_STEM
125125
);
126126

127-
valueLookupBuilder(BlockTags.SAPLINGS).add(
127+
getOrCreateTagBuilder(BlockTags.SAPLINGS).add(
128128
LighterEndBlocks.TENANEA_SAPLING,
129129
LighterEndBlocks.UMBRELLA_TREE_SAPLING,
130130
LighterEndBlocks.GLOWSHROOM_SAPLING
131131
);
132-
valueLookupBuilder(BlockTags.LEAVES).add(
132+
getOrCreateTagBuilder(BlockTags.LEAVES).add(
133133
LighterEndBlocks.TENANEA_LEAVES,
134134
LighterEndBlocks.GLOWSHROOM_FUR,
135135
LighterEndBlocks.AGAVE_FUR
136136
);
137137

138-
valueLookupBuilder(BlockTags.AXE_MINEABLE).add(
138+
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE).add(
139139
LighterEndBlocks.UMBRELLA_TREE_CLUSTER,
140140
LighterEndBlocks.UMBRELLA_TREE_CLUSTER_EMPTY,
141141
LighterEndBlocks.GLOWSHROOM_CAP,
@@ -144,13 +144,13 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
144144
LighterEndBlocks.AGAVE,
145145
LighterEndBlocks.AGAVE_BULB
146146
);
147-
valueLookupBuilder(BlockTags.FLOWER_POTS).add(
147+
getOrCreateTagBuilder(BlockTags.FLOWER_POTS).add(
148148
LighterEndBlocks.POTTED_TENANEA_SAPLING,
149149
LighterEndBlocks.POTTED_UMBRELLA_SAPLING,
150150
LighterEndBlocks.POTTED_GLOWSHROOM_SAPLING
151151
);
152152

153-
valueLookupBuilder(LighterEndTags.END_MOSS_REPLACEABLE)
153+
getOrCreateTagBuilder(LighterEndTags.END_MOSS_REPLACEABLE)
154154
.add(
155155
Blocks.END_STONE,
156156
Blocks.BLACKSTONE,
@@ -162,12 +162,12 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
162162
Blocks.DEAD_TUBE_CORAL_BLOCK,
163163
LighterEndBlocks.UMBRALITH.baseBlock
164164
);
165-
valueLookupBuilder(LighterEndTags.END_SOIL)
165+
getOrCreateTagBuilder(LighterEndTags.END_SOIL)
166166
.add(
167167
LighterEndBlocks.END_MOSS,
168168
LighterEndBlocks.UMBRALITH.baseBlock
169169
);
170-
valueLookupBuilder(LighterEndTags.END_STONES)
170+
getOrCreateTagBuilder(LighterEndTags.END_STONES)
171171
.add(
172172
Blocks.END_STONE,
173173
Blocks.BLACKSTONE,
@@ -183,7 +183,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
183183
LighterEndBlocks.VIRID_JADESTONE.baseBlock,
184184
LighterEndBlocks.UMBRALITH.baseBlock
185185
);
186-
valueLookupBuilder(LighterEndTags.AQUATIC_END_SOIL)
186+
getOrCreateTagBuilder(LighterEndTags.AQUATIC_END_SOIL)
187187
.add(
188188
Blocks.END_STONE,
189189
Blocks.BLACKSTONE,
@@ -198,7 +198,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
198198
LighterEndBlocks.UMBRALITH.baseBlock,
199199
LighterEndBlocks.END_MOSS // though pretty sure this won't survive underwater
200200
);
201-
valueLookupBuilder(LighterEndTags.AQUATIC_END_VEGETATION)
201+
getOrCreateTagBuilder(LighterEndTags.AQUATIC_END_VEGETATION)
202202
.add(
203203
LighterEndBlocks.CHARNIA_CYAN,
204204
LighterEndBlocks.CHARNIA_GREEN,
@@ -207,13 +207,15 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
207207
LighterEndBlocks.CHARNIA_PURPLE,
208208
LighterEndBlocks.CHARNIA_RED
209209
);
210-
valueLookupBuilder(LighterEndTags.FURS)
210+
getOrCreateTagBuilder(LighterEndTags.FURS)
211211
.add(
212212
LighterEndBlocks.AGAVE_FUR,
213213
LighterEndBlocks.GLOWSHROOM_FUR
214214
);
215-
valueLookupBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_STONES);
216-
valueLookupBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_SOIL);
215+
getOrCreateTagBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_STONES);
216+
getOrCreateTagBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_SOIL);
217+
getOrCreateTagBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_STONES);
218+
getOrCreateTagBuilder(LighterEndTags.SLIME_SPAWNABLE).addTag(LighterEndTags.END_SOIL);
217219

218220

219221
}

0 commit comments

Comments
 (0)