From 5e094672e1c51e28931904fbf585ba42b5f783f5 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Fri, 22 Nov 2019 17:37:07 -0500 Subject: [PATCH 01/13] Starting on TC support --- build.gradle | 1 + .../BetterAnimalsPlusMod.java | 3 ++ .../integration/ThaumcraftIntegration.java | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java diff --git a/build.gradle b/build.gradle index 02b79b4b..da9aa41a 100644 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,7 @@ repositories { dependencies { deobfCompile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2" deobfProvided "mezz.jei:jei_1.12.2:4.15.0.268:api" + deobfProvided "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" runtime "mezz.jei:jei_1.12.2:4.15.0.268" deobfCompile "com.github.glitchfiend.biomesoplenty:BiomesOPlenty:1.12.2-7.0.1.2399:universal" deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" diff --git a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java index c5897362..48ba9466 100644 --- a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java +++ b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java @@ -3,6 +3,8 @@ import java.io.File; import java.util.function.Supplier; +import its_meow.betteranimalsplus.integration.ThaumcraftIntegration; +import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -106,6 +108,7 @@ public void preInit(FMLPreInitializationEvent event) { NETWORK_INSTANCE.registerMessage(ClientConfigurationPacket.class, ClientConfigurationPacket.class, packets++, Side.CLIENT); ModLootTables.register(); ModTriggers.register(); + if (Loader.isModLoaded("thaumcraft")) MinecraftForge.EVENT_BUS.register(new ThaumcraftIntegration()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.PHEASANT_EGG, new BehaviorProjectileDispense() { protected IProjectile getProjectileEntity(World worldIn, IPosition position, ItemStack stackIn) { return new EntityPheasantEgg(worldIn, position.getX(), position.getY(), position.getZ()); diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java new file mode 100644 index 00000000..33680db1 --- /dev/null +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -0,0 +1,28 @@ +package its_meow.betteranimalsplus.integration; + +import its_meow.betteranimalsplus.init.ModBlocks; +import its_meow.betteranimalsplus.init.ModItems; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.AspectRegistryEvent; + +/** + * Created by Joseph on 11/22/2019. + */ +public class ThaumcraftIntegration { + @SubscribeEvent + public void aspectRegistrationEvent(AspectRegistryEvent event) { + event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5)); + + event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_RAW), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.PROTECT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_RAW), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.CRAFT, 1)); + + event.register.registerObjectTag(new ItemStack(ModItems.goatMilk), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.goatCheese), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); + + event.register.registerObjectTag(new ItemStack(ModBlocks.trillium), new AspectList().add(Aspect.PLANT, 5).add(Aspect.EARTH, 5)); + } +} From dc666128d34394d3322cedadc4d9073f7f8b6442 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sat, 23 Nov 2019 17:24:32 -0500 Subject: [PATCH 02/13] Commit this now. See if Meow has anymore changes to make. --- .../integration/ThaumcraftIntegration.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 33680db1..0972684a 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -18,11 +18,17 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5)); event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_RAW), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.PROTECT, 5)); - event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_RAW), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.CRAFT, 1)); + event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_COOKED), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.CRAFT, 1)); - event.register.registerObjectTag(new ItemStack(ModItems.goatMilk), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); - event.register.registerObjectTag(new ItemStack(ModItems.goatCheese), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.ANTLER), new AspectList().add(Aspect.AVERSION, 5).add(Aspect.BEAST, 5).add(Aspect.EARTH, 5)); - event.register.registerObjectTag(new ItemStack(ModBlocks.trillium), new AspectList().add(Aspect.PLANT, 5).add(Aspect.EARTH, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.GOAT_MILK), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.GOAT_CHEESE), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); + + event.register.registerObjectTag(new ItemStack(ModBlocks.TRILLIUM), new AspectList().add(Aspect.PLANT, 5).add(Aspect.EARTH, 5)); + event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_RAW), new AspectList().add(Aspect.BEAST, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); + event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_COOKED), new AspectList().add(Aspect.CRAFT, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); } } From 01c252632aab89c5fa068a4b4a5563113ba38bdc Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sat, 23 Nov 2019 17:57:56 -0500 Subject: [PATCH 03/13] Update ThaumcraftIntegration.java --- .../integration/ThaumcraftIntegration.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 0972684a..6ac667d0 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -21,6 +21,16 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_COOKED), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.CRAFT, 1)); event.register.registerObjectTag(new ItemStack(ModItems.ANTLER), new AspectList().add(Aspect.AVERSION, 5).add(Aspect.BEAST, 5).add(Aspect.EARTH, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.WOLF_PELT_BLACK), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.WOLF_PELT_TIMBER), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.WOLF_PELT_SNOWY), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.BEAR_SKIN_BLACK), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.BEAR_SKIN_BROWN), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.BEAR_SKIN_KERMODE), new AspectList().add(Aspect.BEAST, 5).add(Aspect.CRAFT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModItems.GOAT_MILK), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); event.register.registerObjectTag(new ItemStack(ModItems.GOAT_CHEESE), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); From da74720266d3b9fdebfd6f4148b5f5a681f87bb9 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sat, 23 Nov 2019 18:09:44 -0500 Subject: [PATCH 04/13] Update ThaumcraftIntegration.java --- .../betteranimalsplus/integration/ThaumcraftIntegration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 6ac667d0..2016217e 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -31,6 +31,8 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.VENISON_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.PROTECT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.VENISON_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.PROTECT, 5)); event.register.registerObjectTag(new ItemStack(ModItems.GOAT_MILK), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); event.register.registerObjectTag(new ItemStack(ModItems.GOAT_CHEESE), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); From 76908c6a81d09177854f4920bfcb30558675e2ad Mon Sep 17 00:00:00 2001 From: its_meow Date: Sat, 23 Nov 2019 18:10:47 -0500 Subject: [PATCH 05/13] Use deobfCompile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index da9aa41a..84707ad2 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ repositories { dependencies { deobfCompile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2" deobfProvided "mezz.jei:jei_1.12.2:4.15.0.268:api" - deobfProvided "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" + deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" runtime "mezz.jei:jei_1.12.2:4.15.0.268" deobfCompile "com.github.glitchfiend.biomesoplenty:BiomesOPlenty:1.12.2-7.0.1.2399:universal" deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" From bf03dfc7b4f38d21294a9731fb41b101008354cd Mon Sep 17 00:00:00 2001 From: its_meow Date: Sat, 23 Nov 2019 18:12:42 -0500 Subject: [PATCH 06/13] Fix classloading TCIntegration --- .../its_meow/betteranimalsplus/BetterAnimalsPlusMod.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java index 5fe58d77..034b48f2 100644 --- a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java +++ b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java @@ -108,7 +108,6 @@ public void preInit(FMLPreInitializationEvent event) { NETWORK_INSTANCE.registerMessage(ClientConfigurationPacket.class, ClientConfigurationPacket.class, packets++, Side.CLIENT); ModLootTables.register(); ModTriggers.register(); - if (Loader.isModLoaded("thaumcraft")) MinecraftForge.EVENT_BUS.register(new ThaumcraftIntegration()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.PHEASANT_EGG, new BehaviorProjectileDispense() { protected IProjectile getProjectileEntity(World worldIn, IPosition position, ItemStack stackIn) { return new EntityPheasantEgg(worldIn, position.getX(), position.getY(), position.getZ()); @@ -125,6 +124,11 @@ protected IProjectile getProjectileEntity(World worldIn, IPosition position, Ite Supplier> registerBaubleHandler = () -> () -> BaubleIntegration::preInit; registerBaubleHandler.get().get().run(); } + if (Loader.isModLoaded("thaumcraft")) { + // fuk u JVM get rekt pt 2 + Supplier> registerTCHandler = () -> () -> MinecraftForge.EVENT_BUS.register(new ThaumcraftIntegration()); + registerTCHandler.get().get().run(); + } } @EventHandler From 52720e6e8e0f9ab8f37532f6f5fe1fd9cb52cd8c Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sat, 23 Nov 2019 18:24:21 -0500 Subject: [PATCH 07/13] Fixed broken mod loading --- .../java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java index 034b48f2..184f35e9 100644 --- a/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java +++ b/src/main/java/its_meow/betteranimalsplus/BetterAnimalsPlusMod.java @@ -126,8 +126,8 @@ protected IProjectile getProjectileEntity(World worldIn, IPosition position, Ite } if (Loader.isModLoaded("thaumcraft")) { // fuk u JVM get rekt pt 2 - Supplier> registerTCHandler = () -> () -> MinecraftForge.EVENT_BUS.register(new ThaumcraftIntegration()); - registerTCHandler.get().get().run(); + Supplier registerTCHandler = () -> () -> MinecraftForge.EVENT_BUS.register(new ThaumcraftIntegration()); + registerTCHandler.get().run(); } } From 258d83109dd17160fc76921c8e0fe422473bde6a Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sat, 23 Nov 2019 18:36:01 -0500 Subject: [PATCH 08/13] Figured out name format for mobs, will continue this tomorrow though. --- .../betteranimalsplus/integration/ThaumcraftIntegration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 2016217e..15a39b11 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -4,6 +4,7 @@ import its_meow.betteranimalsplus.init.ModItems; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.AspectRegistryEvent; @@ -42,5 +43,7 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_RAW), new AspectList().add(Aspect.BEAST, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_COOKED), new AspectList().add(Aspect.CRAFT, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); + + ThaumcraftApi.registerEntityTag("betteranimalsplus.lammergeier", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DEATH, 5).add(Aspect.FLIGHT, 5)); } } From 8d78a18fe2a78e038a6dd82e5fea0c2a23c5da37 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Sun, 24 Nov 2019 19:23:47 -0500 Subject: [PATCH 09/13] More aspect work --- .../integration/ThaumcraftIntegration.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 15a39b11..38ee9336 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -18,6 +18,8 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModItems.PHEASANT_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5)); event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.FRIED_EGG), new AspectList().add(Aspect.BEAST, 5).add(Aspect.FIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_RAW), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.PROTECT, 5)); event.register.registerObjectTag(new ItemStack(ModItems.CRAB_MEAT_COOKED), new AspectList().add(Aspect.LIFE, 5).add(Aspect.BEAST, 5).add(Aspect.CRAFT, 1)); @@ -40,10 +42,16 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModBlocks.TRILLIUM), new AspectList().add(Aspect.PLANT, 5).add(Aspect.EARTH, 5)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_LEG_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.TURKEY_LEG_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_RAW), new AspectList().add(Aspect.BEAST, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.DESIRE, 5)); event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_COOKED), new AspectList().add(Aspect.CRAFT, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); + event.register.registerObjectTag(new ItemStack(ModBlocks.HAND_OF_FATE), new AspectList().add(Aspect.MAGIC, 40).add(Aspect.SOUL, 40).add(Aspect.DESIRE, 40)); ThaumcraftApi.registerEntityTag("betteranimalsplus.lammergeier", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DEATH, 5).add(Aspect.FLIGHT, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.turkey", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DESIRE, 5).add(Aspect.AIR, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.fox", new AspectList().add(Aspect.BEAST, 15).add(Aspect.DARKNESS, 15).add(Aspect.SENSES, 15)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.boar", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.EARTH, 35)); } } From e2ec108b78453267038d2f56b946c701e9e41ae4 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Mon, 25 Nov 2019 18:07:15 -0500 Subject: [PATCH 10/13] Continue aspects --- .../betteranimalsplus/integration/ThaumcraftIntegration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 38ee9336..a284b77d 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -53,5 +53,7 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { ThaumcraftApi.registerEntityTag("betteranimalsplus.turkey", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DESIRE, 5).add(Aspect.AIR, 5)); ThaumcraftApi.registerEntityTag("betteranimalsplus.fox", new AspectList().add(Aspect.BEAST, 15).add(Aspect.DARKNESS, 15).add(Aspect.SENSES, 15)); ThaumcraftApi.registerEntityTag("betteranimalsplus.boar", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.EARTH, 35)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.jellyfish", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.AVERSION, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.lamprey", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.AVERSION, 5)); } } From 3f025f53736f95fa2b57f0532932a8301674bf7a Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Mon, 25 Nov 2019 18:28:49 -0500 Subject: [PATCH 11/13] Almost there. Just need to get some more mobs, and then I can touch the heads --- .../integration/ThaumcraftIntegration.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index a284b77d..8e47d257 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -2,6 +2,7 @@ import its_meow.betteranimalsplus.init.ModBlocks; import its_meow.betteranimalsplus.init.ModItems; +import its_meow.betteranimalsplus.util.HeadTypes; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import thaumcraft.api.ThaumcraftApi; @@ -55,5 +56,11 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { ThaumcraftApi.registerEntityTag("betteranimalsplus.boar", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.EARTH, 35)); ThaumcraftApi.registerEntityTag("betteranimalsplus.jellyfish", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.AVERSION, 5)); ThaumcraftApi.registerEntityTag("betteranimalsplus.lamprey", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.AVERSION, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.songbird", new AspectList().add(Aspect.BEAST, 5).add(Aspect.AIR, 5).add(Aspect.FLIGHT, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.squirrel", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DESIRE, 5).add(Aspect.EARTH, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.badger", new AspectList().add(Aspect.BEAST, 10).add(Aspect.AVERSION, 10).add(Aspect.EARTH, 10)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.feralwolf", new AspectList().add(Aspect.BEAST, 20).add(Aspect.AVERSION, 20).add(Aspect.DARKNESS, 20)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.coyote", new AspectList().add(Aspect.BEAST, 20).add(Aspect.AVERSION, 20).add(Aspect.DARKNESS, 20)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.shark", new AspectList().add(Aspect.BEAST, 35).add(Aspect.WATER, 35).add(Aspect.DARKNESS, 35).add(Aspect.AVERSION, 35)); } } From 46ddb3c9870bd88041144f167161c149b7b821dc Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Mon, 25 Nov 2019 18:44:02 -0500 Subject: [PATCH 12/13] Done with mobs, now onto heads. --- .../integration/ThaumcraftIntegration.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 8e47d257..8df4a36b 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -61,6 +61,18 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { ThaumcraftApi.registerEntityTag("betteranimalsplus.badger", new AspectList().add(Aspect.BEAST, 10).add(Aspect.AVERSION, 10).add(Aspect.EARTH, 10)); ThaumcraftApi.registerEntityTag("betteranimalsplus.feralwolf", new AspectList().add(Aspect.BEAST, 20).add(Aspect.AVERSION, 20).add(Aspect.DARKNESS, 20)); ThaumcraftApi.registerEntityTag("betteranimalsplus.coyote", new AspectList().add(Aspect.BEAST, 20).add(Aspect.AVERSION, 20).add(Aspect.DARKNESS, 20)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.moose", new AspectList().add(Aspect.BEAST, 40).add(Aspect.AVERSION, 40).add(Aspect.EARTH, 40)); ThaumcraftApi.registerEntityTag("betteranimalsplus.shark", new AspectList().add(Aspect.BEAST, 35).add(Aspect.WATER, 35).add(Aspect.DARKNESS, 35).add(Aspect.AVERSION, 35)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.crab", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.PROTECT, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.horseshoecrab", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.PROTECT, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.nautilus", new AspectList().add(Aspect.BEAST, 5).add(Aspect.WATER, 5).add(Aspect.PROTECT, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.reindeer", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.COLD, 35)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.pheasant", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DESIRE, 5).add(Aspect.AIR, 5)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.goat", new AspectList().add(Aspect.BEAST, 20).add(Aspect.FIRE, 20).add(Aspect.DARKNESS, 20)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.deer", new AspectList().add(Aspect.BEAST, 25).add(Aspect.AVERSION, 25).add(Aspect.PLANT, 25)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.blackbear", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.EARTH, 35)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.brownbear", new AspectList().add(Aspect.BEAST, 35).add(Aspect.AVERSION, 35).add(Aspect.EARTH, 35)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.tarantula", new AspectList().add(Aspect.BEAST, 25).add(Aspect.AVERSION, 25).add(Aspect.PROTECT, 25)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.hirschgeist", new AspectList().add(Aspect.SOUL, 35).add(Aspect.MAGIC, 35).add(Aspect.DARKNESS, 35).add(Aspect.FIRE, 35)); } } From 0c645679c6a223ca3a37a233dcad8fe0f1d141e7 Mon Sep 17 00:00:00 2001 From: Sunconure11 Date: Mon, 25 Nov 2019 19:16:37 -0500 Subject: [PATCH 13/13] Aspects are done. Merge this @itsmeow Also I added oredict definitions for turkey and crab. I'll let you judge those as well. --- .../init/ModOreDictSmelting.java | 6 ++++ .../integration/ThaumcraftIntegration.java | 35 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java b/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java index 55b874cc..fdad8313 100644 --- a/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java +++ b/src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java @@ -17,10 +17,16 @@ public static final void register() { // Register oredict OreDictionary.registerOre("listAllmeatraw", ModItems.VENISON_RAW); OreDictionary.registerOre("listAllmeatcooked", ModItems.VENISON_COOKED); + OreDictionary.registerOre("listAllmeatraw", ModItems.TURKEY_RAW); + OreDictionary.registerOre("listAllmeatcooked", ModItems.TURKEY_COOKED); + OreDictionary.registerOre("listAllmeatraw", ModItems.TURKEY_LEG_RAW); + OreDictionary.registerOre("listAllmeatcooked", ModItems.TURKEY_LEG_COOKED); OreDictionary.registerOre("listAllmeatraw", ModItems.PHEASANT_RAW); OreDictionary.registerOre("listAllmeatcooked", ModItems.PHEASANT_COOKED); OreDictionary.registerOre("listAllvenisonraw", ModItems.VENISON_RAW); OreDictionary.registerOre("listAllvenisoncooked", ModItems.VENISON_COOKED); + OreDictionary.registerOre("listAllfishraw", ModItems.CRAB_MEAT_RAW); + OreDictionary.registerOre("listAllfishcooked", ModItems.CRAB_MEAT_COOKED); OreDictionary.registerOre("listAllMilk", ModItems.GOAT_MILK); OreDictionary.registerOre("listAllGoatMilk", ModItems.GOAT_MILK); OreDictionary.registerOre("foodGoatMilk", ModItems.GOAT_MILK); diff --git a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java index 8df4a36b..724694c3 100644 --- a/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java +++ b/src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java @@ -38,6 +38,8 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModItems.VENISON_COOKED), new AspectList().add(Aspect.CRAFT, 5).add(Aspect.LIFE, 5).add(Aspect.PROTECT, 5)); event.register.registerObjectTag(new ItemStack(ModItems.VENISON_RAW), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.PROTECT, 5)); + event.register.registerObjectTag(new ItemStack(ModItems.HIRSCHGEIST_SKULL_WEARABLE), new AspectList().add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25).add(Aspect.MAGIC, 25)); + event.register.registerObjectTag(new ItemStack(ModItems.GOAT_MILK), new AspectList().add(Aspect.METAL, 33).add(Aspect.LIFE, 10).add(Aspect.VOID, 5).add(Aspect.BEAST, 5).add(Aspect.WATER, 5)); event.register.registerObjectTag(new ItemStack(ModItems.GOAT_CHEESE), new AspectList().add(Aspect.BEAST, 5).add(Aspect.LIFE, 5).add(Aspect.CRAFT, 5)); @@ -50,6 +52,39 @@ public void aspectRegistrationEvent(AspectRegistryEvent event) { event.register.registerObjectTag(new ItemStack(ModBlocks.TURKEY_EATEN_COOKED), new AspectList().add(Aspect.CRAFT, 3).add(Aspect.LIFE, 3).add(Aspect.DESIRE, 3)); event.register.registerObjectTag(new ItemStack(ModBlocks.HAND_OF_FATE), new AspectList().add(Aspect.MAGIC, 40).add(Aspect.SOUL, 40).add(Aspect.DESIRE, 40)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BEARHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BEARHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BEARHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.BOARHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BOARHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BOARHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.BOARHEAD.getItem(4)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.MOOSEHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.MOOSEHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.MOOSEHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.MOOSEHEAD.getItem(4)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.DEERHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.DEERHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.REINDEERHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.REINDEERHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.REINDEERHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.REINDEERHEAD.getItem(4)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.FOXHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.FOXHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.FOXHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.FOXHEAD.getItem(4)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.WOLFHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.WOLFHEAD.getItem(2)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + event.register.registerObjectTag(new ItemStack(HeadTypes.WOLFHEAD.getItem(3)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + + event.register.registerObjectTag(new ItemStack(HeadTypes.COYOTEHEAD.getItem(1)), new AspectList().add(Aspect.BEAST, 25).add(Aspect.SOUL, 25).add(Aspect.CRAFT, 25)); + ThaumcraftApi.registerEntityTag("betteranimalsplus.lammergeier", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DEATH, 5).add(Aspect.FLIGHT, 5)); ThaumcraftApi.registerEntityTag("betteranimalsplus.turkey", new AspectList().add(Aspect.BEAST, 5).add(Aspect.DESIRE, 5).add(Aspect.AIR, 5)); ThaumcraftApi.registerEntityTag("betteranimalsplus.fox", new AspectList().add(Aspect.BEAST, 15).add(Aspect.DARKNESS, 15).add(Aspect.SENSES, 15));