From 25a420aea729361bca74e4ec91c55448fcd0a17a Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:02:03 +0100 Subject: [PATCH] Once is plenty, innit --- .../potatoCannon/AllPotatoProjectileBlockHitActions.java | 6 +++++- .../potatoCannon/AllPotatoProjectileEntityHitActions.java | 6 +++++- .../potatoCannon/AllPotatoProjectileRenderModes.java | 6 +++++- .../item/filter/attribute/AllItemAttributeTypes.java | 8 ++++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java index 8578b05a16..cb6045e082 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileBlockHitActions.java @@ -24,10 +24,14 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.registries.ForgeRegistries; public class AllPotatoProjectileBlockHitActions { - public static void init() { + + static { register("plant_crop", PlantCrop.CODEC); register("place_block_on_ground", PlaceBlockOnGround.CODEC); } + + public static void init() { + } private static void register(String name, Codec codec) { Registry.register(CreateBuiltInRegistries.POTATO_PROJECTILE_BLOCK_HIT_ACTION, Create.asResource(name), codec); diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileEntityHitActions.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileEntityHitActions.java index 501a285fb1..de99905446 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileEntityHitActions.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileEntityHitActions.java @@ -42,7 +42,8 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.EntityTeleportEvent; public class AllPotatoProjectileEntityHitActions { - public static void init() { + + static { register("set_on_fire", SetOnFire.CODEC); register("potion_effect", PotionEffect.CODEC); register("food_effects", FoodEffects.CODEC); @@ -50,6 +51,9 @@ public class AllPotatoProjectileEntityHitActions { register("cure_zombie_villager", CureZombieVillager.CODEC); register("suspicious_stew", SuspiciousStew.CODEC); } + + public static void init() { + } private static void register(String name, Codec codec) { Registry.register(CreateBuiltInRegistries.POTATO_PROJECTILE_ENTITY_HIT_ACTION, Create.asResource(name), codec); diff --git a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileRenderModes.java b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileRenderModes.java index ca1254d972..2b8a985e20 100644 --- a/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileRenderModes.java +++ b/src/main/java/com/simibubi/create/content/equipment/potatoCannon/AllPotatoProjectileRenderModes.java @@ -19,12 +19,16 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public class AllPotatoProjectileRenderModes { - public static void init() { + + static { register("billboard", Billboard.CODEC); register("tumble", Tumble.CODEC); register("toward_motion", TowardMotion.CODEC); register("stuck_to_entity", StuckToEntity.CODEC); } + + public static void init() { + } private static void register(String name, Codec codec) { Registry.register(CreateBuiltInRegistries.POTATO_PROJECTILE_RENDER_MODE, Create.asResource(name), codec); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java index 84fafcb6c4..100eb1f024 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java @@ -83,6 +83,11 @@ public class AllItemAttributeTypes { ASTRAL_CRYSTAL = register("astral_crystal", new AstralSorceryCrystalAttribute.Type()), ASTRAL_PERK_GEM = register("astral_perk_gem", new AstralSorceryPerkGemAttribute.Type()); + static { + // Register legacy deserializers to maintain backwards compatability + AllItemAttributeLegacyDeserializers.register(); + } + private static > boolean testRecipe(ItemStack s, Level w, RecipeType type) { RECIPE_WRAPPER.setItem(0, s.copy()); return w.getRecipeManager() @@ -111,7 +116,6 @@ public class AllItemAttributeTypes { } public static void init() { - // Register legacy deserializers to maintain backwards compatability - AllItemAttributeLegacyDeserializers.register(); } + }