Skip to content

Commit 3394ff1

Browse files
gniftygnomegniftygnome
committed
Updated to 1.21.6-pre1.
- Updated to 1.21.6-pre1 * Signs use vanilla + Fabric registration now * Added BlockSetTypes and WoodTypes
1 parent 87c155e commit 3394ff1

File tree

11 files changed

+166
-141
lines changed

11 files changed

+166
-141
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
1616
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
1717

18-
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
18+
modCompileOnlyApi "com.terraformersmc:modmenu:${project.modmenu_version}"
1919

2020
includeMod "terraform-api", "com.terraformersmc.terraform-api:terraform-biome-remapper-api-v1:${project.terraform_biome_remapper_api_version}"
2121
includeMod "terraform-api", "com.terraformersmc.terraform-api:terraform-shapes-api-v1:${project.terraform_shapes_api_version}"
@@ -122,7 +122,7 @@ subprojects {
122122
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
123123
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
124124

125-
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
125+
modCompileOnlyApi "com.terraformersmc:modmenu:${project.modmenu_version}"
126126

127127
modImplementation "com.terraformersmc.terraform-api:terraform-biome-remapper-api-v1:${project.terraform_biome_remapper_api_version}"
128128
modImplementation "com.terraformersmc.terraform-api:terraform-shapes-api-v1:${project.terraform_shapes_api_version}"

‎client/src/main/java/com/terraformersmc/cinderscapes/CinderscapesClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import net.fabricmc.api.ClientModInitializer;
66
import net.fabricmc.api.EnvType;
77
import net.fabricmc.api.Environment;
8-
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
98
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
10-
import net.minecraft.client.render.RenderLayer;
9+
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
10+
import net.minecraft.client.render.BlockRenderLayer;
1111
import net.minecraft.text.Style;
1212
import net.minecraft.text.Text;
1313
import net.minecraft.util.Formatting;
@@ -20,7 +20,7 @@ public class CinderscapesClient implements ClientModInitializer {
2020
public void onInitializeClient() {
2121
CinderscapesArmorTrimItemModels.init();
2222

23-
BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),
23+
BlockRenderLayerMap.putBlocks(BlockRenderLayer.TRANSLUCENT,
2424
// Ashy Shoals
2525

2626
// Blackstone Shales
@@ -36,7 +36,7 @@ public void onInitializeClient() {
3636
CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ
3737
);
3838

39-
BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),
39+
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT,
4040
// Ashy Shoals
4141
CinderscapesBlocks.BRAMBLE_BERRY_BUSH,
4242
CinderscapesBlocks.POTTED_PYRACINTH,

‎common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
2121
/*
2222
* Vanilla biome tags
2323
*/
24-
getOrCreateTagBuilder(BiomeTags.IS_NETHER)
24+
builder(BiomeTags.IS_NETHER)
2525
.addOptional(CinderscapesBiomes.ASHY_SHOALS)
2626
.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES)
2727
.addOptional(CinderscapesBiomes.LUMINOUS_GROVE)
2828
.addOptional(CinderscapesBiomes.QUARTZ_CAVERN);
2929

30-
getOrCreateTagBuilder(BiomeTags.SNOW_GOLEM_MELTS)
30+
builder(BiomeTags.SNOW_GOLEM_MELTS)
3131
.addOptional(CinderscapesBiomes.ASHY_SHOALS)
3232
.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES)
3333
.addOptional(CinderscapesBiomes.LUMINOUS_GROVE)
@@ -37,31 +37,31 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
3737
/*
3838
* Conventional biome tags
3939
*/
40-
getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST)
40+
builder(ConventionalBiomeTags.IS_NETHER_FOREST)
4141
.addOptional(CinderscapesBiomes.LUMINOUS_GROVE);
4242

43-
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE)
43+
builder(ConventionalBiomeTags.IS_VEGETATION_SPARSE)
4444
.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES);
4545

46-
getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND)
46+
builder(ConventionalBiomeTags.IS_WASTELAND)
4747
.addOptional(CinderscapesBiomes.ASHY_SHOALS);
4848

4949

5050
/*
5151
* Biome structure generation tags
5252
*/
53-
getOrCreateTagBuilder(BiomeTags.BASTION_REMNANT_HAS_STRUCTURE)
53+
builder(BiomeTags.BASTION_REMNANT_HAS_STRUCTURE)
5454
.addOptional(CinderscapesBiomes.ASHY_SHOALS)
5555
.addOptional(CinderscapesBiomes.LUMINOUS_GROVE);
5656

