From eac6314124a42e72e3137a3fe6f80b9d97846237 Mon Sep 17 00:00:00 2001 From: glowredman Date: Sat, 5 Feb 2022 01:26:00 +0100 Subject: [PATCH] Nothing To See Here https: //github.com/SpitefulFox/Avaritia/commit/4631db28b9e61436ba32d906f8004fa75da02c34 Co-Authored-By: T Brieger <34607504+t-brieger@users.noreply.github.com> --- .../avaritia/blocks/LudicrousBlocks.java | 6 +++--- .../spiteful/avaritia/crafting/Grinder.java | 4 ++-- .../avaritia/gui/GUIAutoExtremeCrafting.java | 19 +++++++++++++----- .../textures/gui/dire_autocrafting_gui.png | Bin 0 -> 7444 bytes 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index 8fcda6f..4bbe234 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -21,7 +21,7 @@ public class LudicrousBlocks { */ public static Block resource_block; public static Block dire_crafting; - public static Block auto_dire_crafting; + //public static Block auto_dire_crafting; public static Block neutron_collector; public static Block compressor; @@ -31,8 +31,8 @@ public class LudicrousBlocks { double_craft = GameRegistry.registerBlock(new BlockDoubleCraft(), "Double_Craft"); triple_craft = GameRegistry.registerBlock(new BlockTripleCraft(), "Triple_Craft"); dire_crafting = GameRegistry.registerBlock(new BlockDireCrafting(), "Dire_Crafting"); - auto_dire_crafting =GameRegistry.registerBlock(new BlockAutoDireCrafting(), "Auto_Dire_Crafting"); - GameRegistry.registerTileEntity(TileEntityDireCrafting.class, "Avaritia_Dire_Craft"); + //auto_dire_crafting =GameRegistry.registerBlock(new BlockAutoDireCrafting(), "Auto_Dire_Crafting"); + //GameRegistry.registerTileEntity(TileEntityDireCrafting.class, "Avaritia_Dire_Craft"); if(Config.craftingOnly) return; diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index ac4ef91..72f5a8a 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -50,8 +50,8 @@ public class Grinder { GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.resource_block, 1, 1), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 6)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 6), "C", 'C', new ItemStack(LudicrousBlocks.resource_block, 1, 1)); - GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 13, 8), "CIC", "ICI", "CIC", 'C', new ItemStack(Blocks.coal_block, 1), 'I', new ItemStack(LudicrousItems.resource, 1, 1)); - GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 9), " I ", "ISI", " I ", 'I', new ItemStack(LudicrousItems.resource, 1, 4), 'S', new ItemStack(Items.stick)); + //GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 13, 8), "CCC", "CIC", "CCC", 'C', new ItemStack(Blocks.coal_block, 1), 'I', new ItemStack(LudicrousItems.resource, 1, 1)); + //GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 9), " I ", "ISI", " I ", 'I', new ItemStack(LudicrousItems.resource, 1, 4), 'S', new ItemStack(Items.stick)); ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.neutron_collector, 1), "IIQQQQQII", diff --git a/src/main/java/fox/spiteful/avaritia/gui/GUIAutoExtremeCrafting.java b/src/main/java/fox/spiteful/avaritia/gui/GUIAutoExtremeCrafting.java index 0701ebb..78c3e21 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/GUIAutoExtremeCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/gui/GUIAutoExtremeCrafting.java @@ -1,16 +1,17 @@ package fox.spiteful.avaritia.gui; +import org.lwjgl.opengl.GL11; + import fox.spiteful.avaritia.tile.TileEntityAutoDireCrafting; -import fox.spiteful.avaritia.tile.TileEntityDireCrafting; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; public class GUIAutoExtremeCrafting extends GuiContainer { - private static final ResourceLocation tex = new ResourceLocation("avaritia:textures/gui/dire_crafting_gui.png"); + private static final ResourceLocation tex = new ResourceLocation("avaritia:textures/gui/dire_autocrafting_gui.png"); public GUIAutoExtremeCrafting(InventoryPlayer par1InventoryPlayer, World par2World, int x, int y, int z, TileEntityAutoDireCrafting table) { @@ -30,9 +31,17 @@ public class GUIAutoExtremeCrafting extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture(tex); + /*this.mc.renderEngine.bindTexture(tex); int foo = (this.width - this.xSize) / 2; int bar = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(foo, bar, 0, 0, this.ySize, this.ySize); + this.drawTexturedModalRect(foo, bar, 0, 0, this.ySize, this.ySize);*/ + mc.getTextureManager().bindTexture(tex); + final Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(guiLeft, guiTop, 0, 0.0, 0.0); + tessellator.addVertexWithUV(guiLeft, guiTop + xSize, 0, 0.0, 1.0); + tessellator.addVertexWithUV(guiLeft + xSize, guiTop + xSize, 0, 1.0, 1.0); + tessellator.addVertexWithUV(guiLeft + xSize, guiTop, 0, 1.0, 0.0); + tessellator.draw(); } } diff --git a/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png b/src/main/resources/assets/avaritia/textures/gui/dire_autocrafting_gui.png new file mode 100644 index 0000000000000000000000000000000000000000..b07d885e9b4d8cd8fcea0bfe91307b6ac295d6aa GIT binary patch literal 7444 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