Skip to content

Commit 86ec77a

Browse files
KaupenjoeKaupenjoe
Kaupenjoe
authored and
Kaupenjoe
committed
Update 1.21.6
1 parent 43d27da commit 86ec77a

12 files changed

Lines changed: 62 additions & 45 deletions

File tree

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ parchment_mappings_version=2025.04.19
1212
# Environment Properties
1313
# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
1414
# The Minecraft version must agree with the Neo version to get a valid artifact
15-
minecraft_version=1.21.5
15+
minecraft_version=1.21.6
1616
# The Minecraft version range can use any release version of Minecraft as bounds.
1717
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
1818
# as they do not follow standard versioning conventions.
19-
minecraft_version_range=[1.21.5,1.21.6)
19+
minecraft_version_range=[1.21.5,1.22)
2020
# The Neo version must agree with the Minecraft version to get a valid artifact
21-
neo_version=21.5.66-beta
21+
neo_version=21.6.5-beta
2222
# The Neo version range can use any version of Neo as bounds
23-
neo_version_range=[21.5.66-beta,)
23+
neo_version_range=[21.6.5-beta,)
2424
# The loader version range can only use the major version of FML as bounds
2525
loader_version_range=[4,)
2626

‎src/main/java/net/kaupenjoe/tutorialmod/TutorialMod.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import net.kaupenjoe.tutorialmod.villager.ModVillagers;
2626
import net.minecraft.client.renderer.ItemBlockRenderTypes;
2727
import net.minecraft.client.renderer.RenderType;
28+
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
2829
import net.minecraft.client.renderer.entity.EntityRenderers;
2930
import net.minecraft.world.item.CreativeModeTabs;
3031
import net.neoforged.neoforge.client.event.EntityRenderersEvent;
@@ -124,12 +125,12 @@ public static void onClientSetup(FMLClientSetupEvent event) {
124125

125126
EntityRenderers.register(ModEntities.CHAIR_ENTITY.get(), ChairRenderer::new);
126127

127-
ItemBlockRenderTypes.setRenderLayer(ModBlocks.GOJI_BERRY_BUSH.get(), RenderType.cutout());
128-
ItemBlockRenderTypes.setRenderLayer(ModBlocks.RADISH_CROP.get(), RenderType.cutout());
129-
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BLOODWOOD_SAPLING.get(), RenderType.cutout());
128+
ItemBlockRenderTypes.setRenderLayer(ModBlocks.GOJI_BERRY_BUSH.get(), ChunkSectionLayer.CUTOUT);
129+
ItemBlockRenderTypes.setRenderLayer(ModBlocks.RADISH_CROP.get(), ChunkSectionLayer.CUTOUT);
130+
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BLOODWOOD_SAPLING.get(), ChunkSectionLayer.CUTOUT);
130131

131-
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BISMUTH_DOOR.get(), RenderType.cutout());
132-
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BISMUTH_TRAPDOOR.get(), RenderType.cutout());
132+
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BISMUTH_DOOR.get(), ChunkSectionLayer.CUTOUT);
133+
ItemBlockRenderTypes.setRenderLayer(ModBlocks.BISMUTH_TRAPDOOR.get(), ChunkSectionLayer.CUTOUT);
133134
}
134135

135136
@SubscribeEvent

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import net.minecraft.world.level.Level;
2727
import net.minecraft.world.level.block.entity.BlockEntity;
2828
import net.minecraft.world.level.block.state.BlockState;
29+
import net.minecraft.world.level.storage.ValueInput;
30+
import net.minecraft.world.level.storage.ValueOutput;
2931
import net.neoforged.neoforge.items.ItemStackHandler;
3032
import org.jetbrains.annotations.Nullable;
3133

@@ -103,21 +105,21 @@ public void preRemoveSideEffects(BlockPos pos, BlockState state) {
103105
}
104106

