fix multiple crashes

tristankechlo · Jul 29, 2024 · 8dc12de · 8dc12de
1 parent c6cc46a
commit 8dc12de
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 45 deletions.
diff --git a/common/src/main/java/com/tristankechlo/livingthings/entity/CrabEntity.java b/common/src/main/java/com/tristankechlo/livingthings/entity/CrabEntity.java
@@ -208,9 +208,9 @@ public void refreshDimensions() {
     @Override
     protected EntityDimensions getDefaultDimensions(Pose pose) {
         if (this.isBaby()) {
-            return super.getDimensions(pose);
+            return super.getDefaultDimensions(pose);
         }
-        return super.getDimensions(pose).scale(0.85F + (0.1F * this.getScaling()));
+        return super.getDefaultDimensions(pose).scale(0.85F + (0.1F * this.getScaling()));
     }
 
     @Override

diff --git a/common/src/main/java/com/tristankechlo/livingthings/init/ModArmorMaterial.java b/common/src/main/java/com/tristankechlo/livingthings/init/ModArmorMaterial.java
@@ -3,7 +3,7 @@
 import com.tristankechlo.livingthings.LivingThings;
 import com.tristankechlo.livingthings.platform.RegistrationProvider;
 import com.tristankechlo.livingthings.platform.RegistryObject;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
 import net.minecraft.world.item.Items;
@@ -17,7 +17,7 @@ public final class ModArmorMaterial {
 
     public static void init() {}
 
-    private static final RegistrationProvider<ArmorMaterial> MATERIALS = RegistrationProvider.get(Registries.ARMOR_MATERIAL, LivingThings.MOD_ID);
+    private static final RegistrationProvider<ArmorMaterial> MATERIALS = RegistrationProvider.get(BuiltInRegistries.ARMOR_MATERIAL, LivingThings.MOD_ID);
 
     public static final RegistryObject<ArmorMaterial> ANCIENT = MATERIALS.register("ancient", ModArmorMaterial::makeMaterial);
 

diff --git a/common/src/main/java/com/tristankechlo/livingthings/init/ModBlocks.java b/common/src/main/java/com/tristankechlo/livingthings/init/ModBlocks.java
@@ -4,15 +4,15 @@
 import com.tristankechlo.livingthings.block.OstrichNestBlock;
 import com.tristankechlo.livingthings.platform.RegistrationProvider;
 import com.tristankechlo.livingthings.platform.RegistryObject;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.Block;
 
 public final class ModBlocks {
 
     public static void init() {}
 
-    private static final RegistrationProvider<Block> BLOCKS = RegistrationProvider.get(Registries.BLOCK, LivingThings.MOD_ID);
+    private static final RegistrationProvider<Block> BLOCKS = RegistrationProvider.get(BuiltInRegistries.BLOCK, LivingThings.MOD_ID);
 
     //BLOCKS
     public static final RegistryObject<Block> OSTRICH_NEST = BLOCKS.register("ostrich_nest", OstrichNestBlock::new);

diff --git a/common/src/main/java/com/tristankechlo/livingthings/init/ModEntityTypes.java b/common/src/main/java/com/tristankechlo/livingthings/init/ModEntityTypes.java
@@ -5,7 +5,7 @@
 import com.tristankechlo.livingthings.entity.projectile.ThrownOstrichEgg;
 import com.tristankechlo.livingthings.platform.RegistrationProvider;
 import com.tristankechlo.livingthings.platform.RegistryObject;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
@@ -14,7 +14,7 @@ public final class ModEntityTypes {
 
     public static void init() {}
 
-    private static final RegistrationProvider<EntityType<?>> ENTITY_TYPES = RegistrationProvider.get(Registries.ENTITY_TYPE, LivingThings.MOD_ID);
+    private static final RegistrationProvider<EntityType<?>> ENTITY_TYPES = RegistrationProvider.get(BuiltInRegistries.ENTITY_TYPE, LivingThings.MOD_ID);
 
     public static final RegistryObject<EntityType<ElephantEntity>> ELEPHANT = ENTITY_TYPES.register("elephant", () -> create("elephant", ElephantEntity::new, MobCategory.CREATURE, 1.85F, 2.7F, 0.85F));
     public static final RegistryObject<EntityType<GiraffeEntity>> GIRAFFE = ENTITY_TYPES.register("giraffe", () -> create("giraffe", GiraffeEntity::new, MobCategory.CREATURE, 1.5F, 3.2F, 0.98F));

diff --git a/common/src/main/java/com/tristankechlo/livingthings/init/ModItems.java b/common/src/main/java/com/tristankechlo/livingthings/init/ModItems.java
@@ -6,7 +6,7 @@
 import com.tristankechlo.livingthings.platform.IPlatformHelper;
 import com.tristankechlo.livingthings.platform.RegistrationProvider;
 import com.tristankechlo.livingthings.platform.RegistryObject;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.Item;
@@ -20,7 +20,7 @@ public final class ModItems {
 
     public static void init() {}
 
-    public static final RegistrationProvider<Item> ITEMS = RegistrationProvider.get(Registries.ITEM, LivingThings.MOD_ID);
+    public static final RegistrationProvider<Item> ITEMS = RegistrationProvider.get(BuiltInRegistries.ITEM, LivingThings.MOD_ID);
     public static final List<RegistryObject<? extends Item>> ALL_ITEMS = new ArrayList<>();
     public static final List<RegistryObject<Item>> SPAWN_EGGS;
 

diff --git a/common/src/main/java/com/tristankechlo/livingthings/init/ModSounds.java b/common/src/main/java/com/tristankechlo/livingthings/init/ModSounds.java
@@ -3,15 +3,15 @@
 import com.tristankechlo.livingthings.LivingThings;
 import com.tristankechlo.livingthings.platform.RegistrationProvider;
 import com.tristankechlo.livingthings.platform.RegistryObject;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 
 public final class ModSounds {
 
     public static void init() {}
 
-    private static final RegistrationProvider<SoundEvent> SOUNDS = RegistrationProvider.get(Registries.SOUND_EVENT, LivingThings.MOD_ID);
+    private static final RegistrationProvider<SoundEvent> SOUNDS = RegistrationProvider.get(BuiltInRegistries.SOUND_EVENT, LivingThings.MOD_ID);
 
     public static final RegistryObject<SoundEvent> LION_AMBIENT = registerSound("lion.ambient");
     public static final RegistryObject<SoundEvent> LION_HURT = registerSound("lion.hurt");

diff --git a/common/src/main/java/com/tristankechlo/livingthings/item/LexiconItem.java b/common/src/main/java/com/tristankechlo/livingthings/item/LexiconItem.java
@@ -6,6 +6,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
 import net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
 import net.minecraft.resources.ResourceLocation;
@@ -27,6 +28,7 @@
 public class LexiconItem extends Item {
 
     private static final String URL = "https://github.com/tristankechlo/Living-Things/wiki";
+    private static final MutableComponent SUBTITLE = Component.literal("2nd Edition").withStyle(ChatFormatting.GRAY);
 
     public LexiconItem(Properties properties) {
         super(properties);
@@ -82,16 +84,7 @@ public InteractionResult useOn(UseOnContext context) {
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltip, TooltipFlag flagIn) {
         super.appendHoverText(stack, context, tooltip, flagIn);
         // add the subtitle for the item
-        tooltip.add(getEdition().plainCopy().withStyle(ChatFormatting.GRAY));
-    }
-
-    public static Component getEdition() {
-        if (IPlatformHelper.INSTANCE.isModLoaded("patchouli")) {
-            ResourceLocation book = BuiltInRegistries.ITEM.getKey(ModItems.LEXICON.get());
-            return IPlatformHelper.INSTANCE.getPatchouliSubtitle(book);
-        }
-
-        return Component.literal("2nd Edition");
+        tooltip.add(SUBTITLE);
     }
 
 }
diff --git a/common/src/main/java/com/tristankechlo/livingthings/platform/IPlatformHelper.java b/common/src/main/java/com/tristankechlo/livingthings/platform/IPlatformHelper.java
@@ -35,8 +35,6 @@ default String getEnvironmentName() {
 
     Path getConfigDirectory();
 
-    Component getPatchouliSubtitle(ResourceLocation bookId);
-
     void openBookEntry(ResourceLocation bookId, ResourceLocation entryId, int page);
 
     void openBookGui(ServerPlayer player, ResourceLocation bookId);

diff --git a/fabric/src/main/java/com/tristankechlo/livingthings/platform/FabricPlatformHelper.java b/fabric/src/main/java/com/tristankechlo/livingthings/platform/FabricPlatformHelper.java
@@ -48,11 +48,6 @@ public Path getConfigDirectory() {
         return FabricLoader.getInstance().getConfigDir();
     }
 
-    @Override
-    public Component getPatchouliSubtitle(ResourceLocation bookId) {
-        return vazkii.patchouli.api.PatchouliAPI.get().getSubtitle(bookId);
-    }
-
     @Override
     public void openBookEntry(ResourceLocation bookId, ResourceLocation entryId, int page) {
         vazkii.patchouli.api.PatchouliAPI.get().openBookEntry(bookId, entryId, page);

diff --git a/forge/src/main/java/com/tristankechlo/livingthings/ForgeLivingThings.java b/forge/src/main/java/com/tristankechlo/livingthings/ForgeLivingThings.java
@@ -1,6 +1,5 @@
 package com.tristankechlo.livingthings;
 
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.tristankechlo.livingthings.commands.LivingThingsCommand;
 import com.tristankechlo.livingthings.config.ConfigManager;

diff --git a/forge/src/main/java/com/tristankechlo/livingthings/platform/ForgePlatformHelper.java b/forge/src/main/java/com/tristankechlo/livingthings/platform/ForgePlatformHelper.java
@@ -50,12 +50,6 @@ public Path getConfigDirectory() {
         return FMLPaths.CONFIGDIR.get();
     }
 
-    @Override
-    public Component getPatchouliSubtitle(ResourceLocation bookId) {
-        // Patchouli no longer available for Forge
-        return Component.literal("2nd Edition");
-    }
-
     @Override
     public void openBookEntry(ResourceLocation bookId, ResourceLocation entryId, int page) {
         // Patchouli no longer available for Forge

diff --git a/neoforge/src/main/java/com/tristankechlo/livingthings/NeoForgeLivingThings.java b/neoforge/src/main/java/com/tristankechlo/livingthings/NeoForgeLivingThings.java
@@ -1,11 +1,10 @@
 package com.tristankechlo.livingthings;
 
 import com.mojang.serialization.MapCodec;
-import com.tristankechlo.livingthings.util.LivingThingsBiomeModifier;
-import com.mojang.serialization.Codec;
 import com.tristankechlo.livingthings.commands.LivingThingsCommand;
 import com.tristankechlo.livingthings.config.ConfigManager;
 import com.tristankechlo.livingthings.events.BlockEvents;
+import com.tristankechlo.livingthings.util.LivingThingsBiomeModifier;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.bus.api.IEventBus;

diff --git a/neoforge/src/main/java/com/tristankechlo/livingthings/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/com/tristankechlo/livingthings/platform/NeoForgePlatformHelper.java
@@ -2,8 +2,6 @@
 
 import com.tristankechlo.livingthings.entity.SeahorseEntity;
 import com.tristankechlo.livingthings.init.ModItems;
-import com.tristankechlo.livingthings.platform.IPlatformHelper;
-import com.tristankechlo.livingthings.platform.RegistryObject;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -52,11 +50,6 @@ public Path getConfigDirectory() {
         return FMLPaths.CONFIGDIR.get();
     }
 
-    @Override
-    public Component getPatchouliSubtitle(ResourceLocation bookId) {
-        return vazkii.patchouli.api.PatchouliAPI.get().getSubtitle(bookId);
-    }
-
     @Override
     public void openBookEntry(ResourceLocation bookId, ResourceLocation entryId, int page) {
         vazkii.patchouli.api.PatchouliAPI.get().openBookEntry(bookId, entryId, page);