57-
getOrCreateTagBuilder(BiomeTags.NETHER_FORTRESS_HAS_STRUCTURE)
57+
builder(BiomeTags.NETHER_FORTRESS_HAS_STRUCTURE)
5858
.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES);
5959

60-
getOrCreateTagBuilder(BiomeTags.NETHER_FOSSIL_HAS_STRUCTURE)
60+
builder(BiomeTags.NETHER_FOSSIL_HAS_STRUCTURE)
6161
.addOptional(CinderscapesBiomes.ASHY_SHOALS)
6262
.addOptional(CinderscapesBiomes.BLACKSTONE_SHALES);
6363

64-
getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_NETHER_HAS_STRUCTURE)
64+
builder(BiomeTags.RUINED_PORTAL_NETHER_HAS_STRUCTURE)
6565
.addOptional(CinderscapesBiomes.ASHY_SHOALS);
6666
}
6767

‎common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
2121
/*
2222
* Basic block tags
2323
*/
24-
getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE)
24+
valueLookupBuilder(BlockTags.ENDERMAN_HOLDABLE)
2525
.add(CinderscapesBlocks.NODZOL)
2626
.add(CinderscapesBlocks.UMBRAL_FUNGUS)
2727
.add(CinderscapesBlocks.UMBRAL_NYLIUM);
2828

29-
getOrCreateTagBuilder(BlockTags.FENCE_GATES)
29+
valueLookupBuilder(BlockTags.FENCE_GATES)
3030
.add(CinderscapesBlocks.SCORCHED_FENCE_GATE)
3131
.add(CinderscapesBlocks.UMBRAL_FENCE_GATE);
3232

33-
getOrCreateTagBuilder(BlockTags.FLOWER_POTS)
33+
valueLookupBuilder(BlockTags.FLOWER_POTS)
3434
.add(CinderscapesBlocks.POTTED_CRYSTINIUM)
3535
.add(CinderscapesBlocks.POTTED_LUMINOUS_POD)
3636
.add(CinderscapesBlocks.POTTED_PHOTOFERN)
@@ -44,14 +44,14 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
4444
.add(CinderscapesBlocks.POTTED_TWILIGHT_TENDRILS)
4545
.add(CinderscapesBlocks.POTTED_UMBRAL_FUNGUS);
4646

47-
getOrCreateTagBuilder(BlockTags.INSIDE_STEP_SOUND_BLOCKS)
47+
valueLookupBuilder(BlockTags.INSIDE_STEP_SOUND_BLOCKS)
4848
.add(CinderscapesBlocks.ASH)
4949
.add(CinderscapesBlocks.SCORCHED_SPROUTS)
5050
.add(CinderscapesBlocks.SCORCHED_TENDRILS)
5151
.add(CinderscapesBlocks.TWILIGHT_FESCUES)
5252
.add(CinderscapesBlocks.TWILIGHT_TENDRILS);
5353

54-
getOrCreateTagBuilder(BlockTags.LOGS)
54+
valueLookupBuilder(BlockTags.LOGS)
5555
.add(CinderscapesBlocks.SCORCHED_HYPHAE)
5656
.add(CinderscapesBlocks.SCORCHED_STEM)
5757
.add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE)
@@ -61,94 +61,94 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
6161
.add(CinderscapesBlocks.UMBRAL_HYPHAE)
6262
.add(CinderscapesBlocks.UMBRAL_STEM);
6363

64-
getOrCreateTagBuilder(BlockTags.MUSHROOM_GROW_BLOCK)
64+
valueLookupBuilder(BlockTags.MUSHROOM_GROW_BLOCK)
6565
.add(CinderscapesBlocks.NODZOL);
6666

67-
getOrCreateTagBuilder(BlockTags.NETHER_CARVER_REPLACEABLES)
67+
valueLookupBuilder(BlockTags.NETHER_CARVER_REPLACEABLES)
6868
.add(CinderscapesBlocks.UMBRAL_NYLIUM)
6969
.add(CinderscapesBlocks.UMBRAL_WART_BLOCK);
7070

71-
getOrCreateTagBuilder(BlockTags.NYLIUM)
71+
valueLookupBuilder(BlockTags.NYLIUM)
7272
.add(CinderscapesBlocks.UMBRAL_NYLIUM);
7373

