diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index 0eb70014..e1a69d76 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -34,12 +34,12 @@ public class ModuleApiary implements IInitializable { BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); ModuleApiary.blockComponent = machineGroup.getBlock(); AlvearyMutator.addMutationItem(new ItemStack(Blocks.soul_sand), 1.5f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("UranFuel"), 8.0f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("Plutonium"), 15.0f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("smallPlutonium"), 9.0f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran235"), 10.0f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("smallUran235"), 5.5f); - AlvearyMutator.addMutationItem(Mods.ic2.stack("Uran238"), 2.0f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran"), 8.0f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutonium"), 15.0f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemPlutoniumSmall"), 9.0f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235"), 10.0f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran235small"), 5.5f); + AlvearyMutator.addMutationItem(Mods.ic2.stack("itemUran238"), 2.0f); AlvearyMutator.addMutationItem(new ItemStack(Items.nether_star), 50.0f); AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f); AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f); diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index 09b84123..5a3014a1 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import binnie.core.AbstractMod; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; @@ -48,7 +49,7 @@ public class WindowAlvearyMutator extends Window { I18N.localise("extrabees.machine.alveay.mutator.mutagens"), TextJustification.MIDDLE_CENTER).setColor(0x555555); int size = AlvearyMutator.getMutagens().size(); - int w = size * 18; + int w = size * 17; if (size <= 0) { return; @@ -58,8 +59,9 @@ public class WindowAlvearyMutator extends Window { for (ItemStack stack : AlvearyMutator.getMutagens()) { ControlItemDisplay display = new ControlItemDisplay(this, x, 66.0f); display.setItemStack(stack); + display.setSize(new IPoint(14, 14)); display.hastooltip = true; - x += 18.0f; + x += 17.0f; } }