105107
@Override
106-
protected void saveAdditional(CompoundTag pTag, HolderLookup.Provider pRegistries) {
107-
pTag.put("inventory", itemHandler.serializeNBT(pRegistries));
108-
pTag.putInt("growth_chamber.progress", progress);
109-
pTag.putInt("growth_chamber.max_progress", maxProgress);
108+
protected void saveAdditional(ValueOutput output) {
109+
itemHandler.serialize(output);
110+
output.putInt("growth_chamber.progress", progress);
111+
output.putInt("growth_chamber.max_progress", maxProgress);
110112

111-
super.saveAdditional(pTag, pRegistries);
113+
super.saveAdditional(output);
112114
}
113115

114116
@Override
115-
protected void loadAdditional(CompoundTag pTag, HolderLookup.Provider pRegistries) {
116-
super.loadAdditional(pTag, pRegistries);
117+
protected void loadAdditional(ValueInput input) {
118+
super.loadAdditional(input);
117119

118-
itemHandler.deserializeNBT(pRegistries, pTag.getCompound("inventory").get());
119-
progress = pTag.getInt("growth_chamber.progress").get();
120-
maxProgress = pTag.getInt("growth_chamber.max_progress").get();
120+
itemHandler.deserialize(input);
121+
progress = input.getIntOr("growth_chamber.progress", 0);
122+
maxProgress = input.getIntOr("growth_chamber.max_progress", 0);
121123
}
122124

123125
public void tick(Level level, BlockPos blockPos, BlockState blockState) {

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import net.minecraft.world.item.ItemStack;
1818
import net.minecraft.world.level.block.entity.BlockEntity;
1919
import net.minecraft.world.level.block.state.BlockState;
20+
import net.minecraft.world.level.storage.ValueInput;
21+
import net.minecraft.world.level.storage.ValueOutput;
2022
import net.neoforged.neoforge.items.ItemStackHandler;
2123
import org.jetbrains.annotations.Nullable;
2224

@@ -69,15 +71,15 @@ public void preRemoveSideEffects(BlockPos pos, BlockState state) {
6971
}
7072

7173
@Override
72-
protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
73-
super.saveAdditional(tag, registries);
74-
tag.put("inventory", inventory.serializeNBT(registries));
74+
protected void saveAdditional(ValueOutput output) {
75+
super.saveAdditional(output);
76+
inventory.serialize(output);
7577
}
7678

7779
@Override
78-
protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
79-
super.loadAdditional(tag, registries);
80-
inventory.deserializeNBT(registries, tag.getCompound("inventory").get());
80+
protected void loadAdditional(ValueInput input) {
81+
super.loadAdditional(input);
82+
inventory.deserialize(input);
8183
}
8284

8385
@Override

‎src/main/java/net/kaupenjoe/tutorialmod/datagen/DataGenerators.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void gatherClientData(GatherDataEvent.Client event) {
2929

3030
BlockTagsProvider blockTagsProvider = new ModBlockTagProvider(packOutput, lookupProvider);
3131
generator.addProvider(true, blockTagsProvider);
32-
generator.addProvider(true, new ModItemTagProvider(packOutput, lookupProvider, blockTagsProvider.contentsGetter()));
32+
generator.addProvider(true, new ModItemTagProvider(packOutput, lookupProvider));
3333

3434
generator.addProvider(true, new ModDataMapProvider(packOutput, lookupProvider));
3535

@@ -51,7 +51,7 @@ public static void gatherServerData(GatherDataEvent.Server event) {
5151

5252
BlockTagsProvider blockTagsProvider = new ModBlockTagProvider(packOutput, lookupProvider);
5353
generator.addProvider(true, blockTagsProvider);
54-
generator.addProvider(true, new ModItemTagProvider(packOutput, lookupProvider, blockTagsProvider.contentsGetter()));
54+
generator.addProvider(true, new ModItemTagProvider(packOutput, lookupProvider));
5555

5656
generator.addProvider(true, new ModDataMapProvider(packOutput, lookupProvider));
5757

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
import net.kaupenjoe.tutorialmod.util.ModTags;
77
import net.minecraft.core.HolderLookup;
88
import net.minecraft.data.PackOutput;
9-
import net.minecraft.data.tags.ItemTagsProvider;
109
import net.minecraft.tags.ItemTags;
1110
import net.minecraft.world.item.Items;
1211
import net.minecraft.world.level.block.Block;
12+
import net.neoforged.neoforge.common.data.ItemTagsProvider;
1313

1414
import java.util.concurrent.CompletableFuture;
1515

1616
public class ModItemTagProvider extends ItemTagsProvider {
17-
public ModItemTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
18-
CompletableFuture<TagLookup<Block>> blockTags) {
19-
super(output, lookupProvider, blockTags, TutorialMod.MOD_ID);
17+
public ModItemTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider) {
18+
super(output, lookupProvider, TutorialMod.MOD_ID);
2019
}
2120

2221
@Override

‎src/main/java/net/kaupenjoe/tutorialmod/datagen/ModModelProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected void registerModels(BlockModelGenerators blockModels, ItemModelGenerat
6969
itemModels.itemModelOutput.register(ModItems.CHISEL.get(),
7070
new ClientItem(new ConditionalItemModel.Unbaked(new HasComponent(ModDataComponents.COORDINATES.get(), false),
7171
unbakedUsedChisel, unbakedChisel),
72-
new ClientItem.Properties(false)));
72+
new ClientItem.Properties(false, false)));
7373

7474
itemModels.generateFlatItem(ModItems.RADIATION_STAFF.get(), ModelTemplates.FLAT_ITEM);
7575

‎src/main/java/net/kaupenjoe/tutorialmod/entity/client/GeckoModel.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.kaupenjoe.tutorialmod.TutorialMod;
44
import net.kaupenjoe.tutorialmod.entity.custom.GeckoEntity;
5+
import net.minecraft.client.animation.KeyframeAnimation;
56
import net.minecraft.client.model.EntityModel;
67
import net.minecraft.client.model.geom.ModelLayerLocation;
78
import net.minecraft.client.model.geom.ModelPart;
@@ -17,10 +18,16 @@ public class GeckoModel extends EntityModel<GeckoRenderState> {
1718
private final ModelPart body;
1819
private final ModelPart head;
1920

21+
private final KeyframeAnimation walkingAnimation;
22+
private final KeyframeAnimation idlingAnimation;
23+
2024
public GeckoModel(ModelPart root) {
2125
super(root);
2226
this.body = root.getChild("Body");
2327
this.head = this.body.getChild("Head");
28+
29+
this.walkingAnimation = GeckoAnimations.ANIM_GECKO_WALK.bake(root);
30+
this.idlingAnimation = GeckoAnimations.ANIM_GECKO_IDLE.bake(root);
2431
}
2532

2633
public static LayerDefinition createBodyLayer() {
@@ -64,8 +71,8 @@ public void setupAnim(GeckoRenderState state) {
6471
this.root().getAllParts().forEach(ModelPart::resetPose);
6572
this.applyHeadRotation(state.yRot, state.xRot);
6673

67-
this.animateWalk(GeckoAnimations.ANIM_GECKO_WALK, state.walkAnimationPos, state.walkAnimationSpeed, 2f, 2.5f);
68-
this.animate(state.idleAnimationState, GeckoAnimations.ANIM_GECKO_IDLE, state.ageInTicks, 1f);
74+
this.walkingAnimation.applyWalk(state.walkAnimationPos, state.walkAnimationSpeed, 2f, 2.5f);
75+
this.idlingAnimation.apply(state.idleAnimationState, state.ageInTicks, 1f);
6976
}
7077

7178
private void applyHeadRotation(float headYaw, float headPitch) {

‎src/main/java/net/kaupenjoe/tutorialmod/entity/custom/ChairEntity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import net.minecraft.world.entity.Entity;
88
import net.minecraft.world.entity.EntityType;
99
import net.minecraft.world.level.Level;
10+
import net.minecraft.world.level.storage.ValueInput;
11+
import net.minecraft.world.level.storage.ValueOutput;
1012

1113
public class ChairEntity extends Entity {
1214
public ChairEntity(EntityType<?> entityType, Level level) {
@@ -24,12 +26,12 @@ public boolean hurtServer(ServerLevel serverLevel, DamageSource damageSource, fl
2426
}
2527

2628
@Override
27-
protected void readAdditionalSaveData(CompoundTag compoundTag) {
29+
protected void readAdditionalSaveData(ValueInput valueInput) {
2830

2931
}
3032

3133
@Override
32-
protected void addAdditionalSaveData(CompoundTag compoundTag) {
34+
protected void addAdditionalSaveData(ValueOutput valueOutput) {
3335

3436
}
3537

‎src/main/java/net/kaupenjoe/tutorialmod/entity/custom/GeckoEntity.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import net.minecraft.world.item.ItemStack;
2727
import net.minecraft.world.level.Level;
2828
import net.minecraft.world.level.ServerLevelAccessor;
29+
import net.minecraft.world.level.storage.ValueInput;
30+
import net.minecraft.world.level.storage.ValueOutput;
2931
import org.jetbrains.annotations.Nullable;
3032

3133
public class GeckoEntity extends Animal {
@@ -117,15 +119,15 @@ private void setVariant(GeckoVariant variant) {
117119
}
118120

119121
@Override
120-
public void addAdditionalSaveData(CompoundTag compound) {
121-
super.addAdditionalSaveData(compound);
122-
compound.putInt("Variant", this.getTypeVariant());
122+
public void addAdditionalSaveData(ValueOutput output) {
123+
super.addAdditionalSaveData(output);
124+
output.putInt("Variant", this.getTypeVariant());
123125
}
124126

125127
@Override
126-
public void readAdditionalSaveData(CompoundTag compound) {
127-
super.readAdditionalSaveData(compound);
128-
this.entityData.set(VARIANT, compound.getInt("Variant").get());
128+
public void readAdditionalSaveData(ValueInput input) {
129+
super.readAdditionalSaveData(input);
130+
this.entityData.set(VARIANT, input.getIntOr("Variant", 0));
129131
}
130132

131133
@Override

0 commit comments

Comments
 (0)