74-
getOrCreateTagBuilder(BlockTags.PLANKS)
74+
valueLookupBuilder(BlockTags.PLANKS)
7575
.add(CinderscapesBlocks.UMBRAL_PLANKS)
7676
.add(CinderscapesBlocks.SCORCHED_PLANKS);
7777

78-
getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS)
78+
valueLookupBuilder(BlockTags.CEILING_HANGING_SIGNS)
7979
.add(CinderscapesBlocks.SCORCHED_HANGING_SIGN)
8080
.add(CinderscapesBlocks.UMBRAL_HANGING_SIGN);
8181

82-
getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS)
82+
valueLookupBuilder(BlockTags.WALL_HANGING_SIGNS)
8383
.add(CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN)
8484
.add(CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN);
8585

86-
getOrCreateTagBuilder(BlockTags.STANDING_SIGNS)
86+
valueLookupBuilder(BlockTags.STANDING_SIGNS)
8787
.add(CinderscapesBlocks.SCORCHED_SIGN)
8888
.add(CinderscapesBlocks.UMBRAL_SIGN);
8989

90-
getOrCreateTagBuilder(BlockTags.WALL_SIGNS)
90+
valueLookupBuilder(BlockTags.WALL_SIGNS)
9191
.add(CinderscapesBlocks.SCORCHED_WALL_SIGN)
9292
.add(CinderscapesBlocks.UMBRAL_WALL_SIGN);
9393

94-
getOrCreateTagBuilder(BlockTags.SLABS)
94+
valueLookupBuilder(BlockTags.SLABS)
9595
.add(CinderscapesBlocks.ROSE_QUARTZ_SLAB)
9696
.add(CinderscapesBlocks.SMOKY_QUARTZ_SLAB)
9797
.add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB)
9898
.add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB)
9999
.add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB)
100100
.add(CinderscapesBlocks.SULFUR_QUARTZ_SLAB);
101101

102-
getOrCreateTagBuilder(BlockTags.SMALL_FLOWERS)
102+
valueLookupBuilder(BlockTags.SMALL_FLOWERS)
103103
.add(CinderscapesBlocks.CRYSTINIUM)
104104
.add(CinderscapesBlocks.PYRACINTH)
105105
.add(CinderscapesBlocks.SCORCHED_TENDRILS)
106106
.add(CinderscapesBlocks.TWILIGHT_TENDRILS);
107107

108-
getOrCreateTagBuilder(BlockTags.STAIRS)
108+
valueLookupBuilder(BlockTags.STAIRS)
109109
.add(CinderscapesBlocks.ROSE_QUARTZ_STAIRS)
110110
.add(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS)
111111
.add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS)
112112
.add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS)
113113
.add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS)
114114
.add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS);
115115

116-
getOrCreateTagBuilder(BlockTags.WART_BLOCKS)
116+
valueLookupBuilder(BlockTags.WART_BLOCKS)
117117
.add(CinderscapesBlocks.UMBRAL_WART_BLOCK);
118118

119-
getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS)
119+
valueLookupBuilder(BlockTags.WOODEN_BUTTONS)
120120
.add(CinderscapesBlocks.SCORCHED_BUTTON)
121121
.add(CinderscapesBlocks.UMBRAL_BUTTON);
122122

123-
getOrCreateTagBuilder(BlockTags.WOODEN_DOORS)
123+
valueLookupBuilder(BlockTags.WOODEN_DOORS)
124124
.add(CinderscapesBlocks.SCORCHED_DOOR)
125125
.add(CinderscapesBlocks.UMBRAL_DOOR);
126126

127-
getOrCreateTagBuilder(BlockTags.WOODEN_FENCES)
127+
valueLookupBuilder(BlockTags.WOODEN_FENCES)
128128
.add(CinderscapesBlocks.SCORCHED_FENCE)
129129
.add(CinderscapesBlocks.UMBRAL_FENCE);
130130

131-
getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES)
131+
valueLookupBuilder(BlockTags.WOODEN_PRESSURE_PLATES)
132132
.add(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE)
133133
.add(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE);
134134

135-
getOrCreateTagBuilder(BlockTags.WOODEN_SLABS)
135+
valueLookupBuilder(BlockTags.WOODEN_SLABS)
136136
.add(CinderscapesBlocks.SCORCHED_SLAB)
137137
.add(CinderscapesBlocks.UMBRAL_SLAB);
138138

