Ported to 1.18.2

GirafiStudios · Mar 6, 2022 · b71164b · b71164b
1 parent f4d5021
commit b71164b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 25 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-minecraft_version=1.18
-forge_version=38.0.8
-mod_version=0.8.18
+minecraft_version=1.18.2
+forge_version=40.0.4
+mod_version=0.8.19
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
diff --git a/src/main/java/com/girafi/waddles/Waddles.java b/src/main/java/com/girafi/waddles/Waddles.java
@@ -35,6 +35,7 @@ public void setupClient(final FMLClientSetupEvent event) {
 
     public static void registerDeferredRegistries(IEventBus modBus) {
         PenguinRegistry.ENTITY_DEFERRED.register(modBus);
+        PenguinRegistry.ITEM_DEFERRED.register(modBus);
         WaddlesSounds.SOUND_EVENT_DEFERRED.register(modBus);
     }
 }
diff --git a/src/main/java/com/girafi/waddles/init/PenguinRegistry.java b/src/main/java/com/girafi/waddles/init/PenguinRegistry.java
@@ -13,6 +13,9 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.SpawnEggItem;
 import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraftforge.common.ForgeSpawnEggItem;
+import net.minecraftforge.common.util.Lazy;
+import net.minecraftforge.common.util.NonNullLazy;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -22,22 +25,21 @@
 import net.minecraftforge.registries.RegistryObject;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 @EventBusSubscriber(modid = Waddles.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class PenguinRegistry {
     public static final DeferredRegister<EntityType<?>> ENTITY_DEFERRED = DeferredRegister.create(ForgeRegistries.ENTITIES, Waddles.MOD_ID);
-    private static final List<Item> SPAWN_EGGS = Lists.newArrayList();
+    public static final DeferredRegister<Item> ITEM_DEFERRED = DeferredRegister.create(ForgeRegistries.ITEMS, Waddles.MOD_ID);
 
-    public static final RegistryObject<EntityType<AdeliePenguinEntity>> ADELIE_PENGUIN = createEntity("adelie_penguin", AdeliePenguinEntity::new, 0.4F, 0.95F, 0x000000, 0xFFFFFF);
+    public static final RegistryObject<EntityType<AdeliePenguinEntity>> ADELIE_PENGUIN = registerPenguin("adelie_penguin", () -> AdeliePenguinEntity::new, 0.4F, 0.95F, 0x000000, 0xFFFFFF);
 
-    private static <T extends Animal> RegistryObject<EntityType<T>> createEntity(String name, EntityType.EntityFactory<T> factory, float width, float height, int eggPrimary, int eggSecondary) {
+    private static <T extends Animal> RegistryObject<EntityType<T>> registerPenguin(String name, Supplier<EntityType.EntityFactory<T>> factory, float width, float height, int eggPrimary, int eggSecondary) {
         ResourceLocation location = new ResourceLocation(Waddles.MOD_ID, name);
-        EntityType<T> entity = EntityType.Builder.of(factory, MobCategory.CREATURE).sized(width, height).setTrackingRange(64).setUpdateInterval(1).build(location.toString());
-        Item spawnEgg = new SpawnEggItem(entity, eggPrimary, eggSecondary, (new Item.Properties()).tab(CreativeModeTab.TAB_MISC));
-        spawnEgg.setRegistryName(new ResourceLocation(Waddles.MOD_ID, name + "_spawn_egg"));
-        SPAWN_EGGS.add(spawnEgg);
+        RegistryObject<EntityType<T>> entityType = ENTITY_DEFERRED.register(name, () -> EntityType.Builder.of(factory.get(), MobCategory.CREATURE).sized(width, height).setTrackingRange(64).setUpdateInterval(1).build(location.toString()));
 
-        return ENTITY_DEFERRED.register(name, () -> entity);
+        ITEM_DEFERRED.register(name + "_spawn_egg", () -> new ForgeSpawnEggItem(entityType, eggPrimary, eggSecondary, (new Item.Properties()).tab(CreativeModeTab.TAB_MISC)));
+        return entityType;
     }
 
     @SubscribeEvent
@@ -49,12 +51,4 @@ public static void registerEntities(RegistryEvent.Register<EntityType<?>> event)
     public static void addEntityAttributes(EntityAttributeCreationEvent event) {
         event.put(ADELIE_PENGUIN.get(), AdeliePenguinEntity.createAttributes().build());
     }
-
-    @SubscribeEvent
-    public static void registerSpawnEggs(RegistryEvent.Register<Item> event) {
-        for (Item spawnEgg : SPAWN_EGGS) {
-            Preconditions.checkNotNull(spawnEgg.getRegistryName(), "registryName");
-            event.getRegistry().register(spawnEgg);
-        }
-    }
 }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[38,)"
+loaderVersion="[40,)"
 logoFile="logo.png"
 license="All Right Reserved"
 
@@ -18,6 +18,6 @@ license="All Right Reserved"
 [[dependencies.waddles]]
     modId="forge"
     mandatory=true
-    versionRange="[38.0.8,)"
+    versionRange="[40,)"
     ordering="AFTER"
     side="BOTH"
diff --git a/src/main/resources/assets/waddles/sounds.json b/src/main/resources/assets/waddles/sounds.json
@@ -1,27 +1,23 @@
 {
     "adelie.ambient": {
-        "category": "neutral",
         "sounds": [
             "waddles:adelie_ambient"
         ],
         "subtitle": "waddles:subtitles.adelie.ambient"
     },
     "adelie.baby.ambient": {
-        "category": "neutral",
         "sounds": [
             "waddles:adelie_baby_ambient"
         ],
         "subtitle": "waddles:subtitles.adelie.baby.ambient"
     },
     "adelie.death": {
-        "category": "neutral",
         "sounds": [
             "waddles:adelie_death"
         ],
         "subtitle": "waddles:subtitles.adelie.death"
     },
     "adelie.hurt": {
-        "category": "neutral",
         "sounds": [
             "waddles:adelie_hurt"
         ],