Skip to content

Commit

Permalink
Aspects are done. Merge this @itsmeow
Browse files Browse the repository at this point in the history 
Also I added oredict definitions for turkey and crab. I'll let you judge those as well.
  • Loading branch information
@Sunconure11
Sunconure11 committed Nov 26, 2019
1 parent 46ddb3c commit 0c64567
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/main/java/its_meow/betteranimalsplus/init/ModOreDictSmelting.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/its_meow/betteranimalsplus/integration/ThaumcraftIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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));
Expand Down

0 comments on commit 0c64567

Please sign in to comment.