Skip to content

Commit 0088ddc

Browse files
committed
update 1.21.6
1 parent d40e28d commit 0088ddc

File tree

17 files changed

+81
-87
lines changed

17 files changed

+81
-87
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.5
8-
yarn_mappings=1.21.5+build.1
7+
minecraft_version=1.21.6
8+
yarn_mappings=1.21.6+build.1
99
loader_version=0.16.14
1010

1111
# Mod Properties
@@ -14,4 +14,4 @@ maven_group=net.kaupenjoe.tutorialmod
1414
archives_base_name=tutorialmod
1515

1616
# Fabric API
17-
fabric_version=0.124.2+1.21.5
17+
fabric_version=0.127.0+1.21.6

src/main/generated/.cache/bf8b55c7a3e1253642a8b1063c0b39ff5689945b

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ d7b95d4b07c60273a02a034269f3cdbb0dcf2784 assets/tutorialmod/blockstates/driftwoo
99
4115fbde62c46de50c9bdd4c5185774b7caa3744 assets/tutorialmod/blockstates/growth_chamber.json
1010
122234d5a08c337bde3aa74fc23731cf53f4d7c8 assets/tutorialmod/blockstates/honey_berry_bush.json
1111
2d316979b5247b802b0590d94b40bac75fde6974 assets/tutorialmod/blockstates/magic_block.json
12-
c11df765d5d71cad25f0e3aed9899927c9a7a6f2 assets/tutorialmod/blockstates/pedestal.json
1312
6a728eda7238fed6b027e801e464250c3f3144ba assets/tutorialmod/blockstates/pink_garnet_block.json
1413
f8b6f1021ac80c221d8d83ede8e5816c45ef723f assets/tutorialmod/blockstates/pink_garnet_button.json
1514
40af2d76a6efa3e50ba294cfc6f11efb6e11854f assets/tutorialmod/blockstates/pink_garnet_deepslate_ore.json
@@ -44,7 +43,6 @@ a0295b2187148d078f36ff66a63327d11ff960c2 assets/tutorialmod/items/kaupen_armor_t
4443
2a600122bf21778278370c11a57a8f10e24e92a5 assets/tutorialmod/items/kaupen_bow.json
4544
8fe54fac0d8b2763fdecd5fd624085c91405390a assets/tutorialmod/items/magic_block.json
4645
37ce813cfa8adc0748c906061947718453e681d7 assets/tutorialmod/items/mantis_spawn_egg.json
47-
85542db5c5bcf12b3e22909c96154002b18e68a4 assets/tutorialmod/items/pedestal.json
4846
75139f101fc53a173036888496a359bd89e86a16 assets/tutorialmod/items/pink_garnet.json
4947
12947b141d034b1931dc87d969dccfd8bff18a1f assets/tutorialmod/items/pink_garnet_axe.json
5048
083ea04c2e0adeda2373718a22d3ae8268fe7f6a assets/tutorialmod/items/pink_garnet_block.json
@@ -96,7 +94,6 @@ a6f7246ee184c6cf0823d42ea0f7fbae96f46f23 assets/tutorialmod/models/block/honey_b
9694
5406dfa73f1fda8a1666beebed37678f095738e8 assets/tutorialmod/models/block/honey_berry_bush_stage2.json
9795
235c845ba3c1ffa4ee1e378a7bc60d54f79a74f7 assets/tutorialmod/models/block/honey_berry_bush_stage3.json
9896
ed27aaa00c275028e1495bb6d6bfdcea1851067b assets/tutorialmod/models/block/magic_block.json
99-
1aa7d1eabd14f0e3e39e450703c67ff34b17ee31 assets/tutorialmod/models/block/pedestal.json
10097
37d814e2e0356a246af16618c42984b84d9e2ed9 assets/tutorialmod/models/block/pink_garnet_block.json
10198
71d14427350d8972a3b7c9d3b7f2f9ebb012d386 assets/tutorialmod/models/block/pink_garnet_button.json
10299
265ff9736526dae271306394da10ef1c9a5ebe2c assets/tutorialmod/models/block/pink_garnet_button_inventory.json

