From 746c16cbb36c59e314bf2276c892bbeb2545edf8 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sat, 11 Jul 2015 16:24:50 -0700 Subject: [PATCH] My hands are typing words! NEI, Thaumcraft aspects --- .../java/fox/spiteful/avaritia/Avaritia.java | 9 +- .../fox/spiteful/avaritia/ClientProxy.java | 2 +- .../fox/spiteful/avaritia/Lumberjack.java | 2 +- .../fox/spiteful/avaritia/compat/Compat.java | 39 ++++ .../compat/ExtremeShapedRecipeHandler.java | 170 ++++++++++++++++++ .../fox/spiteful/avaritia/compat/Lucrum.java | 24 +++ .../spiteful/avaritia/crafting/Grinder.java | 14 +- .../fox/spiteful/avaritia/gui/GUINeutron.java | 5 +- .../spiteful/avaritia/items/ItemResource.java | 4 +- .../FancyHaloRenderer.java | 2 +- .../resources/assets/avaritia/lang/en_US.lang | 3 +- .../avaritia/textures/misc/terminus.png | Bin 0 -> 1998 bytes 12 files changed, 255 insertions(+), 19 deletions(-) create mode 100644 src/main/java/fox/spiteful/avaritia/compat/Compat.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/Lucrum.java rename src/main/java/fox/spiteful/avaritia/{pretties => render}/FancyHaloRenderer.java (98%) create mode 100644 src/main/resources/assets/avaritia/textures/misc/terminus.png diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index a264dc5..e4d7053 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -1,14 +1,15 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.gui.GooeyHandler; import fox.spiteful.avaritia.items.LudicrousItems; @@ -18,14 +19,15 @@ public class Avaritia { @Instance public static Avaritia instance; - @SidedProxy(serverSide="fox.spiteful.avaritia.CommonProxy", clientSide="fox.spiteful.avaritia.ClientProxy") + @SidedProxy(serverSide = "fox.spiteful.avaritia.CommonProxy", clientSide = "fox.spiteful.avaritia.ClientProxy") public static CommonProxy proxy; - + @EventHandler public void earlyGame(FMLPreInitializationEvent event){ instance = this; LudicrousItems.grind(); LudicrousBlocks.voxelize(); + Compat.census(); } @EventHandler @@ -37,5 +39,6 @@ public class Avaritia { @EventHandler public void endGame(FMLPostInitializationEvent event){ + Compat.compatify(); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/ClientProxy.java b/src/main/java/fox/spiteful/avaritia/ClientProxy.java index 9046873..bb161c8 100644 --- a/src/main/java/fox/spiteful/avaritia/ClientProxy.java +++ b/src/main/java/fox/spiteful/avaritia/ClientProxy.java @@ -1,7 +1,7 @@ package fox.spiteful.avaritia; import fox.spiteful.avaritia.items.LudicrousItems; -import fox.spiteful.avaritia.pretties.FancyHaloRenderer; +import fox.spiteful.avaritia.render.FancyHaloRenderer; import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/fox/spiteful/avaritia/Lumberjack.java b/src/main/java/fox/spiteful/avaritia/Lumberjack.java index 3221540..b98fea8 100644 --- a/src/main/java/fox/spiteful/avaritia/Lumberjack.java +++ b/src/main/java/fox/spiteful/avaritia/Lumberjack.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class Lumberjack { - public static final Logger logger = LogManager.getLogger("Magic Trees"); + public static final Logger logger = LogManager.getLogger("Avaritia"); public static void log(Level level, Throwable e, String message) { log(level, message); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java new file mode 100644 index 0000000..fd7fdb7 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -0,0 +1,39 @@ +package fox.spiteful.avaritia.compat; + +import cpw.mods.fml.common.Loader; + +public class Compat { + + public static boolean nei = false; + public static boolean thaumic = false; + + public static void census(){ + nei = Loader.isModLoaded("NotEnoughItems"); + thaumic = Loader.isModLoaded("Thaumcraft"); + } + + public static void compatify(){ + if(nei){ + try + { + Class handler = Class.forName("fox.spiteful.avaritia.compat.ExtremeShapedRecipeHandler"); + Class api = Class.forName("codechicken.nei.api.API"); + api.getMethod("registerRecipeHandler", Class.forName("codechicken.nei.recipe.ICraftingHandler")).invoke(null, handler.newInstance()); + api.getMethod("registerUsageHandler", Class.forName("codechicken.nei.recipe.IUsageHandler")).invoke(null, handler.newInstance()); + } + catch(Exception e) + { + e.printStackTrace(); + } + } + if(thaumic){ + try + { + Lucrum.abracadabra(); + } + catch(Throwable e){ + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java new file mode 100644 index 0000000..87302f6 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/ExtremeShapedRecipeHandler.java @@ -0,0 +1,170 @@ +package fox.spiteful.avaritia.compat; + +import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; +import fox.spiteful.avaritia.crafting.ExtremeShapedRecipe; +import fox.spiteful.avaritia.gui.GUIExtremeCrafting; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.RecipeInfo; +import codechicken.nei.recipe.ShapedRecipeHandler; + +import java.util.ArrayList; +import java.util.List; + +public class ExtremeShapedRecipeHandler extends ShapedRecipeHandler +{ + public class CachedExtremeRecipe extends CachedRecipe + { + public CachedExtremeRecipe(ExtremeShapedRecipe recipe) + { + this(recipe.recipeWidth, recipe.recipeHeight, recipe.recipeItems, recipe.getRecipeOutput()); + } + + public CachedExtremeRecipe(int width, int height, Object[] items, ItemStack out) + { + this.result = new PositionedStack(out, 201, 75); + this.ingredients = new ArrayList(); + setIngredients(width, height, items); + } + + public void setIngredients(int width, int height, Object[] items) + { + for(int x = 0; x < width; x++) + { + for(int y = 0; y < height; y++) + { + if(items[y * width + x] == null) + { + continue; + } + PositionedStack stack = new PositionedStack(items[y * width + x], 3 + x * 18, 3 + y * 18); + stack.setMaxSize(1); + this.ingredients.add(stack); + } + } + } + + @Override + public ArrayList getIngredients() + { + return (ArrayList) getCycledIngredients(ExtremeShapedRecipeHandler.this.cycleticks / 20, this.ingredients); + } + + @Override + public PositionedStack getResult() + { + return this.result; + } + + public ArrayList ingredients; + public PositionedStack result; + } + + @Override + public int recipiesPerPage() + { + return 1; + } + + @Override + public Class getGuiClass() + { + return GUIExtremeCrafting.class; + } + + @Override + public String getRecipeName() + { + return "Xtreme Crafting"; + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) + { + if(outputId.equals("extended") && getClass() == ExtremeShapedRecipeHandler.class) + { + List allrecipes = ExtremeCraftingManager.getInstance().getRecipeList(); + for(IRecipe irecipe : allrecipes) + { + CachedRecipe recipe = null; + if(irecipe instanceof ExtremeShapedRecipe) + recipe = new CachedExtremeRecipe((ExtremeShapedRecipe)irecipe); + + if(recipe == null) + continue; + + this.arecipes.add(recipe); + } + } + else + { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadCraftingRecipes(ItemStack result) + { + List allrecipes = ExtremeCraftingManager.getInstance().getRecipeList(); + for(IRecipe irecipe : allrecipes) + { + if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) + { + CachedRecipe recipe = null; + if(irecipe instanceof ExtremeShapedRecipe) + recipe = new CachedExtremeRecipe((ExtremeShapedRecipe)irecipe); + + if(recipe == null) + continue; + + this.arecipes.add(recipe); + } + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) + { + List allrecipes = ExtremeCraftingManager.getInstance().getRecipeList(); + for(IRecipe irecipe : allrecipes) + { + if(irecipe instanceof ExtremeShapedRecipe) + { + CachedExtremeRecipe recipe = new CachedExtremeRecipe((ExtremeShapedRecipe)irecipe); + if(recipe.contains(recipe.ingredients, ingredient)) + { + recipe.setIngredientPermutation(recipe.ingredients, ingredient); + if(!this.arecipes.contains(recipe)) + this.arecipes.add(recipe); + } + } + + } + } + + @Override + public String getGuiTexture() + { + return "avaritia:textures/gui/dire_crafting_gui.png"; + } + + @Override + public boolean hasOverlay(GuiContainer gui, Container container, int recipe) + { + return RecipeInfo.hasDefaultOverlay(gui, "extreme"); + } + + @Override + public void drawBackground(int recipe) + { + GL11.glColor4f(1, 1, 1, 1); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 9, 5, 223, 166); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java new file mode 100644 index 0000000..c997313 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java @@ -0,0 +1,24 @@ +package fox.spiteful.avaritia.compat; + +import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class Lucrum { + + public static Aspect ULTRA_DEATH; + + public static void abracadabra(){ + ULTRA_DEATH = new Aspect("terminus", 0xb90000, new Aspect[] { Aspect.GREED, Aspect.ELDRITCH }, new ResourceLocation("avaritia", "textures/misc/terminus.png"), 771); + + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 1), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.ENERGY, 8).add(Aspect.CRYSTAL, 32)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 4), new AspectList().add(ULTRA_DEATH, 2).add(Aspect.METAL, 12).add(Aspect.ENERGY, 12)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousBlocks.neutron_collector, 1, OreDictionary.WILDCARD_VALUE), new AspectList().add(ULTRA_DEATH, 5).add(Aspect.METAL, 64).add(Aspect.ENERGY, 64).add(Aspect.MECHANISM, 64)); + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 613d2f3..55171ad 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -14,7 +14,7 @@ public class Grinder { GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 0), new Object[]{"X X", " X ", "X X", 'X', new ItemStack(Items.diamond)}); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 1), new Object[]{"DSD", "DSD", 'D', new ItemStack(LudicrousItems.resource, 1, 0), 'S', new ItemStack(Items.nether_star)}); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.double_craft, 1), new Object[]{"CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.crafting_table)}); - GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.triple_craft, 1), new Object[]{"CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.crafting_table)}); + GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.triple_craft, 1), new Object[]{"CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousBlocks.double_craft)}); GameRegistry.addShapedRecipe(new ItemStack(Blocks.crafting_table, 9), new Object[]{"C", 'C', new ItemStack(LudicrousBlocks.double_craft)}); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.double_craft, 9), new Object[]{"C", 'C', new ItemStack(LudicrousBlocks.triple_craft)}); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.crystal_matrix, 1, 0), new Object[]{"CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 1)}); @@ -28,12 +28,12 @@ public class Grinder { ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.neutron_collector, 1), new Object[]{ "IIQQQQQII", - "I RRRRR I", - "I R I", - "X RRR X", - "I RXR I", - "X RRR X", - "I I", + "I QQQQQ I", + "I RRR I", + "X RRRRR X", + "I RRXRR I", + "X RRRRR X", + "I RRR I", "I I", "IIIXIXIII", 'X', new ItemStack(LudicrousItems.resource, 1, 1), diff --git a/src/main/java/fox/spiteful/avaritia/gui/GUINeutron.java b/src/main/java/fox/spiteful/avaritia/gui/GUINeutron.java index c927cf1..e835622 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/GUINeutron.java +++ b/src/main/java/fox/spiteful/avaritia/gui/GUINeutron.java @@ -13,12 +13,10 @@ import org.lwjgl.opengl.GL11; public class GUINeutron extends GuiContainer { private static final ResourceLocation furnaceGuiTextures = new ResourceLocation("avaritia", "textures/gui/neutron_collector_gui.png"); - private TileEntityNeutron tileNeutron; public GUINeutron(InventoryPlayer player, TileEntityNeutron machine) { super(new ContainerNeutron(player, machine)); - this.tileNeutron = machine; } /** @@ -26,7 +24,8 @@ public class GUINeutron extends GuiContainer */ protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.neutron_collector"), 28, 6, 4210752); + String s = StatCollector.translateToLocal("container.neutron_collector"); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index b46cfd7..8f80bed 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -33,8 +33,8 @@ public class ItemResource extends Item { for (int x = 0; x < types.length; x++) { icons[x] = ir.registerIcon("avaritia:" + "resource_" + types[x]); } - - halo = new IIcon[2]; + + halo = new IIcon[2]; halo[0] = ir.registerIcon("avaritia:halo"); halo[1] = ir.registerIcon("avaritia:halonoise"); } diff --git a/src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java similarity index 98% rename from src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java rename to src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java index bef89f6..bcc3f65 100644 --- a/src/main/java/fox/spiteful/avaritia/pretties/FancyHaloRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/FancyHaloRenderer.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.pretties; +package fox.spiteful.avaritia.render; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 7c219bf..e33ce74 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -15,4 +15,5 @@ tile.dire_crafting.name=Dire Crafting Table tile.neutron_collector.name=Neutron Collector # # Misc -container.neutron_collector=Neutron Collector \ No newline at end of file +container.neutron_collector=Neutron Collector +tc.aspect.terminus=The End of Games, Apocalypse, Grindstones \ No newline at end of file diff --git a/src/main/resources/assets/avaritia/textures/misc/terminus.png b/src/main/resources/assets/avaritia/textures/misc/terminus.png new file mode 100644 index 0000000000000000000000000000000000000000..710966cdc59d4c598d57fb53d453ab1e774aadb7 GIT binary patch literal 1998 zcmV;<2Qm1GP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000L)NklrS*< z5w&zN+NNo3+F-G*+D5w|kk}|ogx~^3P>E7NAff@GaX}*l1aYBksZ~T!HWdX0{VK94 zt3>uymfv%p^B(^rL2bOr$$v9*XYQT5&eyTEwbcdQ1V#eGfnhc_HvD}97!SM!jNm+> z^STL#8fIr_+d4Tp&Bgb-fIcwN&(Ck>-Me?=_UzfS9OH2S6@C3m;6S7F^z`jbO-)ZO zUAlB8ARypZ%$WmA%FD~E+uGW?Vq;@{F@6si0qf90k|KmS=Km88q3KPoT)C3a*Vm^e z>g(&m~t5HU0fX1$=GAhV2&3@0354A9@EzP`TS zA3uJ4{l0zsR$x30;B6UI1gH?(o^MHDLd)4>v-!DCS^r$P==pv@J;u<0Dc@j($ zaf?g@U|&Q;gcruN0u>k;9v(gmvGD`GsmO3z48Me7SXh{=kgpIGxeeOAd-p2v(2`VE z+B2wIus{VS7Zw)Y-~mX-j*yTL7tEOe6X2TFwY9Ym9UL4!$Cz;<---t>VunbP2T*%^ zd-u6>=c2$f2hiN7t%O(@2Ny((z3PsRjvfSJI#MqLW-jL(E~T=wv!fDY0A`KRu3fuq zc;lhy9!LbLWI;e%2{AFs%gf86wY9ZN>>HFSDk|zuoH*fcZ*TuKDx`gJadCxM8j@;i zYU&Ztzd()=psj?+0?7)ePMr$q?(Xgr`(7)dxU~u;6iX-yZ~!pMC-R0Yzhd7@QBO~g zTBTCeo{uYr~S#N69JzXE77!w3zR zFw&=@?r(2yZtfH^6hd|sySceJvl5Cah4S+9a8}IG<_Sy>sWzl~|i{`t)fZ^bIXbkPrh0)6&xZ zdi3a#3TbEwUKXWkh?6+3qrh#%*hq+16wtkV`SNVM2_|5X7N8|q5huX35z@(^YuB#v zhBE+G%*nvq;NalZ5E=xb{~#a>5kog1_;(blZrr-{?Af!C8#ZiM6%!K^%QMjaQ?YNV z5dTa8aqF?D9f1fann3!-o%h4=mYGsuBAKRe;b(^nQl}+62EA!MtCBhs}sEM{Y~~0>Rh-*L}8S%a&!0 zjg8XFiuD9MKfcqrE z53Eg3O-(%`rqn2GE(pS8F_h@~_3PQ-GZA9@36ruFXyR!oMp_$5SFc{p!Wy4pk{ck@ z2R?m*TQ?yH`HVO6@$p$H*r{;n#fulS#84t+gD3dL2(j9P1z8EEqUp_>H*>{4i4b^C z;UYfMm?czVJOXnOewhtyHgwIWa@HUQ;!(_$Is%K;Vcm>;Lge#=MOleaD9az-x^*j0 z?3d`yojWS5%?DU&jSC72Lh;K-43*aR@bFm1ltUo*p%W_Ak}icswu6VQxxW+-Mr076 z67zC$a?<2HCgtYlW@G*ntk1@+R4FMbNAUeIumG-05o}t7`2?)X?t8HU1A4=ZxVX4r z{C7}#0~?ILzyBtrX$;3@Wo31EoK|ZpO5)8?Ws`6QU(Rxs9a;gBm6esI64crl1Djn8BJ#i#tQ(x3;55P gx2EC)gzM=12bD?YE*b9JoB#j-07*qoM6N<$f>JJ&Pyhe` literal 0 HcmV?d00001