diff --git a/build.gradle b/build.gradle index 0734da89..55216237 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-v0.9.4-Beta-pre2" +version = "1.7.10-v0.9.4-Beta" group= "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Draconic-Evolution" diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java index 05f7d201..2eb21da7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUIGrinder.java @@ -1,6 +1,11 @@ package com.brandon3055.draconicevolution.client.interfaces; +import com.brandon3055.draconicevolution.common.container.ContainerGrinder; import com.brandon3055.draconicevolution.common.core.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -8,16 +13,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import com.brandon3055.draconicevolution.common.container.ContainerGrinder; -import com.brandon3055.draconicevolution.common.lib.References; -import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; - import java.util.ArrayList; @SideOnly(Side.CLIENT) @@ -116,7 +114,7 @@ public class GUIGrinder extends GuiContainer { super.updateScreen(); } - + // ####Draw at############ read from size //drawTexturedModalRect(guiLeft + 37, guiTop + 4, 0, 143, 37, 38); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java index 112e91fd..8730c47c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGenerator.java @@ -1,14 +1,10 @@ package com.brandon3055.draconicevolution.common.container; import com.brandon3055.draconicevolution.client.interfaces.SlotItemValid; -import com.brandon3055.draconicevolution.common.core.utills.LogHelper; import com.brandon3055.draconicevolution.common.tileentities.TileGenerator; -import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -73,6 +69,7 @@ public class ContainerGenerator extends Container { @Override public void detectAndSendChanges() { + super.detectAndSendChanges(); ItemStack stack = tile.getStackInSlot(0); int size = stack == null ? 0 : stack.stackSize; if (cachSize != size) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java index c29653cd..002e8680 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerGrinder.java @@ -4,7 +4,6 @@ import com.brandon3055.draconicevolution.client.interfaces.SlotItemValid; import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -74,6 +73,7 @@ public class ContainerGrinder extends Container { @Override public void detectAndSendChanges() { + super.detectAndSendChanges(); ItemStack stack = tile.getStackInSlot(0); int size = stack == null ? 0 : stack.stackSize; if (cachSize != size) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java index f9450157..315781c5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/ConfigHandler.java @@ -50,7 +50,7 @@ public class ConfigHandler { obliterationList = config.getStringList("Oblit Mode List", Configuration.CATEGORY_GENERAL, defaultObliterationList, "List of block (unlocalized)names that will be destroyed by tools in obliteration mode. To find the unlocalized name of a block see the \"Show Unlocalized Names\" config option"); showUnlocalizedNames = config.get(Configuration.CATEGORY_GENERAL, "Show Unlocalized Names", false, "If set to true the unlocalized name of every block and item will be displayed in its tool tip").getBoolean(false); soulDropChance = config.get(Configuration.CATEGORY_GENERAL, "soulDropChance", 1000, "Mobs have a 1 in this number chance to drop a soul", 1, Integer.MAX_VALUE).getInt(1000); - updateFix = config.get(Configuration.CATEGORY_GENERAL, "Update Fix", true, "Convert blocks from v0.9.2 to the v0.2.3+ format (set to false if you are not updating from v0.9.2 or earlier)").getBoolean(true); + updateFix = config.get(Configuration.CATEGORY_GENERAL, "Update Fix", false, "Convert blocks from v0.9.2 to the v0.2.3+ format (set to false if you are not updating from v0.9.2 or earlier)").getBoolean(false); //dislocator_Min_Range = config.get("Long Range Dislocator", "Admin Dislocator Min Range", 1000000).getInt(1000000); //dislocator_Max_Range = config.get("Long Range Dislocator", "Admin Dislocator Max Range", 29000000).getInt(29000000);