src/main/generated/assets/tutorialmod/blockstates/pedestal.json

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

src/main/generated/assets/tutorialmod/items/pedestal.json

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

src/main/generated/assets/tutorialmod/models/block/pedestal.json

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

src/main/java/net/kaupenjoe/tutorialmod/TutorialModClient.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.kaupenjoe.tutorialmod;
22

33
import net.fabricmc.api.ClientModInitializer;
4-
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
54
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
5+
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
66
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
77
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
88
import net.kaupenjoe.tutorialmod.block.ModBlocks;
@@ -16,19 +16,20 @@
1616
import net.kaupenjoe.tutorialmod.screen.custom.GrowthChamberScreen;
1717
import net.kaupenjoe.tutorialmod.screen.custom.PedestalScreen;
1818
import net.minecraft.client.gui.screen.ingame.HandledScreens;
19+
import net.minecraft.client.render.BlockRenderLayer;
1920
import net.minecraft.client.render.RenderLayer;
2021
import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
2122

2223
public class TutorialModClient implements ClientModInitializer {
2324
@Override
2425
public void onInitializeClient() {
25-
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PINK_GARNET_DOOR, RenderLayer.getCutout());
26-
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.PINK_GARNET_TRAPDOOR, RenderLayer.getCutout());
26+
BlockRenderLayerMap.putBlock(ModBlocks.PINK_GARNET_DOOR, BlockRenderLayer.CUTOUT);
27+
BlockRenderLayerMap.putBlock(ModBlocks.PINK_GARNET_TRAPDOOR, BlockRenderLayer.CUTOUT);
2728

28-
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.CAULIFLOWER_CROP, RenderLayer.getCutout());
29-
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.HONEY_BERRY_BUSH, RenderLayer.getCutout());
29+
BlockRenderLayerMap.putBlock(ModBlocks.CAULIFLOWER_CROP, BlockRenderLayer.CUTOUT);
30+
BlockRenderLayerMap.putBlock(ModBlocks.HONEY_BERRY_BUSH, BlockRenderLayer.CUTOUT);
3031

31-
BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.DRIFTWOOD_SAPLING, RenderLayer.getCutout());
32+
BlockRenderLayerMap.putBlock(ModBlocks.DRIFTWOOD_SAPLING, BlockRenderLayer.CUTOUT);
3233

3334
EntityModelLayerRegistry.registerModelLayer(MantisModel.MANTIS, MantisModel::getTexturedModelData);
3435
EntityRendererRegistry.register(ModEntities.MANTIS, MantisRenderer::new);

src/main/java/net/kaupenjoe/tutorialmod/block/entity/custom/GrowthChamberBlockEntity.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import net.minecraft.screen.ScreenHandler;
2626
import net.minecraft.server.network.ServerPlayerEntity;
2727
import net.minecraft.server.world.ServerWorld;
28+
import net.minecraft.storage.ReadView;
29+
import net.minecraft.storage.WriteView;
2830
import net.minecraft.text.Text;
2931
import net.minecraft.util.ItemScatterer;
3032
import net.minecraft.util.collection.DefaultedList;
@@ -99,19 +101,19 @@ public void onBlockReplaced(BlockPos pos, BlockState oldState) {
99101
}
100102

101103
@Override
102-
protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
103-
super.writeNbt(nbt, registryLookup);
104-
Inventories.writeNbt(nbt, inventory, registryLookup);
105-
nbt.putInt("growth_chamber.progress", progress);
106-
nbt.putInt("growth_chamber.max_progress", maxProgress);
104+
protected void writeData(WriteView view) {
105+
super.writeData(view);
106+
Inventories.writeData(view, inventory);
107+
view.putInt("growth_chamber.progress", progress);
108+
view.putInt("growth_chamber.max_progress", maxProgress);
107109
}
108110