139-
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS)
139+
valueLookupBuilder(BlockTags.WOODEN_STAIRS)
140140
.add(CinderscapesBlocks.SCORCHED_STAIRS)
141141
.add(CinderscapesBlocks.UMBRAL_STAIRS);
142142

143-
getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS)
143+
valueLookupBuilder(BlockTags.WOODEN_TRAPDOORS)
144144
.add(CinderscapesBlocks.SCORCHED_TRAPDOOR)
145145
.add(CinderscapesBlocks.UMBRAL_TRAPDOOR);
146146

147147

148148
/*
149149
* Tool block tags
150150
*/
151-
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
151+
valueLookupBuilder(BlockTags.AXE_MINEABLE)
152152
.add(CinderscapesBlocks.SCORCHED_HYPHAE)
153153
.add(CinderscapesBlocks.SCORCHED_STEM)
154154
.add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE)
@@ -160,11 +160,11 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
160160
.add(CinderscapesBlocks.UMBRAL_HYPHAE)
161161
.add(CinderscapesBlocks.UMBRAL_STEM);
162162

163-
getOrCreateTagBuilder(BlockTags.HOE_MINEABLE)
163+
valueLookupBuilder(BlockTags.HOE_MINEABLE)
164164
.add(CinderscapesBlocks.UMBRAL_FLESH_BLOCK)
165165
.add(CinderscapesBlocks.UMBRAL_WART_BLOCK);
166166

167-
getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
167+
valueLookupBuilder(BlockTags.PICKAXE_MINEABLE)
168168
.add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK)
169169
.add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK)
170170
.add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK)
@@ -207,35 +207,35 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
207207
.add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS)
208208
.add(CinderscapesBlocks.UMBRAL_NYLIUM);
209209

210-
getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE)
210+
valueLookupBuilder(BlockTags.SHOVEL_MINEABLE)
211211
.add(CinderscapesBlocks.ASH)
212212
.add(CinderscapesBlocks.ASH_BLOCK);
213213

214214

215215
/*
216216
* Conventional block tags
217217
*/
218-
getOrCreateTagBuilder(ConventionalBlockTags.ORES)
218+
valueLookupBuilder(ConventionalBlockTags.ORES)
219219
.add(CinderscapesBlocks.SULFUR_ORE);
220220

221-
getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES)
221+
valueLookupBuilder(ConventionalBlockTags.QUARTZ_ORES)
222222
.add(CinderscapesBlocks.ROSE_QUARTZ_ORE)
223223
.add(CinderscapesBlocks.SMOKY_QUARTZ_ORE)
224224
.add(CinderscapesBlocks.SULFUR_QUARTZ_ORE);
225225

226-
getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS)
226+
valueLookupBuilder(ConventionalBlockTags.STRIPPED_LOGS)
227227
.add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM)
228228
.add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM);
229229

230-
getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS)
230+
valueLookupBuilder(ConventionalBlockTags.STRIPPED_WOODS)
231231
.add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE)
232232
.add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE);
233233

234234

235235
/*
236236
* Local block tags
237237
*/
238-
getOrCreateTagBuilder(CinderscapesBlockTags.ASH_PERMEABLE)
238+
valueLookupBuilder(CinderscapesBlockTags.ASH_PERMEABLE)
239239
.addTag(BlockTags.NYLIUM)
240240
.add(CinderscapesBlocks.ASH)
241241
.add(CinderscapesBlocks.ASH_BLOCK)
@@ -250,13 +250,13 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
250250
.add(Blocks.SOUL_SAND)
251251
.add(Blocks.SOUL_SOIL);
252252

253-
getOrCreateTagBuilder(CinderscapesBlockTags.SCORCHED_STEMS)
253+
valueLookupBuilder(CinderscapesBlockTags.SCORCHED_STEMS)
254254
.add(CinderscapesBlocks.SCORCHED_HYPHAE)
255255
.add(CinderscapesBlocks.SCORCHED_STEM)
256256
.add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE)
257257
.add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM);
258258

259-
getOrCreateTagBuilder(CinderscapesBlockTags.UMBRAL_STEMS)
259+
valueLookupBuilder(CinderscapesBlockTags.UMBRAL_STEMS)
260260
.add(CinderscapesBlocks.UMBRAL_HYPHAE)
261261
.add(CinderscapesBlocks.UMBRAL_STEM)
262262
.add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE)

0 commit comments

Comments
 (0)