109111
@Override
110-
protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
111-
Inventories.readNbt(nbt, inventory, registryLookup);
112-
progress = nbt.getInt("growth_chamber.progress").get();
113-
maxProgress = nbt.getInt("growth_chamber.max_progress").get();
114-
super.readNbt(nbt, registryLookup);
112+
protected void readData(ReadView view) {
113+
Inventories.readData(view, inventory);
114+
progress = view.getInt("growth_chamber.progress", 0);
115+
maxProgress = view.getInt("growth_chamber.max_progress", 0);
116+
super.readData(view);
115117
}
116118

117119
public void tick(World world, BlockPos pos, BlockState state) {

src/main/java/net/kaupenjoe/tutorialmod/block/entity/custom/PedestalBlockEntity.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import net.minecraft.registry.RegistryWrapper;
1818
import net.minecraft.screen.ScreenHandler;
1919
import net.minecraft.server.network.ServerPlayerEntity;
20+
import net.minecraft.storage.ReadView;
21+
import net.minecraft.storage.WriteView;
2022
import net.minecraft.text.Text;
2123
import net.minecraft.util.ItemScatterer;
2224
import net.minecraft.util.collection.DefaultedList;
@@ -45,15 +47,15 @@ public float getRenderingRotation() {
4547
}
4648

4749
@Override
48-
protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
49-
super.writeNbt(nbt, registryLookup);
50-
Inventories.writeNbt(nbt, inventory, registryLookup);
50+
protected void writeData(WriteView view) {
51+
super.writeData(view);
52+
Inventories.writeData(view, inventory);
5153
}
5254

5355
@Override
54-
protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
55-
super.readNbt(nbt, registryLookup);
56-
Inventories.readNbt(nbt, inventory, registryLookup);
56+
protected void readData(ReadView view) {
57+
super.readData(view);
58+
Inventories.readData(view, inventory);
5759
}
5860

5961
@Override

src/main/java/net/kaupenjoe/tutorialmod/datagen/ModBlockTagProvider.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ public ModBlockTagProvider(FabricDataOutput output, CompletableFuture<RegistryWr
1616

1717
@Override
1818
protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
19-
getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
19+
valueLookupBuilder(BlockTags.PICKAXE_MINEABLE)
2020
.add(ModBlocks.PINK_GARNET_BLOCK)
2121
.add(ModBlocks.RAW_PINK_GARNET_BLOCK)
2222
.add(ModBlocks.PINK_GARNET_ORE)
2323
.add(ModBlocks.PINK_GARNET_DEEPSLATE_ORE)
2424
.add(ModBlocks.MAGIC_BLOCK);
2525

26-
getOrCreateTagBuilder(BlockTags.NEEDS_IRON_TOOL)
26+
valueLookupBuilder(BlockTags.NEEDS_IRON_TOOL)
2727
.add(ModBlocks.PINK_GARNET_DEEPSLATE_ORE);
2828

29-
getOrCreateTagBuilder(BlockTags.FENCES).add(ModBlocks.PINK_GARNET_FENCE);
30-
getOrCreateTagBuilder(BlockTags.FENCE_GATES).add(ModBlocks.PINK_GARNET_FENCE_GATE);
31-
getOrCreateTagBuilder(BlockTags.WALLS).add(ModBlocks.PINK_GARNET_WALL);
29+
valueLookupBuilder(BlockTags.FENCES).add(ModBlocks.PINK_GARNET_FENCE);
30+
valueLookupBuilder(BlockTags.FENCE_GATES).add(ModBlocks.PINK_GARNET_FENCE_GATE);
31+
valueLookupBuilder(BlockTags.WALLS).add(ModBlocks.PINK_GARNET_WALL);
3232

33-
getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
33+
valueLookupBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
3434
.add(ModBlocks.MAGIC_BLOCK);
3535

36-
getOrCreateTagBuilder(ModTags.Blocks.NEEDS_PINK_GARNET_TOOL)
36+
valueLookupBuilder(ModTags.Blocks.NEEDS_PINK_GARNET_TOOL)
3737
.add(ModBlocks.MAGIC_BLOCK)
3838
.addTag(BlockTags.NEEDS_IRON_TOOL);
3939

40-
getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN)
40+
valueLookupBuilder(BlockTags.LOGS_THAT_BURN)
4141
.add(ModBlocks.DRIFTWOOD_LOG)
4242
.add(ModBlocks.DRIFTWOOD_WOOD)
4343
.add(ModBlocks.STRIPPED_DRIFTWOOD_LOG)

src/main/java/net/kaupenjoe/tutorialmod/datagen/ModItemTagProvider.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,43 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture<RegistryWra
1818

1919
@Override
2020
protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
21-
getOrCreateTagBuilder(ModTags.Items.TRANSFORMABLE_ITEMS)
21+
valueLookupBuilder(ModTags.Items.TRANSFORMABLE_ITEMS)
2222
.add(ModItems.PINK_GARNET)
2323
.add(ModItems.RAW_PINK_GARNET)
2424
.add(Items.COAL)
2525
.add(Items.STICK)
2626
.add(Items.APPLE);
2727

28-
getOrCreateTagBuilder(ModTags.Items.PINK_GARNET_REPAIR)
28+
valueLookupBuilder(ModTags.Items.PINK_GARNET_REPAIR)
2929
.add(ModItems.PINK_GARNET);
3030

31-
getOrCreateTagBuilder(ItemTags.SWORDS)
31+
valueLookupBuilder(ItemTags.SWORDS)
3232
.add(ModItems.PINK_GARNET_SWORD);
33-
getOrCreateTagBuilder(ItemTags.PICKAXES)
33+
valueLookupBuilder(ItemTags.PICKAXES)
3434
.add(ModItems.PINK_GARNET_PICKAXE);
35-
getOrCreateTagBuilder(ItemTags.SHOVELS)
35+
valueLookupBuilder(ItemTags.SHOVELS)
3636
.add(ModItems.PINK_GARNET_SHOVEL);
37-
getOrCreateTagBuilder(ItemTags.AXES)
37+
valueLookupBuilder(ItemTags.AXES)
3838
.add(ModItems.PINK_GARNET_AXE);
39-
getOrCreateTagBuilder(ItemTags.HOES)
39+
valueLookupBuilder(ItemTags.HOES)
4040
.add(ModItems.PINK_GARNET_HOE);
4141

42-
getOrCreateTagBuilder(ItemTags.TRIMMABLE_ARMOR)
42+
valueLookupBuilder(ItemTags.TRIMMABLE_ARMOR)
4343
.add(ModItems.PINK_GARNET_HELMET)
4444
.add(ModItems.PINK_GARNET_CHESTPLATE)
4545
.add(ModItems.PINK_GARNET_LEGGINGS)
4646
.add(ModItems.PINK_GARNET_BOOTS);
4747

48-
getOrCreateTagBuilder(ItemTags.TRIM_MATERIALS)
48+
valueLookupBuilder(ItemTags.TRIM_MATERIALS)
4949
.add(ModItems.PINK_GARNET);
5050

51-
getOrCreateTagBuilder(ItemTags.LOGS_THAT_BURN)
51+
valueLookupBuilder(ItemTags.LOGS_THAT_BURN)
5252
.add(ModBlocks.DRIFTWOOD_LOG.asItem())
5353
.add(ModBlocks.DRIFTWOOD_WOOD.asItem())
5454
.add(ModBlocks.STRIPPED_DRIFTWOOD_LOG.asItem())
5555
.add(ModBlocks.STRIPPED_DRIFTWOOD_WOOD.asItem());
5656

57-
getOrCreateTagBuilder(ItemTags.PLANKS)
57+
valueLookupBuilder(ItemTags.PLANKS)
5858
.add(ModBlocks.DRIFTWOOD_PLANKS.asItem());
5959
}
6060
}

0 commit comments

Comments
 (0)