diff --git a/build.gradle b/build.gradle index 37e4bfe8..5bc0c8fd 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,12 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-2.0.15" +version = "2.0.15" if (System.getenv("BUILD_NUMBER") != null) { version = version + "-" + System.getenv("BUILD_NUMBER") } group = "binnie" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "binnie-mods" +archivesBaseName = "binnie-mods-1.7.10" sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index b14b9189..ae33c11c 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -5,8 +5,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public enum BotanyGUI implements IBinnieGUID { diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java index d5c29cfc..2b964d9a 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java @@ -15,7 +15,7 @@ public class ControlColorMixBox extends ControlListBox { @Override public IWidget createOption(IColourMix value, int y) { - return new ControlColorMixItem(this.getContent(), value, y); + return new ControlColorMixItem(getContent(), value, y); } enum Type { diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 1e23602a..3b9d3228 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -48,7 +48,7 @@ import java.util.ArrayList; import java.util.List; @Mod(modid = "BinnieCore", name = "Binnie Core", useMetadata = true) -public final class BinnieCore extends AbstractMod { +public class BinnieCore extends AbstractMod { @Mod.Instance("BinnieCore") public static BinnieCore instance; @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index f9279dc7..514f1f7a 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -1,8 +1,8 @@ package binnie.core.craftgui.controls; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventHandler; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index 1adf3570..563b109f 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -1,8 +1,8 @@ package binnie.core.craftgui.controls; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventHandler; diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java index 4e07e84e..f424135f 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlButton.java @@ -1,8 +1,8 @@ package binnie.core.craftgui.controls.button; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventButtonClicked; diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index 849bad82..e254570a 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,11 +1,11 @@ package binnie.core.craftgui.controls.core; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.ITooltipHelp; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.Widget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index 7c4eab96..11fd6d83 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -1,7 +1,7 @@ package binnie.core.craftgui.controls.listbox; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventMouse; diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index 09b68978..12efe323 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -1,8 +1,8 @@ package binnie.core.craftgui.controls.scroll; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IArea; diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index ebea165b..0bec7fd7 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.controls.tab; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventMouse; diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index 6c4d3a57..1e234a5c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -18,7 +18,7 @@ public class ControlSpeciesBox extends ControlListBox @Override public IWidget createOption(IAlleleSpecies value, int y) { - return new ControlSpeciexBoxOption(this.getContent(), value, y); + return new ControlSpeciexBoxOption(getContent(), value, y); } public ControlSpeciesBox(IWidget parent, float x, float y, float width, float height) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 615f0fed..243f8c0f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index ab9f53de..bb0b5d03 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java index a16cbe01..10d57a7b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java @@ -1,12 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventMouse; diff --git a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java index 9f9e9ef2..18e6eb81 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.Binnie; diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index c5db442d..8a02e129 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java index 892f147e..8c191e69 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; public interface IMachineInformation diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java index ed7a8736..aac27124 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.craftgui.ITooltip; diff --git a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java index e9ead088..6defad37 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.machines.transfer.TransferRequest; diff --git a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java index 8d9f7c21..4d5e1b2d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java +++ b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; public enum InventoryType diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 8ee450ea..5cd3dd30 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import java.util.Collection; diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index 54d4f33e..0173a313 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.craftgui.Tooltip; diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index 68639306..a803f3d2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.IInitializable; diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index 3578bca1..81280de1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -1,19 +1,15 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.ITooltipHelp; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.TopLevelWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventWidget; diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index c07d8e86..1fc8d8dd 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.craftgui.minecraft; import binnie.core.machines.inventory.SlotValidator; diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 2aafbca9..8e29fba1 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -17,7 +17,7 @@ public interface IFluidType { int getColor(); - int getContainerColour(); + int getContainerColor(); int getTransparency(); diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index b5c8eab2..78750ba8 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -104,7 +104,7 @@ public class ItemFluidContainer extends ItemFood { return 16777215; } if (pass == 0 && fluid.getFluid() instanceof BinnieFluid) { - return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColour(); + return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColor(); } return super.getColorFromItemStack(item, pass); } diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 6304dc7d..e2b1eded 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.power; import forestry.api.core.INBTTagable; diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 22f9a550..5199128d 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -1,10 +1,10 @@ package binnie.core.machines.storage; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.minecraft.EnumColor; diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java index e5f06c2b..3ef72e1b 100644 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ b/src/main/java/binnie/core/machines/storage/ModelCompartment.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.core.machines.storage; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index e6ff50d9..14c9e01b 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -2,9 +2,9 @@ package binnie.core.machines.storage; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.ControlCheckbox; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextEdit; diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index ae650ab3..352ddbc6 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -74,7 +74,7 @@ public enum ExtraBeeLiquid implements ILiquidType { } @Override - public int getContainerColour() { + public int getContainerColor() { return colour; } } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index a3673ab0..731889b6 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,45 +1,50 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees; -import binnie.extrabees.ExtraBees; +import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; -import binnie.extratrees.config.ConfigurationMain; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.gui.IBinnieGUID; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import binnie.extratrees.core.ModuleCore; -import binnie.extratrees.machines.ModuleMachine; -import binnie.extratrees.carpentry.ModuleCarpentry; -import binnie.extratrees.genetics.ModuleGenetics; +import binnie.extrabees.ExtraBees; import binnie.extratrees.alcohol.ModuleAlcohol; -import binnie.extratrees.item.ModuleItems; +import binnie.extratrees.alcohol.drink.ItemDrink; import binnie.extratrees.block.ModuleBlocks; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import binnie.extratrees.carpentry.BlockStainedDesign; import binnie.extratrees.block.decor.BlockHedge; import binnie.extratrees.block.decor.BlockMultiFence; -import binnie.extratrees.alcohol.drink.ItemDrink; import binnie.extratrees.carpentry.BlockCarpentry; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import cpw.mods.fml.common.SidedProxy; +import binnie.extratrees.carpentry.BlockStainedDesign; +import binnie.extratrees.carpentry.ModuleCarpentry; +import binnie.extratrees.config.ConfigurationMain; +import binnie.extratrees.core.ExtraTreesGUID; +import binnie.extratrees.core.ModuleCore; +import binnie.extratrees.genetics.ModuleGenetics; +import binnie.extratrees.item.ModuleItems; +import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; import cpw.mods.fml.common.Mod; -import binnie.core.AbstractMod; +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 net.minecraft.block.Block; +import net.minecraft.item.Item; -@Mod(modid = "ExtraTrees", name = "Extra Trees", useMetadata = true, dependencies = "after:BinnieCore") -public class ExtraTrees extends AbstractMod -{ +@Mod( + modid = "ExtraTrees", + name = "Extra Trees", + useMetadata = true, + dependencies = "after:BinnieCore" +) +public class ExtraTrees extends AbstractMod { @Mod.Instance("ExtraTrees") public static ExtraTrees instance; - @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") + + @SidedProxy( + clientSide = "binnie.extratrees.proxy.ProxyClient", + serverSide = "binnie.extratrees.proxy.ProxyServer" + ) public static Proxy proxy; + public static Item itemDictionary; public static Item itemDictionaryLepi; public static Item itemMisc; @@ -70,32 +75,32 @@ public class ExtraTrees extends AbstractMod public static int fenceID; public static int stairsID; - @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent evt) { - this.addModule(new ModuleBlocks()); - this.addModule(new ModuleItems()); - this.addModule(new ModuleAlcohol()); - this.addModule(new ModuleGenetics()); - this.addModule(new ModuleCarpentry()); - this.addModule(new ModuleMachine()); - this.addModule(new ModuleCore()); - this.preInit(); - } - - @Mod.EventHandler - public void init(final FMLInitializationEvent evt) { - this.init(); - } - - @Mod.EventHandler - public void postInit(final FMLPostInitializationEvent evt) { - this.postInit(); - } - public ExtraTrees() { ExtraTrees.instance = this; } + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + addModule(new ModuleBlocks()); + addModule(new ModuleItems()); + addModule(new ModuleAlcohol()); + addModule(new ModuleGenetics()); + addModule(new ModuleCarpentry()); + addModule(new ModuleMachine()); + addModule(new ModuleCore()); + preInit(); + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + init(); + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + postInit(); + } + @Override public IBinnieGUID[] getGUIDs() { return ExtraTreesGUID.values(); @@ -103,7 +108,7 @@ public class ExtraTrees extends AbstractMod @Override public Class[] getConfigs() { - return new Class[] { ConfigurationMain.class }; + return new Class[]{ConfigurationMain.class}; } @Override @@ -131,8 +136,7 @@ public class ExtraTrees extends AbstractMod return BinnieCore.isExtraTreesActive(); } - public static class PacketHandler extends BinniePacketHandler - { + public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { super(ExtraBees.instance); } diff --git a/src/main/java/binnie/extratrees/FakeWorld.java b/src/main/java/binnie/extratrees/FakeWorld.java index c6fb8a97..a7570216 100644 --- a/src/main/java/binnie/extratrees/FakeWorld.java +++ b/src/main/java/binnie/extratrees/FakeWorld.java @@ -1,27 +1,29 @@ package binnie.extratrees; +import binnie.core.block.TileEntityMetadata; +import forestry.api.arboriculture.EnumWoodType; +import forestry.arboriculture.tiles.TileWood; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldSettings; -import net.minecraft.world.WorldType; import net.minecraft.world.WorldSettings.GameType; +import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.storage.SaveHandler; - -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.tiles.TileWood; -import binnie.core.block.TileEntityMetadata; public class FakeWorld extends World { public static FakeWorld instance = new FakeWorld(); - Block block; - int metadata; - TileEntity te; + + protected Block block; + protected int metadata; + protected TileEntity te; + + public FakeWorld() { + super(null, "", null, new WorldSettings(Long.MAX_VALUE, GameType.NOT_SET, false, false, WorldType.FLAT), null); + } public ItemStack getWooLog() { if (te instanceof TileWood) { @@ -32,18 +34,14 @@ public class FakeWorld extends World { return null; } - public FakeWorld() { - super((SaveHandler) null, "", (WorldProvider) null, new WorldSettings(Long.MAX_VALUE, GameType.NOT_SET, false, false, WorldType.FLAT), null); - } - @Override - public boolean setBlock(int p_147449_1_, int p_147449_2_, int p_147449_3_, Block block) { + public boolean setBlock(int x, int y, int z, Block block) { this.block = block; return true; } @Override - public boolean setBlock(int p_147465_1_, int p_147465_2_, int p_147465_3_, Block block, int metadata, int update) { + public boolean setBlock(int x, int y, int z, Block block, int metadata, int update) { this.block = block; this.metadata = metadata; if (block.hasTileEntity(metadata)) { @@ -57,7 +55,7 @@ public class FakeWorld extends World { } @Override - public boolean setBlockToAir(int p_147468_1_, int p_147468_2_, int p_147468_3_) { + public boolean setBlockToAir(int x, int y, int z) { return true; } @@ -67,7 +65,7 @@ public class FakeWorld extends World { } @Override - public void setTileEntity(int p_147455_1_, int p_147455_2_, int p_147455_3_, TileEntity p_147455_4_) { + public void setTileEntity(int x, int y, int z, TileEntity tileEntity) { } @@ -77,12 +75,12 @@ public class FakeWorld extends World { } @Override - public int getBlockMetadata(int p_72805_1_, int p_72805_2_, int p_72805_3_) { + public int getBlockMetadata(int x, int y, int z) { return metadata; } @Override - public boolean setBlockMetadataWithNotify(int p_72921_1_, int p_72921_2_, int p_72921_3_, int metadata, int p_72921_5_) { + public boolean setBlockMetadataWithNotify(int x, int y, int z, int metadata, int delay) { this.metadata = metadata; return true; } @@ -98,7 +96,7 @@ public class FakeWorld extends World { } @Override - public Entity getEntityByID(int p_73045_1_) { + public Entity getEntityByID(int id) { return null; } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index d4dc3669..7b6f5f5c 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -1,140 +1,46 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -import binnie.core.liquid.FluidContainer; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import java.util.ArrayList; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; import java.util.List; -import binnie.core.liquid.IFluidType; -public enum Alcohol implements IFluidType, ICocktailLiquid -{ - Apple("ciderApple", 16432700, 0.3, 0.05), - Apricot("wineApricot", 15781686, 0.3, 0.1), - Banana("wineBanana", 14993485, 0.3, 0.1), - Cherry("wineCherry", 11207702, 0.3, 0.1), - Elderberry("wineElderberry", 9764865, 0.3, 0.1), - Peach("ciderPeach", 15361563, 0.3, 0.05), - Pear("ciderPear", 15061095, 0.3, 0.05), - Plum("winePlum", 12063752, 0.3, 0.1), - Carrot("wineCarrot", 16219394, 0.3, 0.1), - WhiteWine("wineWhite", 15587989, 0.1, 0.1), - RedWine("wineRed", 7670539, 0.2, 0.1), - SparklingWine("wineSparkling", 16709566, 0.1, 0.1), - Agave("wineAgave", 13938276, 0.2, 0.1), - Potato("fermentedPotatoes", 12028240, 0.8, 0.1), - Citrus("wineCitrus", 16776960, 0.2, 0.1), - Cranberry("wineCranberry", 11599874, 0.2, 0.1), - Pineapple("winePineapple", 14724150, 0.2, 0.1), - Tomato("wineTomato", 12458521, 0.2, 0.1), - Fruit("juice", 16432700, 0.2, 0.1), - Ale("beerAle", 12991009, 0.7, 0.05), - Lager("beerLager", 15301637, 0.7, 0.05), - WheatBeer("beerWheat", 14380552, 0.7, 0.05), - RyeBeer("beerRye", 10836007, 0.7, 0.05), - CornBeer("beerCorn", 13411364, 0.7, 0.05), - Stout("beerStout", 5843201, 0.8, 0.05), - Barley("mashGrain", 12991009, 0.9, 0.05), - Wheat("mashWheat", 12991009, 0.9, 0.05), - Rye("mashRye", 10836007, 0.9, 0.05), - Corn("mashCorn", 13411364, 0.9, 0.05); - - List fermentationLiquid; - String fermentationSolid; - String ident; - IIcon icon; - int colour; - float transparency; - float abv; - - private void setFementation(final Juice juice) { - this.fermentationLiquid.add(juice.getIdentifier()); - } - - private void setFementation(final String oreDict) { - this.fermentationSolid = oreDict; - } - - private Alcohol(final String ident, final int colour, final double transparency, final double abv) { - this.fermentationLiquid = new ArrayList(); - this.fermentationSolid = ""; - this.ident = ident; - this.colour = colour; - this.transparency = (float) transparency; - this.abv = (float) abv; - } - - @Override - public String toString() { - return this.getName(); - } - - @Override - public IIcon getIcon() { - return this.icon; - } - - @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); - } - - @Override - public String getName() { - return ExtraTrees.proxy.localise("fluid.alcohol." + this.name().toLowerCase()); - } - - @Override - public String getIdentifier() { - return "binnie." + this.ident; - } - - @Override - public int getColor() { - return this.colour; - } - - @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.getIdentifier(), amount); - } - - @Override - public int getTransparency() { - return (int) (Math.min(1.0, this.transparency + 0.3) * 255.0); - } - - @Override - public String getTooltip(final int ratio) { - return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName(); - } - - @Override - public boolean canPlaceIn(final FluidContainer container) { - return true; - } - - @Override - public boolean showInCreative(final FluidContainer container) { - return container == FluidContainer.Glass; - } - - @Override - public int getContainerColour() { - return this.getColor(); - } - - @Override - public float getABV() { - return this.abv; - } +public enum Alcohol implements IFluidType, ICocktailLiquid { + Apple("ciderApple", 0xfabe3c, 0.3, 0.05), + Apricot("wineApricot", 0xf0cf36, 0.3, 0.1), + Banana("wineBanana", 0xe4c84d, 0.3, 0.1), + Cherry("wineCherry", 0xab0416, 0.3, 0.1), + Elderberry("wineElderberry", 0x950001, 0.3, 0.1), + Peach("ciderPeach", 0xea661b, 0.3, 0.05), + Pear("ciderPear", 0xe5d067, 0.3, 0.05), + Plum("winePlum", 0xb81408, 0.3, 0.1), + Carrot("wineCarrot", 0xf77d02, 0.3, 0.1), + WhiteWine("wineWhite", 0xedda95, 0.1, 0.1), + RedWine("wineRed", 0x750b0b, 0.2, 0.1), + SparklingWine("wineSparkling", 0xfef7be, 0.1, 0.1), + Agave("wineAgave", 0xd4ae64, 0.2, 0.1), + Potato("fermentedPotatoes", 0xb78950, 0.8, 0.1), + Citrus("wineCitrus", 0xffff00, 0.2, 0.1), + Cranberry("wineCranberry", 0xb10002, 0.2, 0.1), + Pineapple("winePineapple", 0xe0ac36, 0.2, 0.1), + Tomato("wineTomato", 0xbe1a19, 0.2, 0.1), + Fruit("juice", 0xfabe3c, 0.2, 0.1), + Ale("beerAle", 0xc63a21, 0.7, 0.05), + Lager("beerLager", 0xe97c05, 0.7, 0.05), + WheatBeer("beerWheat", 0xdb6e08, 0.7, 0.05), + RyeBeer("beerRye", 0xa55827, 0.7, 0.05), + CornBeer("beerCorn", 0xcca424, 0.7, 0.05), + Stout("beerStout", 0x592901, 0.8, 0.05), + Barley("mashGrain", 0xc63a21, 0.9, 0.05), + Wheat("mashWheat", 0xc63a21, 0.9, 0.05), + Rye("mashRye", 0xa55827, 0.9, 0.05), + Corn("mashCorn", 0xcca424, 0.9, 0.05); static { Alcohol.Apple.setFementation(Juice.Apple); @@ -157,4 +63,94 @@ public enum Alcohol implements IFluidType, ICocktailLiquid Alcohol.Pineapple.setFementation(Juice.Pineapple); Alcohol.Potato.setFementation("cropPotato"); } + + protected List fermentationLiquid; + protected String fermentationSolid; + protected String ident; + protected IIcon icon; + protected int colour; + protected float transparency; + protected float abv; + + Alcohol(String ident, int colour, double transparency, double abv) { + fermentationLiquid = new ArrayList<>(); + fermentationSolid = ""; + this.ident = ident; + this.colour = colour; + this.transparency = (float) transparency; + this.abv = (float) abv; + } + + private void setFementation(Juice juice) { + fermentationLiquid.add(juice.getIdentifier()); + } + + private void setFementation(String oreDict) { + fermentationSolid = oreDict; + } + + @Override + public String toString() { + return getName(); + } + + @Override + public IIcon getIcon() { + return icon; + } + + @Override + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); + } + + @Override + public String getName() { + return ExtraTrees.proxy.localise("fluid.alcohol." + name().toLowerCase()); + } + + @Override + public String getIdentifier() { + return "binnie." + ident; + } + + @Override + public int getColor() { + return colour; + } + + @Override + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(getIdentifier(), amount); + } + + @Override + public int getTransparency() { + return (int) (Math.min(1.0, transparency + 0.3) * 255.0); + } + + @Override + public String getTooltip(int ratio) { + return ratio + " Part" + ((ratio > 1) ? "s " : " ") + getName(); + } + + @Override + public boolean canPlaceIn(FluidContainer container) { + return true; + } + + @Override + public boolean showInCreative(FluidContainer container) { + return container == FluidContainer.Glass; + } + + @Override + public int getContainerColor() { + return getColor(); + } + + @Override + public float getABV() { + return abv; + } } diff --git a/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java b/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java index 640264bd..d9cbb147 100644 --- a/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java +++ b/src/main/java/binnie/extratrees/alcohol/AlcoholEffect.java @@ -1,31 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -import net.minecraft.potion.PotionEffect; -import net.minecraft.potion.Potion; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; -public class AlcoholEffect -{ - public static void makeDrunk(final EntityPlayer player, final float strength) { - final int existingStrength = player.isPotionActive(Potion.confusion) ? player.getActivePotionEffect(Potion.confusion).getAmplifier() : 0; - final int existingTime = player.isPotionActive(Potion.confusion) ? player.getActivePotionEffect(Potion.confusion).getDuration() : 0; +public class AlcoholEffect { + public static void makeDrunk(EntityPlayer player, float strength) { + int existingStrength = player.isPotionActive(Potion.confusion) ? player.getActivePotionEffect(Potion.confusion).getAmplifier() : 0; + int existingTime = player.isPotionActive(Potion.confusion) ? player.getActivePotionEffect(Potion.confusion).getDuration() : 0; int time = (int) (100.0 * Math.sqrt(strength)) + existingTime; - final float intensity = 0.1f * strength + existingStrength + existingTime / 500; + + float intensity = 0.1f * strength + existingStrength + existingTime / 500; if (time < 5) { time = 5; } + float slowIntense = (intensity - 10.0f) / 4.0f; if (slowIntense < 0.0f) { slowIntense = 0.0f; } + float blindIntense = (intensity - 25.0f) / 2.0f; if (blindIntense < 0.0f) { blindIntense = 0.0f; } + player.addPotionEffect(new PotionEffect(Potion.confusion.id, time, (int) intensity, false)); if (slowIntense > 0.0f) { player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, time, (int) slowIntense, false)); diff --git a/src/main/java/binnie/extratrees/alcohol/Cocktail.java b/src/main/java/binnie/extratrees/alcohol/Cocktail.java index 3b8e092a..cd86141d 100644 --- a/src/main/java/binnie/extratrees/alcohol/Cocktail.java +++ b/src/main/java/binnie/extratrees/alcohol/Cocktail.java @@ -1,93 +1,46 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -import binnie.extratrees.alcohol.drink.DrinkManager; import binnie.extratrees.alcohol.drink.DrinkLiquid; +import binnie.extratrees.alcohol.drink.DrinkManager; + import java.util.HashMap; import java.util.Map; -public enum Cocktail -{ - Bellini("Bellini", Glassware.Flute, 15974764), - BlackRussian("Black Russian", Glassware.OldFashioned, 3347992), - BloodyMary("Bloody Mary", Glassware.Highball, 12660480), - Cosmopolitan("Cosmopolitan", Glassware.Cocktail, 14811136), - CubaLibre("Cuba Libre", Glassware.Highball, 9044996), - FrenchConnection("French Connection", Glassware.OldFashioned, 16166183), - GodFather("God Father", Glassware.OldFashioned, 13134109), - GodMother("God Mother", Glassware.OldFashioned, 14644737), - Grasshopper("Grasshopper", Glassware.Cocktail, 4441194), - French75("French 75", Glassware.Flute, 15521949), - HarveyWallbanger("Harvey Wallbanger", Glassware.Highball, 16371968), - HemingwaySpecial("Hemingway Special", Glassware.Cocktail, 15201205), - HorsesNeck("Horse's Neck", Glassware.OldFashioned, 16692480), - IrishCoffee("Irish Coffee", Glassware.Wine, 4460034), - Kir("Kir", Glassware.Wine, 16004638), - Bramble("Bramble", Glassware.OldFashioned, 12804974), - B52("B-52", Glassware.Shot, 12934656), - DarkNStormy("Dark 'N' Stormy", Glassware.Highball, 12215848), - DirtyMartini("Dirty Martini", Glassware.Cocktail, 14332499), - ExpressoMartini("Expresso Martini", Glassware.Cocktail, 6498346), - FrenchMartini("French Martini", Glassware.Cocktail, 12660045), - Kamikaze("Kamikaze", Glassware.Cocktail, 14801069), - LemonDropMartini("Lemon Drop Martini", Glassware.Cocktail, 16375437), - PiscoSour("Pisco Sour", Glassware.OldFashioned, 15394463), - RussianSpringPunch("Russian Spring Punch", Glassware.Highball, 11805740), - SpritzVeneziano("Spritz Veneziano", Glassware.OldFashioned, 15355648), - TommysMargarita("Tommy's Margartita", Glassware.Cocktail, 14867592), - Vesper("Vesper", Glassware.Cocktail, 15658732), - SexOnTheBeach("Sex on the Beach", Glassware.Highball, 16677426); +public enum Cocktail { + Bellini("Bellini", Glassware.Flute, 0xf3c16c), + BlackRussian("Black Russian", Glassware.OldFashioned, 0x331618), + BloodyMary("Bloody Mary", Glassware.Highball, 0xc12f00), + Cosmopolitan("Cosmopolitan", Glassware.Cocktail, 0xe20000), + CubaLibre("Cuba Libre", Glassware.Highball, 0x8a0404), + FrenchConnection("French Connection", Glassware.OldFashioned, 0xf6ad27), + GodFather("God Father", Glassware.OldFashioned, 0xc8691d), + GodMother("God Mother", Glassware.OldFashioned, 0xdf7601), + Grasshopper("Grasshopper", Glassware.Cocktail, 0x43c46a), + French75("French 75", Glassware.Flute, 0xecd89d), + HarveyWallbanger("Harvey Wallbanger", Glassware.Highball, 0xf9d100), + HemingwaySpecial("Hemingway Special", Glassware.Cocktail, 0xe7f3b5), + HorsesNeck("Horse's Neck", Glassware.OldFashioned, 0xfeb500), + IrishCoffee("Irish Coffee", Glassware.Wine, 0x440e02), + Kir("Kir", Glassware.Wine, 0xf4361e), + Bramble("Bramble", Glassware.OldFashioned, 0xc3636e), + B52("B-52", Glassware.Shot, 0xc55e00), + DarkNStormy("Dark 'N' Stormy", Glassware.Highball, 0xba6628), + DirtyMartini("Dirty Martini", Glassware.Cocktail, 0xdab253), + ExpressoMartini("Expresso Martini", Glassware.Cocktail, 0x63282a), + FrenchMartini("French Martini", Glassware.Cocktail, 0xc12d4d), + Kamikaze("Kamikaze", Glassware.Cocktail, 0xe1d8ad), + LemonDropMartini("Lemon Drop Martini", Glassware.Cocktail, 0xf9de8d), + PiscoSour("Pisco Sour", Glassware.OldFashioned, 0xeae69f), + RussianSpringPunch("Russian Spring Punch", Glassware.Highball, 0xb4242c), + SpritzVeneziano("Spritz Veneziano", Glassware.OldFashioned, 0xea4f00), + TommysMargarita("Tommy's Margartita", Glassware.Cocktail, 0xe2dc88), + Vesper("Vesper", Glassware.Cocktail, 0xeeeeec), + SexOnTheBeach("Sex on the Beach", Glassware.Highball, 0xfe7a32); - static final Map cocktailIngredients; - public String name; - public Glassware glassware; - public int colour; - public Map ingredients; - - private Cocktail(final String name, final Glassware glassware, final int colour) { - this.ingredients = new HashMap(); - this.name = name; - this.glassware = glassware; - this.colour = colour; - } - - private void add(final ICocktailIngredient ingredient, final int ratio) { - this.ingredients.put(ingredient, ratio); - } - - public static Cocktail get(final Map ingredients) { - for (final Cocktail cocktail : values()) { - boolean is = true; - for (final Map.Entry entry : ingredients.entrySet()) { - if (cocktail.ingredients.get(entry.getKey()) != entry.getValue()) { - is = false; - } - } - if (is) { - return cocktail; - } - } - return null; - } - - public static void registerIngredient(final ICocktailIngredient ingredient) { - Cocktail.cocktailIngredients.put(ingredient.getIdentifier().toLowerCase(), ingredient); - DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getName(), ingredient.getColor(), ingredient.getTransparency(), ingredient.getABV())); - } - - public static ICocktailIngredient getIngredient(final String name2) { - return Cocktail.cocktailIngredients.get(name2.toLowerCase()); - } - - public static boolean isIngredient(final String name) { - return name != null && Cocktail.cocktailIngredients.containsKey(name.toLowerCase()); - } + static Map cocktailIngredients; static { - cocktailIngredients = new HashMap(); + cocktailIngredients = new HashMap<>(); Cocktail.Bellini.add(Alcohol.SparklingWine, 2); Cocktail.Bellini.add(Juice.Peach, 1); Cocktail.BlackRussian.add(Spirit.Vodka, 5); @@ -172,4 +125,48 @@ public enum Cocktail Cocktail.SexOnTheBeach.add(Juice.Orange, 2); Cocktail.SexOnTheBeach.add(Juice.Cranberry, 2); } + + public String name; + public Glassware glassware; + public int colour; + public Map ingredients; + + Cocktail(String name, Glassware glassware, int colour) { + ingredients = new HashMap<>(); + this.name = name; + this.glassware = glassware; + this.colour = colour; + } + + public static Cocktail get(Map ingredients) { + for (Cocktail cocktail : values()) { + boolean is = true; + for (Map.Entry entry : ingredients.entrySet()) { + if (cocktail.ingredients.get(entry.getKey()) != entry.getValue()) { + is = false; + } + } + if (is) { + return cocktail; + } + } + return null; + } + + public static void registerIngredient(ICocktailIngredient ingredient) { + Cocktail.cocktailIngredients.put(ingredient.getIdentifier().toLowerCase(), ingredient); + DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getName(), ingredient.getColor(), ingredient.getTransparency(), ingredient.getABV())); + } + + public static ICocktailIngredient getIngredient(String name2) { + return Cocktail.cocktailIngredients.get(name2.toLowerCase()); + } + + public static boolean isIngredient(String name) { + return name != null && Cocktail.cocktailIngredients.containsKey(name.toLowerCase()); + } + + private void add(ICocktailIngredient ingredient, int ratio) { + ingredients.put(ingredient, ratio); + } } diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index d044ce09..334ed872 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -1,17 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -import net.minecraft.item.ItemStack; -import net.minecraft.client.renderer.texture.IIconRegister; import binnie.Binnie; import binnie.extratrees.ExtraTrees; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -public enum Glassware -{ +public enum Glassware { BeerMug(16, 10, 14), Pint(20, 6, 20), Snifter(17, 14, 11), @@ -28,47 +23,49 @@ public enum Glassware Sherry(2, 17, 7), Coupe(6, 19, 8); - private int capacity; - float contentBottom; - float contentHeight; public IIcon glass; public IIcon contents; - public String getName(final String liquid) { - if (liquid == null) { - return ExtraTrees.proxy.localise("item.glassware." + this.name().toLowerCase()); - } - return Binnie.Language.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid); - } + protected float contentBottom; + protected float contentHeight; - public int getCapacity() { - return this.capacity; - } + private int capacity; - private Glassware(final int capacity, final int contentBottom, final int contentHeight) { + Glassware(int capacity, int contentBottom, int contentHeight) { this.capacity = 30 * capacity; this.contentBottom = contentBottom / 32.0f; this.contentHeight = contentHeight / 32.0f; } - public void registerIcons(final IIconRegister par1IconRegister) { - this.glass = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".glass"); - this.contents = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + this.toString().toLowerCase() + ".contents"); + public String getName(String liquid) { + if (liquid == null) { + return ExtraTrees.proxy.localise("item.glassware." + name().toLowerCase()); + } + return Binnie.Language.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid); } - public ItemStack get(final int i) { + public int getCapacity() { + return capacity; + } + + public void registerIcons(IIconRegister par1IconRegister) { + glass = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + toString().toLowerCase() + ".glass"); + contents = ExtraTrees.proxy.getIcon(par1IconRegister, "glassware/" + toString().toLowerCase() + ".contents"); + } + + public ItemStack get(int i) { return ExtraTrees.drink.getStack(this, null); } public float getContentBottom() { - return this.contentBottom; + return contentBottom; } public float getContentHeight() { - return this.contentHeight; + return contentHeight; } public int getVolume() { - return this.getCapacity(); + return getCapacity(); } } diff --git a/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java b/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java index 5a2815f4..cba4c7b4 100644 --- a/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java +++ b/src/main/java/binnie/extratrees/alcohol/ICocktailIngredient.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -public interface ICocktailIngredient -{ +public interface ICocktailIngredient { String getName(); String getIdentifier(); @@ -14,7 +9,7 @@ public interface ICocktailIngredient int getTransparency(); - String getTooltip(final int p0); + String getTooltip(int ratio); float getABV(); } diff --git a/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java b/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java index d7b4a69c..4a58b781 100644 --- a/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/ICocktailLiquid.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; import net.minecraftforge.fluids.FluidStack; -public interface ICocktailLiquid extends ICocktailIngredient -{ - FluidStack get(final int p0); +public interface ICocktailLiquid extends ICocktailIngredient { + FluidStack get(int amount); } diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index aade61a8..f830d71f 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -1,116 +1,112 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.liquid.FluidContainer; import net.minecraft.util.IIcon; -import binnie.core.liquid.IFluidType; +import net.minecraftforge.fluids.FluidStack; -public enum Juice implements IFluidType, ICocktailLiquid -{ - Apple("Apple Juice", "juiceApple", 16763442, 0.7, "Apple"), - Apricot("Apricot Juice", "juiceApricot", 16758046, 0.6, "Apricot"), - Banana("Banana Juice", "juiceBanana", 15324291, 0.6, "Banana"), - Cherry("Cherry Juice", "juiceCherry", 13044511, 0.6, "Cherry"), - Elderberry("Elderberry Juice", "juiceElderberry", 4204073, 0.6, "Elderberry"), - Lemon("Lemon Juice", "juiceLemon", 14604882, 0.7, "Lemon"), - Lime("Lime Juice", "juiceLime", 12177007, 0.6, "Lime"), - Orange("Orange Juice", "juiceOrange", 16359983, 0.8, "Orange"), - Peach("Peach Juice", "juicePeach", 16434525, 0.7, "Peach"), - Plum("Plum Juice", "juicePlum", 10559249, 0.7, "Plum"), - Carrot("Carrot Juice", "juiceCarrot", 16485911, 0.7, "Carrot"), - Tomato("Tomato Juice", "juiceTomato", 12731438, 0.7, "Tomato"), - Cranberry("Cranberry Juice", "juiceCranberry", 12920629, 0.7, "Cranberry"), - Grapefruit("Grapefruit Juice", "juiceGrapefruit", 15897173, 0.6, "Grapefruit"), - Olive("Olive Oil", "juiceOlive", 16042240, 0.6, "Olive"), - Pineapple("Pineapple Juice", "juicePineapple", 15189319, 0.6, "Pineapple"), - Pear("Pear Juice", "juicePear", 14204773, 0.6, "Pear"), - WhiteGrape("White Grape Juice", "juiceWhiteGrape", 16507769, 0.6, "WhiteGrape"), - RedGrape("Red Grape Juice", "juiceRedGrape", 9775412, 0.6, "RedGrape"); +public enum Juice implements IFluidType, ICocktailLiquid { + Apple("Apple Juice", "juiceApple", 0xffca32, 0.7, "Apple"), + Apricot("Apricot Juice", "juiceApricot", 0xffb51e, 0.6, "Apricot"), + Banana("Banana Juice", "juiceBanana", 0xe9d483, 0.6, "Banana"), + Cherry("Cherry Juice", "juiceCherry", 0xc70b1f, 0.6, "Cherry"), + Elderberry("Elderberry Juice", "juiceElderberry", 0x402629, 0.6, "Elderberry"), + Lemon("Lemon Juice", "juiceLemon", 0xdeda52, 0.7, "Lemon"), + Lime("Lime Juice", "juiceLime", 0xb9ce6f, 0.6, "Lime"), + Orange("Orange Juice", "juiceOrange", 0xf9a22f, 0.8, "Orange"), + Peach("Peach Juice", "juicePeach", 0xfac55d, 0.7, "Peach"), + Plum("Plum Juice", "juicePlum", 0xa11f11, 0.7, "Plum"), + Carrot("Carrot Juice", "juiceCarrot", 0xfb8e17, 0.7, "Carrot"), + Tomato("Tomato Juice", "juiceTomato", 0xc2442e, 0.7, "Tomato"), + Cranberry("Cranberry Juice", "juiceCranberry", 0xc52735, 0.7, "Cranberry"), + Grapefruit("Grapefruit Juice", "juiceGrapefruit", 0xf29255, 0.6, "Grapefruit"), + Olive("Olive Oil", "juiceOlive", 0xf4c900, 0.6, "Olive"), + Pineapple("Pineapple Juice", "juicePineapple", 0xe7c547, 0.6, "Pineapple"), + Pear("Pear Juice", "juicePear", 0xd8bf65, 0.6, "Pear"), + WhiteGrape("White Grape Juice", "juiceWhiteGrape", 0xfbe379, 0.6, "WhiteGrape"), + RedGrape("Red Grape Juice", "juiceRedGrape", 0x952934, 0.6, "RedGrape"); - String name; - String ident; public String squeezing; - IIcon icon; - int colour; - float transparency; - private void addSqueezing(final String oreDict) { - this.squeezing = oreDict; - } + protected String name; + protected String ident; + protected IIcon icon; + protected int colour; + protected float transparency; - private Juice(final String name, final String ident, final int colour, final double transparency, final String squeezing) { + Juice(String name, String ident, int colour, double transparency, String squeezing) { this.name = name; this.ident = ident; this.colour = colour; this.transparency = (float) transparency; - this.addSqueezing("crop" + squeezing); + addSqueezing("crop" + squeezing); + } + + private void addSqueezing(String oreDict) { + squeezing = oreDict; } @Override public String toString() { - return this.name; + return name; } @Override - public boolean canPlaceIn(final FluidContainer container) { + public boolean canPlaceIn(FluidContainer container) { return true; } @Override - public boolean showInCreative(final FluidContainer container) { + public boolean showInCreative(FluidContainer container) { return container == FluidContainer.Glass; } @Override public IIcon getIcon() { - return this.icon; + return icon; } @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); } @Override public String getName() { - return this.name; + return name; } @Override public String getIdentifier() { - return "binnie." + this.ident; + return "binnie." + ident; } @Override public int getColor() { - return this.colour; + return colour; } @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.getIdentifier(), amount); + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(getIdentifier(), amount); } @Override public int getTransparency() { - return (int) (Math.min(1.0, this.transparency + 0.3) * 255.0); + return (int) (Math.min(1.0, transparency + 0.3) * 255.0); } @Override - public String getTooltip(final int ratio) { - return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName(); + public String getTooltip(int ratio) { + return ratio + " Part" + ((ratio > 1) ? "s " : " ") + getName(); } @Override - public int getContainerColour() { - return this.getColor(); + public int getContainerColor() { + return getColor(); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index 168179a4..803385d6 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -1,123 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.liquid.FluidContainer; import net.minecraft.util.IIcon; -import binnie.core.liquid.IFluidType; +import net.minecraftforge.fluids.FluidStack; -public enum Liqueur implements IFluidType, ICocktailLiquid -{ - Almond("Almond", 14966063, 0.3, 0.2), - Orange("Orange", 16353536, 0.4, 0.2), - Banana("Banana", 16302592, 0.5, 0.2), - Chocolate("Chocolate", 12667680, 0.3, 0.2), - Mint("Mint", 2737788, 0.4, 0.2), - Hazelnut("Hazelnut", 15570987, 0.3, 0.2), - Cinnamon("Cinnamon", 15028224, 0.3, 0.2), - Coffee("Coffee", 9847577, 0.4, 0.2), - Melon("Melon", 11584049, 0.4, 0.2), - Anise("Anise", 14344681, 0.3, 0.2), - Peach("Peach", 16684384, 0.4, 0.2), - Lemon("Lemon", 16311405, 0.4, 0.2), - Herbal("Herbal", 16700673, 0.3, 0.2), - Cherry("Cherry", 14096641, 0.5, 0.2), - Blackcurrant("Blackcurrant", 6962541, 0.5, 0.2), - Blackberry("Blackberry", 6837581, 0.5, 0.2), - Raspberry("Raspberry", 10158848, 0.5, 0.2); - - String name; - String ident; - IIcon icon; - int colour; - float transparency; - float abv; - - private void addFlavour(final String oreDict) { - } - - private Liqueur(final String name, final int colour, final double transparency, final double abv) { - this(name + " Liqueur", "liqueur" + name, colour, transparency, abv); - } - - private Liqueur(final String name, final String ident, final int colour, final double transparency, final double abv) { - this.name = name; - this.ident = ident; - this.colour = colour; - this.transparency = (float) transparency; - this.abv = (float) abv; - } - - @Override - public String toString() { - return this.name; - } - - @Override - public boolean canPlaceIn(final FluidContainer container) { - return true; - } - - @Override - public boolean showInCreative(final FluidContainer container) { - return container == FluidContainer.Glass; - } - - @Override - public IIcon getIcon() { - return this.icon; - } - - @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public String getIdentifier() { - return "binnie." + this.ident; - } - - @Override - public int getColor() { - return this.colour; - } - - @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.getIdentifier(), amount); - } - - @Override - public int getTransparency() { - return (int) (Math.min(1.0, this.transparency + 0.3) * 255.0); - } - - @Override - public String getTooltip(final int ratio) { - return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName(); - } - - @Override - public int getContainerColour() { - return this.getColor(); - } - - @Override - public float getABV() { - return this.abv; - } +public enum Liqueur implements IFluidType, ICocktailLiquid { + Almond("Almond", 0xe45d2f, 0.3, 0.2), + Orange("Orange", 0xf98900, 0.4, 0.2), + Banana("Banana", 0xf8c200, 0.5, 0.2), + Chocolate("Chocolate", 0xc14b20, 0.3, 0.2), + Mint("Mint", 0x29c67c, 0.4, 0.2), + Hazelnut("Hazelnut", 0xed982b, 0.3, 0.2), + Cinnamon("Cinnamon", 0xe55000, 0.3, 0.2), + Coffee("Coffee", 0x964319, 0.4, 0.2), + Melon("Melon", 0xb0c231, 0.4, 0.2), + Anise("Anise", 0xdae1e9, 0.3, 0.2), + Peach("Peach", 0xfe9560, 0.4, 0.2), + Lemon("Lemon", 0xf8e46d, 0.4, 0.2), + Herbal("Herbal", 0xfed501, 0.3, 0.2), + Cherry("Cherry", 0xd71901, 0.5, 0.2), + Blackcurrant("Blackcurrant", 0x6a3d6d, 0.5, 0.2), + Blackberry("Blackberry", 0x68554d, 0.5, 0.2), + Raspberry("Raspberry", 0x9b0300, 0.5, 0.2); static { Liqueur.Almond.addFlavour("cropAlmond"); @@ -138,4 +46,91 @@ public enum Liqueur implements IFluidType, ICocktailLiquid Liqueur.Blackberry.addFlavour("cropBlackberry"); Liqueur.Raspberry.addFlavour("cropRaspberry"); } + + protected String name; + protected String ident; + protected IIcon icon; + protected int colour; + protected float transparency; + protected float abv; + + Liqueur(String name, int colour, double transparency, double abv) { + this(name + " Liqueur", "liqueur" + name, colour, transparency, abv); + } + + Liqueur(String name, String ident, int colour, double transparency, double abv) { + this.name = name; + this.ident = ident; + this.colour = colour; + this.transparency = (float) transparency; + this.abv = (float) abv; + } + + private void addFlavour(String oreDict) { + } + + @Override + public String toString() { + return name; + } + + @Override + public boolean canPlaceIn(FluidContainer container) { + return true; + } + + @Override + public boolean showInCreative(FluidContainer container) { + return container == FluidContainer.Glass; + } + + @Override + public IIcon getIcon() { + return icon; + } + + @Override + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); + } + + @Override + public String getName() { + return name; + } + + @Override + public String getIdentifier() { + return "binnie." + ident; + } + + @Override + public int getColor() { + return colour; + } + + @Override + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(getIdentifier(), amount); + } + + @Override + public int getTransparency() { + return (int) (Math.min(1.0, transparency + 0.3) * 255.0); + } + + @Override + public String getTooltip(int ratio) { + return ratio + " Part" + ((ratio > 1) ? "s " : " ") + getName(); + } + + @Override + public int getContainerColor() { + return getColor(); + } + + @Override + public float getABV() { + return abv; + } } diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index 04e9d118..12e3659b 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -1,35 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.liquid.FluidContainer; import net.minecraft.util.IIcon; -import binnie.core.liquid.IFluidType; +import net.minecraftforge.fluids.FluidStack; -public enum MiscFluid implements IFluidType, ICocktailLiquid -{ - CarbonatedWater("Carbonated Water", "water.carbonated", 13421823, 0.10000000149011612), - TonicWater("Tonic Water", "water.tonic", 13421823, 0.10000000149011612), - Cream("Carbonated Water", "cream", 15395550, 2.0), - GingerAle("Ginger Ale", "gingerAle", 16777215, 0.6000000238418579), - Coffee("Coffee", "coffee", 5910789, 0.30000001192092896), - SugarSyrup("Simple Syrup", "syrup.simple", 16120049, 0.10000000149011612), - AgaveNectar("Agave Nectar", "syrup.agave", 13598245, 0.699999988079071), - GrenadineSyrup("Grenadine Syrup", "syrup.grenadine", 16009573, 0.800000011920929); +public enum MiscFluid implements IFluidType, ICocktailLiquid { + CarbonatedWater("Carbonated Water", "water.carbonated", 0xccccff, 0.10000000149011612), + TonicWater("Tonic Water", "water.tonic", 0xccccff, 0.10000000149011612), + Cream("Carbonated Water", "cream", 0xeaeade, 2.0), + GingerAle("Ginger Ale", "gingerAle", 0xffffff, 0.6000000238418579), + Coffee("Coffee", "coffee", 0x5a3105, 0.30000001192092896), + SugarSyrup("Simple Syrup", "syrup.simple", 0xf5f8f1, 0.10000000149011612), + AgaveNectar("Agave Nectar", "syrup.agave", 0xcf7e25, 0.699999988079071), + GrenadineSyrup("Grenadine Syrup", "syrup.grenadine", 0xf44965, 0.800000011920929); - String name; - String ident; - IIcon icon; - int colour; - float transparency; + protected String name; + protected String ident; + protected IIcon icon; + protected int colour; + protected float transparency; - private MiscFluid(final String name, final String ident, final int colour, final double transparency) { + MiscFluid(String name, String ident, int colour, double transparency) { this.name = name; this.ident = ident; this.colour = colour; @@ -38,62 +33,62 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid @Override public String toString() { - return this.name; + return name; } @Override - public boolean canPlaceIn(final FluidContainer container) { + public boolean canPlaceIn(FluidContainer container) { return true; } @Override - public boolean showInCreative(final FluidContainer container) { + public boolean showInCreative(FluidContainer container) { return container == FluidContainer.Glass; } @Override public IIcon getIcon() { - return this.icon; + return icon; } @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); } @Override public String getName() { - return this.name; + return name; } @Override public String getIdentifier() { - return "binnie." + this.ident; + return "binnie." + ident; } @Override public int getColor() { - return this.colour; + return colour; } @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.getIdentifier(), amount); + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(getIdentifier(), amount); } @Override public int getTransparency() { - return (int) (Math.min(1.0, this.transparency + 0.3) * 255.0); + return (int) (Math.min(1.0, transparency + 0.3) * 255.0); } @Override - public String getTooltip(final int ratio) { - return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName(); + public String getTooltip(int ratio) { + return ratio + " Part" + ((ratio > 1) ? "s " : " ") + getName(); } @Override - public int getContainerColour() { - return this.getColor(); + public int getContainerColor() { + return getColor(); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 974b5114..1d53671a 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -1,36 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; -import binnie.extratrees.machines.Distillery; -import java.util.List; -import binnie.extratrees.machines.Brewery; -import binnie.extratrees.machines.Press; -import net.minecraftforge.fluids.FluidStack; -import java.util.Map; -import forestry.api.recipes.RecipeManagers; -import binnie.extratrees.item.Food; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import binnie.extratrees.alcohol.drink.DrinkManager; -import binnie.extratrees.alcohol.drink.DrinkLiquid; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; import binnie.core.liquid.IFluidType; import binnie.core.liquid.ItemFluidContainer; -import net.minecraftforge.client.IItemRenderer; -import net.minecraft.item.Item; -import binnie.extratrees.alcohol.drink.CocktailRenderer; -import binnie.extratrees.alcohol.drink.ItemDrink; -import binnie.core.BinnieCore; -import binnie.extratrees.ExtraTrees; -import binnie.Binnie; import binnie.core.resource.BinnieIcon; -import binnie.core.IInitializable; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.alcohol.drink.CocktailRenderer; +import binnie.extratrees.alcohol.drink.DrinkLiquid; +import binnie.extratrees.alcohol.drink.DrinkManager; +import binnie.extratrees.alcohol.drink.ItemDrink; +import binnie.extratrees.item.Food; +import binnie.extratrees.machines.Brewery; +import binnie.extratrees.machines.Distillery; +import binnie.extratrees.machines.Press; +import forestry.api.recipes.RecipeManagers; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; -public class ModuleAlcohol implements IInitializable -{ +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class ModuleAlcohol implements IInitializable { public static int drinkRendererID; public static BinnieIcon liquid; @@ -44,41 +38,44 @@ public class ModuleAlcohol implements IInitializable Binnie.Liquid.createLiquids(Alcohol.values(), ItemFluidContainer.LiquidAlcohol); Binnie.Liquid.createLiquids(Spirit.values(), ItemFluidContainer.LiquidSpirit); Binnie.Liquid.createLiquids(Liqueur.values(), ItemFluidContainer.LiquidLiqueuer); - for (final Juice juice : Juice.values()) { + + for (Juice juice : Juice.values()) { Cocktail.registerIngredient(juice); } - for (final Alcohol juice2 : Alcohol.values()) { + for (Alcohol juice2 : Alcohol.values()) { Cocktail.registerIngredient(juice2); } - for (final Spirit juice3 : Spirit.values()) { + for (Spirit juice3 : Spirit.values()) { Cocktail.registerIngredient(juice3); } - for (final Liqueur juice4 : Liqueur.values()) { + for (Liqueur juice4 : Liqueur.values()) { Cocktail.registerIngredient(juice4); } - DrinkManager.registerDrinkLiquid("water", new DrinkLiquid("Water", 13421823, 0.1f, 0.0f)); + DrinkManager.registerDrinkLiquid("water", new DrinkLiquid("Water", 0xccccff, 0.1f, 0.0f)); } @Override public void init() { + // ignored } @Override public void postInit() { - for (final Juice juice : Juice.values()) { - final String oreDict = juice.squeezing; - final List ores = new ArrayList(); + for (Juice juice : Juice.values()) { + String oreDict = juice.squeezing; + List ores = new ArrayList(); ores.addAll(OreDictionary.getOres(oreDict)); - for (final Food food : Food.values()) { + for (Food food : Food.values()) { if (food.getOres().contains(oreDict)) { ores.add(food.get(1)); } } - for (final ItemStack stack : ores) { - for (final Map.Entry entry : RecipeManagers.squeezerManager.getRecipes().entrySet()) { + + for (ItemStack stack : ores) { + for (Map.Entry entry : RecipeManagers.squeezerManager.getRecipes().entrySet()) { try { - final ItemStack input = (ItemStack) entry.getKey()[0]; - final FluidStack output = (FluidStack) entry.getValue()[1]; + ItemStack input = (ItemStack) entry.getKey()[0]; + FluidStack output = (FluidStack) entry.getValue()[1]; if (!ItemStack.areItemStacksEqual(stack, input) && !OreDictionary.itemMatches(input, stack, true)) { continue; } @@ -88,45 +85,48 @@ public class ModuleAlcohol implements IInitializable } Press.addRecipe(stack, juice.get(amount)); } catch (Exception ex) { + // ignored } } } } - for (final Alcohol alcohol : Alcohol.values()) { - for (final String fermentLiquid : alcohol.fermentationLiquid) { - final FluidStack fluid = Binnie.Liquid.getLiquidStack(fermentLiquid, 5); + + for (Alcohol alcohol : Alcohol.values()) { + for (String fermentLiquid : alcohol.fermentationLiquid) { + FluidStack fluid = Binnie.Liquid.getLiquidStack(fermentLiquid, 5); if (fluid != null) { Brewery.addRecipe(fluid, alcohol.get(5)); } } } + Brewery.addBeerAndMashRecipes(); - this.addDistillery(Alcohol.Apple, Spirit.AppleBrandy, Spirit.AppleLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Pear, Spirit.PearBrandy, Spirit.PearLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Apricot, Spirit.ApricotBrandy, Spirit.ApricotLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Banana, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Cherry, Spirit.CherryBrandy, Spirit.CherryLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Elderberry, Spirit.ElderberryBrandy, Spirit.ElderberryLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Peach, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Plum, Spirit.PlumBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Carrot, Spirit.FruitBrandy, Spirit.Vodka, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.WhiteWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.RedWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.SparklingWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Agave, Spirit.Tequila, Spirit.Tequila, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Potato, Spirit.FruitBrandy, Spirit.Vodka, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Citrus, Spirit.CitrusBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Cranberry, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Pineapple, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Tomato, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Fruit, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Barley, Spirit.Whiskey, Spirit.Vodka, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Wheat, Spirit.WheatWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Rye, Spirit.RyeWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); - this.addDistillery(Alcohol.Corn, Spirit.CornWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.Apple, Spirit.AppleBrandy, Spirit.AppleLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Pear, Spirit.PearBrandy, Spirit.PearLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Apricot, Spirit.ApricotBrandy, Spirit.ApricotLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Banana, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Cherry, Spirit.CherryBrandy, Spirit.CherryLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Elderberry, Spirit.ElderberryBrandy, Spirit.ElderberryLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Peach, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Plum, Spirit.PlumBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Carrot, Spirit.FruitBrandy, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.WhiteWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); + addDistillery(Alcohol.RedWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); + addDistillery(Alcohol.SparklingWine, Spirit.Brandy, Spirit.Brandy, Spirit.NeutralSpirit); + addDistillery(Alcohol.Agave, Spirit.Tequila, Spirit.Tequila, Spirit.NeutralSpirit); + addDistillery(Alcohol.Potato, Spirit.FruitBrandy, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.Citrus, Spirit.CitrusBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Cranberry, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Pineapple, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Tomato, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Fruit, Spirit.FruitBrandy, Spirit.FruitLiquor, Spirit.NeutralSpirit); + addDistillery(Alcohol.Barley, Spirit.Whiskey, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.Wheat, Spirit.WheatWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.Rye, Spirit.RyeWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); + addDistillery(Alcohol.Corn, Spirit.CornWhiskey, Spirit.Vodka, Spirit.NeutralSpirit); } - private void addDistillery(final IFluidType source, final IFluidType a, final IFluidType b, final IFluidType c) { + private void addDistillery(IFluidType source, IFluidType a, IFluidType b, IFluidType c) { Distillery.addRecipe(source.get(5), a.get(4), 0); Distillery.addRecipe(source.get(5), b.get(2), 1); Distillery.addRecipe(source.get(5), c.get(1), 2); diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index e0d31ba4..da190e01 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -1,55 +1,50 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.IFluidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.liquid.FluidContainer; import net.minecraft.util.IIcon; -import binnie.core.liquid.IFluidType; +import net.minecraftforge.fluids.FluidStack; -public enum Spirit implements IFluidType, ICocktailLiquid -{ - NeutralSpirit("Neutral Spirit", "spiritNeutral", 16777215, 0.05, 0.8), - Vodka("Vodka", "vodka", 16053751, 0.05, 0.4), - WhiteRum("White Rum", "rumWhite", 15132132, 0.05, 0.4), - DarkRum("Dark Rum", "rumDark", 11018752, 0.4, 0.4), - Whiskey("Whiskey", "whiskey", 13594368, 0.2, 0.4), - CornWhiskey("Bourbon", "whiskeyCorn", 9835009, 0.2, 0.4), - RyeWhiskey("Rye Whiskey", "whiskeyRye", 16085800, 0.2, 0.4), - WheatWhiskey("Wheat Whiskey", "whiskeyWheat", 14976530, 0.2, 0.4), - FortifiedWine("Fortified Wine", "wineFortified", 15569439, 0.2, 0.2), - Tequila("Tequila", "tequila", 16116160, 0.05, 0.4), - Brandy("Brandy", "brandyGrape", 16228128, 0.2, 0.4), - AppleBrandy("Apple Brandy", "brandyApple", 14985790, 0.2, 0.4), - PearBrandy("Pear Brandy", "brandyPear", 16696883, 0.2, 0.4), - ApricotBrandy("Apricot Brandy", "brandyApricot", 13336387, 0.2, 0.4), - PlumBrandy("Plum Brandy", "brandyPlum", 9511697, 0.2, 0.4), - CherryBrandy("Cherry Brandy", "brandyCherry", 8588062, 0.2, 0.4), - ElderberryBrandy("Elderberry Brandy", "brandyElderberry", 12462919, 0.2, 0.4), - CitrusBrandy("Citrus Brandy", "brandyCitrus", 13336387, 0.2, 0.4), - FruitBrandy("Fruit Brandy", "brandyFruit", 14985790, 0.2, 0.4), - Cachaca("Cachaca", "spiritSugarcane", 15331535, 0.1, 0.4), - Gin("Gin", "spiritGin", 16185078, 0.05, 0.4), - AppleLiquor("Apple Liquor", "liquorApple", 13421772, 0.05, 0.4), - PearLiquor("Pear Liquor", "liquorPear", 13421772, 0.05, 0.4), - CherryLiquor("Cherry Liquor", "liquorCherry", 13421772, 0.05, 0.4), - ElderberryLiquor("Elderberry Liquor", "liquorElderberry", 13421772, 0.05, 0.4), - ApricotLiquor("Apricot Liquor", "liquorApricot", 13421772, 0.05, 0.4), - FruitLiquor("Fruit Liquor", "liquorFruit", 13421772, 0.05, 0.4); +public enum Spirit implements IFluidType, ICocktailLiquid { + NeutralSpirit("Neutral Spirit", "spiritNeutral", 0xffffff, 0.05, 0.8), + Vodka("Vodka", "vodka", 0xf4f5f7, 0.05, 0.4), + WhiteRum("White Rum", "rumWhite", 0xe6e5e4, 0.05, 0.4), + DarkRum("Dark Rum", "rumDark", 0xa82200, 0.4, 0.4), + Whiskey("Whiskey", "whiskey", 0xcf6f00, 0.2, 0.4), + CornWhiskey("Bourbon", "whiskeyCorn", 0x961201, 0.2, 0.4), + RyeWhiskey("Rye Whiskey", "whiskeyRye", 0xf57328, 0.2, 0.4), + WheatWhiskey("Wheat Whiskey", "whiskeyWheat", 0xe48612, 0.2, 0.4), + FortifiedWine("Fortified Wine", "wineFortified", 0xed921f, 0.2, 0.2), + Tequila("Tequila", "tequila", 0xf5e9c0, 0.05, 0.4), + Brandy("Brandy", "brandyGrape", 0xf79f20, 0.2, 0.4), + AppleBrandy("Apple Brandy", "brandyApple", 0xe4aa3e, 0.2, 0.4), + PearBrandy("Pear Brandy", "brandyPear", 0xfec633, 0.2, 0.4), + ApricotBrandy("Apricot Brandy", "brandyApricot", 0xcb7f43, 0.2, 0.4), + PlumBrandy("Plum Brandy", "brandyPlum", 0x912311, 0.2, 0.4), + CherryBrandy("Cherry Brandy", "brandyCherry", 0x830b1e, 0.2, 0.4), + ElderberryBrandy("Elderberry Brandy", "brandyElderberry", 0xbe2b47, 0.2, 0.4), + CitrusBrandy("Citrus Brandy", "brandyCitrus", 0xcb7f43, 0.2, 0.4), + FruitBrandy("Fruit Brandy", "brandyFruit", 0xe4aa3e, 0.2, 0.4), + Cachaca("Cachaca", "spiritSugarcane", 0xe9f0cf, 0.1, 0.4), + Gin("Gin", "spiritGin", 0xf6f6f6, 0.05, 0.4), + AppleLiquor("Apple Liquor", "liquorApple", 0xcccccc, 0.05, 0.4), + PearLiquor("Pear Liquor", "liquorPear", 0xcccccc, 0.05, 0.4), + CherryLiquor("Cherry Liquor", "liquorCherry", 0xcccccc, 0.05, 0.4), + ElderberryLiquor("Elderberry Liquor", "liquorElderberry", 0xcccccc, 0.05, 0.4), + ApricotLiquor("Apricot Liquor", "liquorApricot", 0xcccccc, 0.05, 0.4), + FruitLiquor("Fruit Liquor", "liquorFruit", 0xcccccc, 0.05, 0.4); - String name; - String ident; - IIcon icon; - int colour; - float transparency; - float abv; + protected String name; + protected String ident; + protected IIcon icon; + protected int colour; + protected float transparency; + protected float abv; - private Spirit(final String name, final String ident, final int colour, final double transparency, final double abv) { + Spirit(String name, String ident, int colour, double transparency, double abv) { this.name = name; this.ident = ident; this.colour = colour; @@ -59,66 +54,66 @@ public enum Spirit implements IFluidType, ICocktailLiquid @Override public String toString() { - return this.name; + return name; } @Override - public boolean canPlaceIn(final FluidContainer container) { + public boolean canPlaceIn(FluidContainer container) { return true; } @Override - public boolean showInCreative(final FluidContainer container) { + public boolean showInCreative(FluidContainer container) { return container == FluidContainer.Glass; } @Override public IIcon getIcon() { - return this.icon; + return icon; } @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid"); } @Override public String getName() { - return this.name; + return name; } @Override public String getIdentifier() { - return "binnie." + this.ident; + return "binnie." + ident; } @Override public int getColor() { - return this.colour; + return colour; } @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.getIdentifier(), amount); + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(getIdentifier(), amount); } @Override public int getTransparency() { - return (int) (Math.min(1.0, this.transparency + 0.3) * 255.0); + return (int) (Math.min(1.0, transparency + 0.3) * 255.0); } @Override - public String getTooltip(final int ratio) { - return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName(); + public String getTooltip(int ratio) { + return ratio + " Part" + ((ratio > 1) ? "s " : " ") + getName(); } @Override - public int getContainerColour() { - return this.getColor(); + public int getContainerColor() { + return getColor(); } @Override public float getABV() { - return this.abv; + return abv; } } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java index 13eacb88..f7663e9a 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrink.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; import binnie.extratrees.alcohol.ModuleAlcohol; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.block.material.Material; import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class BlockDrink extends BlockContainer -{ +// TODO unused class? +public class BlockDrink extends BlockContainer { public BlockDrink() { super(Material.glass); - this.setBlockName("drink"); - this.setCreativeTab(CreativeTabs.tabTools); + setBlockName("drink"); + setCreativeTab(CreativeTabs.tabTools); } @Override @@ -28,7 +24,7 @@ public class BlockDrink extends BlockContainer } @Override - public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityDrink(); } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java index 8e0b7454..89babb02 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/BlockDrinkRenderer.java @@ -1,39 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; import binnie.extratrees.alcohol.ModuleAlcohol; -import net.minecraft.init.Blocks; -import net.minecraft.client.renderer.Tessellator; -import org.lwjgl.opengl.GL11; -import net.minecraft.world.IBlockAccess; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; -public class BlockDrinkRenderer implements ISimpleBlockRenderingHandler -{ +// TODO unused class? +public class BlockDrinkRenderer implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + // ignored } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { GL11.glPushMatrix(); Tessellator.instance.setColorRGBA(255, 255, 255, 150); - final Tessellator tess = Tessellator.instance; + Tessellator tess = Tessellator.instance; renderer.renderFaceYPos(block, x, y, z, Blocks.dirt.getIcon(0, 0)); - final float s = 0.0625f; + float s = 0.0625f; + for (int h = 0; h < 16; ++h) { - final float d1 = 8.0f * s; - final float d2 = 8.0f * s; - final float h2 = h * s; - final float h3 = h * s; + float d1 = 8.0f * s; + float h2 = h * s; tess.addVertexWithUV(x + 0.5f - d1, y + h2, z + 0.5f - d1, 0.0, 0.0); - tess.addVertexWithUV(x + 0.5f - d1, y + h3, z + 0.5f - d1, 0.0, 0.0); - tess.addVertexWithUV(x + 0.5f + d1, y + h3, z + 0.5f - d1, 0.0, 0.0); + tess.addVertexWithUV(x + 0.5f - d1, y + h2, z + 0.5f - d1, 0.0, 0.0); + tess.addVertexWithUV(x + 0.5f + d1, y + h2, z + 0.5f - d1, 0.0, 0.0); tess.addVertexWithUV(x + 0.5f + d1, y + h2, z + 0.5f - d1, 0.0, 0.0); } GL11.glPopMatrix(); @@ -41,7 +37,7 @@ public class BlockDrinkRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean shouldRender3DInInventory(final int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return false; } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java b/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java index 9eae382d..b24e05b2 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/CocktailRenderer.java @@ -1,49 +1,45 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.texture.TextureUtil; import binnie.core.BinnieCore; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; -import binnie.extratrees.alcohol.Glassware; -import net.minecraft.client.renderer.Tessellator; import binnie.extratrees.ExtraTrees; -import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; +import binnie.extratrees.alcohol.Glassware; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; -public class CocktailRenderer implements IItemRenderer -{ - private void renderCocktail(final RenderBlocks renderBlocks, final ItemStack item, final float p, final float q, final float r) { - final RenderItem renderItem = new RenderItem(); +public class CocktailRenderer implements IItemRenderer { + private void renderCocktail(RenderBlocks renderBlocks, ItemStack item, float p, float q, float r) { + RenderItem renderItem = new RenderItem(); GL11.glEnable(3042); GL11.glBlendFunc(770, 771); - final Glassware glass = ExtraTrees.drink.getGlassware(item); - final FluidStack fluid = ExtraTrees.drink.getFluid(item); - final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); - this.setColor(16777215, 0.8f); + Glassware glass = ExtraTrees.drink.getGlassware(item); + FluidStack fluid = ExtraTrees.drink.getFluid(item); + IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + setColor(16777215, 0.8f); renderItem.renderIcon(0, 0, glass.glass, 16, 16); + if (drink != null) { - this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); - final IIcon icon = glass.contents; - final float amount = fluid.amount / glass.getVolume(); - final float level = glass.getContentHeight() * (1.0f - amount); - final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); - final float x = 0.0f; - final float y = 16.0f * (gapAtTop + level); - final float w = 16.0f; - final float h = 16.0f - y; - final float minV = icon.getInterpolatedV(y); - final float maxV = icon.getInterpolatedV(16.0); - final Tessellator tessellator = Tessellator.instance; + setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); + IIcon icon = glass.contents; + float amount = fluid.amount / glass.getVolume(); + float level = glass.getContentHeight() * (1.0f - amount); + float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); + float x = 0.0f; + float y = 16.0f * (gapAtTop + level); + float w = 16.0f; + float h = 16.0f - y; + float minV = icon.getInterpolatedV(y); + float maxV = icon.getInterpolatedV(16.0); + Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV(x + 0.0f, y + h, renderItem.zLevel, icon.getMinU(), maxV); tessellator.addVertexWithUV(x + w, y + h, renderItem.zLevel, icon.getMaxU(), maxV); @@ -54,116 +50,107 @@ public class CocktailRenderer implements IItemRenderer GL11.glDisable(3042); } - private void setColor(final int i1, final float alpha) { - final float f = (i1 >> 16 & 0xFF) / 255.0f; - final float f2 = (i1 >> 8 & 0xFF) / 255.0f; - final float f3 = (i1 & 0xFF) / 255.0f; + private void setColor(int i1, float alpha) { + float f = (i1 >> 16 & 0xFF) / 255.0f; + float f2 = (i1 >> 8 & 0xFF) / 255.0f; + float f3 = (i1 & 0xFF) / 255.0f; GL11.glColor4f(f, f2, f3, (alpha > 1.0f) ? 1.0f : alpha); } - private void renderFace(final Tessellator tessellator, final ForgeDirection dir) { + private void renderFace(Tessellator tessellator, ForgeDirection dir) { switch (dir) { - case DOWN: { - tessellator.addVertex(0.0, 0.0, 0.0); - tessellator.addVertex(0.0, 0.0, 1.0); - tessellator.addVertex(1.0, 0.0, 1.0); - tessellator.addVertex(1.0, 0.0, 0.0); - break; - } + case DOWN: + tessellator.addVertex(0.0, 0.0, 0.0); + tessellator.addVertex(0.0, 0.0, 1.0); + tessellator.addVertex(1.0, 0.0, 1.0); + tessellator.addVertex(1.0, 0.0, 0.0); + break; } } @Override - public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { switch (type) { - case ENTITY: { - return true; - } - case EQUIPPED: { - return true; - } - case INVENTORY: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - default: { - return false; - } + case ENTITY: + case EQUIPPED: + case INVENTORY: + case EQUIPPED_FIRST_PERSON: + return true; } + return false; } @Override - public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { - return helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION || helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING; + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + return helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION + || helper == IItemRenderer.ItemRendererHelper.ENTITY_BOBBING; } @Override - public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { - if (type == IItemRenderer.ItemRenderType.ENTITY) { - GL11.glTranslatef(-0.5f, -0.25f, -0.0f); - } - final TextureManager texturemanager = BinnieCore.proxy.getMinecraftInstance().getTextureManager(); - final Glassware glass = ExtraTrees.drink.getGlassware(item); - final FluidStack fluid = ExtraTrees.drink.getFluid(item); - IIcon iicon = glass.glass; - final float f = iicon.getMinU(); - final float f2 = iicon.getMaxU(); - final float f3 = iicon.getMinV(); - final float f4 = iicon.getMaxV(); - texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); - TextureUtil.func_152777_a(false, false, 1.0f); - this.setColor(16777215, 0.8f); - final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); - this.setColor(16777215, 0.8f); - ItemRenderer.renderItemIn2D(Tessellator.instance, f2, f3, f, f4, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625f); - if (drink != null) { - this.setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); - iicon = glass.contents; - final IIcon icon = glass.contents; - final float amount = fluid.amount / glass.getVolume(); - final float level = glass.getContentHeight() * (1.0f - amount); - final float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); - final float x = 0.0f; - final float y = 1.0f * (gapAtTop + level); - final float w = 1.0f; - final float h = 1.0f - y; - final float minV = icon.getInterpolatedV(y * 16.0f); - final float maxV = icon.getInterpolatedV(16.0); - final float minU = icon.getMinU(); - final float maxU = icon.getMaxU(); - final Tessellator tessellator = Tessellator.instance; - tessellator.setNormal(0.0f, 0.0f, -1.0f); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); - tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); - tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); - tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); - tessellator.draw(); - tessellator.setNormal(0.0f, 0.0f, 1.0f); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); - tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); - tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); - tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); - tessellator.draw(); + case ENTITY: + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: { + if (type == IItemRenderer.ItemRenderType.ENTITY) { + GL11.glTranslatef(-0.5f, -0.25f, -0.0f); + } + TextureManager texturemanager = BinnieCore.proxy.getMinecraftInstance().getTextureManager(); + Glassware glass = ExtraTrees.drink.getGlassware(item); + FluidStack fluid = ExtraTrees.drink.getFluid(item); + IIcon iicon = glass.glass; + float f = iicon.getMinU(); + float f2 = iicon.getMaxU(); + float f3 = iicon.getMinV(); + float f4 = iicon.getMaxV(); + texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); + TextureUtil.func_152777_a(false, false, 1.0f); + setColor(0xffffff, 0.8f); + IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + setColor(0xffffff, 0.8f); + ItemRenderer.renderItemIn2D(Tessellator.instance, f2, f3, f, f4, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625f); + if (drink != null) { + setColor(drink.getColour(), 1.2f * drink.getTransparency() + 0.3f); + iicon = glass.contents; + IIcon icon = glass.contents; + float amount = fluid.amount / glass.getVolume(); + float level = glass.getContentHeight() * (1.0f - amount); + float gapAtTop = 1.0f - (glass.getContentBottom() + glass.getContentHeight()); + float x = 0.0f; + float y = 1.0f * (gapAtTop + level); + float w = 1.0f; + float h = 1.0f - y; + float minV = icon.getInterpolatedV(y * 16.0f); + float maxV = icon.getInterpolatedV(16.0); + float minU = icon.getMinU(); + float maxU = icon.getMaxU(); + Tessellator tessellator = Tessellator.instance; + tessellator.setNormal(0.0f, 0.0f, -1.0f); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); + tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); + tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); + tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); + tessellator.draw(); + tessellator.setNormal(0.0f, 0.0f, 1.0f); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(0.0, 1.0 - y, -0.03125, maxU, minV); + tessellator.addVertexWithUV(0.0, 0.0, -0.03125, maxU, maxV); + tessellator.addVertexWithUV(1.0, 0.0, -0.03125, minU, maxV); + tessellator.addVertexWithUV(1.0, 1.0 - y, -0.03125, minU, minV); + tessellator.draw(); + break; + } + break; + } + case INVENTORY: { + renderCocktail((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); break; } - break; - } - case INVENTORY: { - this.renderCocktail((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - } } } - public void renderItemIn2DPercentage(final Tessellator tesselator, final float maxU, final float minV, final float minU, float maxV, final int width, final int height, final float depth, final float percent) { + public void renderItemIn2DPercentage(Tessellator tesselator, float maxU, float minV, float minU, float maxV, int width, int height, float depth, float percent) { maxV = minV + (maxV - minV) * 1.0f; tesselator.startDrawingQuads(); tesselator.setNormal(0.0f, 0.0f, 1.0f); @@ -179,13 +166,13 @@ public class CocktailRenderer implements IItemRenderer tesselator.addVertexWithUV(1.0, 0.0, 0.0f - depth, minU, maxV); tesselator.addVertexWithUV(0.0, 0.0, 0.0f - depth, maxU, maxV); tesselator.draw(); - final float f5 = 0.5f * (maxU - minU) / width; - final float f6 = 0.5f * (maxV - minV) / height; + float f5 = 0.5f * (maxU - minU) / width; + float f6 = 0.5f * (maxV - minV) / height; tesselator.startDrawingQuads(); tesselator.setNormal(-1.0f, 0.0f, 0.0f); for (int k = 0; k < width; ++k) { - final float f7 = k / width; - final float f8 = maxU + (minU - maxU) * f7 - f5; + float f7 = k / width; + float f8 = maxU + (minU - maxU) * f7 - f5; tesselator.addVertexWithUV(f7, 0.0, 0.0f - depth, f8, maxV); tesselator.addVertexWithUV(f7, 0.0, 0.0, f8, maxV); tesselator.addVertexWithUV(f7, 1.0, 0.0, f8, minV); @@ -195,9 +182,9 @@ public class CocktailRenderer implements IItemRenderer tesselator.startDrawingQuads(); tesselator.setNormal(1.0f, 0.0f, 0.0f); for (int k = 0; k < width; ++k) { - final float f7 = k / width; - final float f8 = maxU + (minU - maxU) * f7 - f5; - final float f9 = f7 + 1.0f / width; + float f7 = k / width; + float f8 = maxU + (minU - maxU) * f7 - f5; + float f9 = f7 + 1.0f / width; tesselator.addVertexWithUV(f9, 1.0, 0.0f - depth, f8, minV); tesselator.addVertexWithUV(f9, 1.0, 0.0, f8, minV); tesselator.addVertexWithUV(f9, 0.0, 0.0, f8, maxV); @@ -207,9 +194,9 @@ public class CocktailRenderer implements IItemRenderer tesselator.startDrawingQuads(); tesselator.setNormal(0.0f, 1.0f, 0.0f); for (int k = 0; k < height; ++k) { - final float f7 = k / height; - final float f8 = maxV + (minV - maxV) * f7 - f6; - final float f9 = f7 + 1.0f / height; + float f7 = k / height; + float f8 = maxV + (minV - maxV) * f7 - f6; + float f9 = f7 + 1.0f / height; tesselator.addVertexWithUV(0.0, f9, 0.0, maxU, f8); tesselator.addVertexWithUV(1.0, f9, 0.0, minU, f8); tesselator.addVertexWithUV(1.0, f9, 0.0f - depth, minU, f8); @@ -219,8 +206,8 @@ public class CocktailRenderer implements IItemRenderer tesselator.startDrawingQuads(); tesselator.setNormal(0.0f, -1.0f, 0.0f); for (int k = 0; k < height; ++k) { - final float f7 = k / height; - final float f8 = maxV + (minV - maxV) * f7 - f6; + float f7 = k / height; + float f8 = maxV + (minV - maxV) * f7 - f6; tesselator.addVertexWithUV(1.0, f7, 0.0, minU, f8); tesselator.addVertexWithUV(0.0, f7, 0.0, maxU, f8); tesselator.addVertexWithUV(0.0, f7, 0.0f - depth, maxU, f8); diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java index b1f0ea80..e2e64134 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java @@ -1,21 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; import binnie.Binnie; import net.minecraftforge.fluids.FluidStack; -public class DrinkLiquid implements IDrinkLiquid -{ - String name; - int colour; - float transparency; - float abv; +public class DrinkLiquid implements IDrinkLiquid { public String ident; - public DrinkLiquid(final String name, final int colour, final float transparency, final float abv) { + protected String name; + protected int colour; + protected float transparency; + protected float abv; + + public DrinkLiquid(String name, int colour, float transparency, float abv) { this.name = name; this.colour = colour; this.transparency = transparency; @@ -29,36 +25,36 @@ public class DrinkLiquid implements IDrinkLiquid @Override public int getColour() { - return this.colour; + return colour; } @Override public String getName() { - return this.name; + return name; } @Override public float getTransparency() { - return this.transparency; + return transparency; } @Override public String getIdentifier() { - return this.ident; + return ident; } @Override - public void setIdent(final String lowerCase) { - this.ident = lowerCase; + public void setIdent(String lowerCase) { + ident = lowerCase; } @Override public float getABV() { - return this.abv; + return abv; } @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.ident, amount); + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(ident, amount); } } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java index 6dbb14ad..52fa9873 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkManager.java @@ -1,36 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; -import java.util.HashMap; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import java.util.HashMap; import java.util.Map; -public class DrinkManager -{ - static Map drinkLiquids; +public class DrinkManager { + protected static Map drinkLiquids = new HashMap<>(); - public static IDrinkLiquid getLiquid(final String id) { + public static IDrinkLiquid getLiquid(String id) { return DrinkManager.drinkLiquids.get(id.toLowerCase()); } - public static void registerDrinkLiquid(final String id, final IDrinkLiquid liquid) { + public static void registerDrinkLiquid(String id, IDrinkLiquid liquid) { liquid.setIdent(id.toLowerCase()); DrinkManager.drinkLiquids.put(id.toLowerCase(), liquid); } - public static IDrinkLiquid getLiquid(final Fluid fluid) { + public static IDrinkLiquid getLiquid(Fluid fluid) { return getLiquid(fluid.getName()); } - public static IDrinkLiquid getLiquid(final FluidStack fluid) { - return (fluid != null) ? getLiquid(fluid.getFluid()) : null; - } - - static { - DrinkManager.drinkLiquids = new HashMap(); + public static IDrinkLiquid getLiquid(FluidStack fluid) { + if (fluid == null) { + return null; + } + return getLiquid(fluid.getFluid()); } } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java b/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java index fd756735..8cea8ef2 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java @@ -1,10 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; -public interface IAlcoholic -{ +public interface IAlcoholic { float getABV(); } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java index 903a7027..f1730628 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/IDrinkLiquid.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; import net.minecraftforge.fluids.FluidStack; -public interface IDrinkLiquid -{ +public interface IDrinkLiquid { boolean isConsumable(); int getColour(); @@ -18,9 +13,9 @@ public interface IDrinkLiquid String getIdentifier(); - void setIdent(final String p0); + void setIdent(String lowerCase); float getABV(); - FluidStack get(final int p0); + FluidStack get(int amount); } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java index db9c3e51..f0ec7635 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/ItemDrink.java @@ -1,79 +1,74 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; -import net.minecraft.item.EnumAction; +import binnie.extratrees.alcohol.Alcohol; import binnie.extratrees.alcohol.AlcoholEffect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.texture.IIconRegister; +import binnie.extratrees.alcohol.Glassware; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.alcohol.Alcohol; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.item.Item; -import net.minecraftforge.fluids.FluidStack; -import binnie.extratrees.alcohol.Glassware; -import net.minecraft.item.ItemStack; import forestry.api.core.Tabs; -import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; -public class ItemDrink extends ItemFood implements IFluidContainerItem -{ +import java.util.List; + +public class ItemDrink extends ItemFood implements IFluidContainerItem { public ItemDrink() { super(0, 0.0f, false); - this.setCreativeTab(Tabs.tabArboriculture); - this.setUnlocalizedName("drink"); - this.setHasSubtypes(true); - this.setMaxStackSize(1); - this.setAlwaysEdible(); + setCreativeTab(Tabs.tabArboriculture); + setUnlocalizedName("drink"); + setHasSubtypes(true); + setMaxStackSize(1); + setAlwaysEdible(); } - public Glassware getGlassware(final ItemStack container) { + public Glassware getGlassware(ItemStack container) { if (!container.hasTagCompound() || !container.getTagCompound().hasKey("glassware")) { return Glassware.BeerMug; } return Glassware.values()[container.getTagCompound().getShort("glassware")]; } - public ItemStack getStack(final Glassware glass, final FluidStack fluid) { - final ItemStack stack = new ItemStack(this); - this.saveGlassware(glass, stack); - this.saveFluid(fluid, stack); + public ItemStack getStack(Glassware glass, FluidStack fluid) { + ItemStack stack = new ItemStack(this); + saveGlassware(glass, stack); + saveFluid(fluid, stack); return stack; } - public void saveGlassware(final Glassware container, final ItemStack stack) { + public void saveGlassware(Glassware container, ItemStack stack) { if (!stack.hasTagCompound()) { stack.setTagCompound(new NBTTagCompound()); } stack.getTagCompound().setShort("glassware", (short) container.ordinal()); } - public void saveFluid(final FluidStack fluid, final ItemStack stack) { + public void saveFluid(FluidStack fluid, ItemStack stack) { if (!stack.hasTagCompound()) { stack.setTagCompound(new NBTTagCompound()); } - final NBTTagCompound nbt = stack.getTagCompound(); + + NBTTagCompound nbt = stack.getTagCompound(); if (fluid == null) { nbt.removeTag("fluid"); - } - else { - final NBTTagCompound liq = new NBTTagCompound(); + } else { + NBTTagCompound liq = new NBTTagCompound(); fluid.writeToNBT(liq); nbt.setTag("fluid", liq); } } @Override - public FluidStack getFluid(final ItemStack container) { + public FluidStack getFluid(ItemStack container) { if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("fluid")) { return null; } @@ -81,119 +76,126 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem } @Override - public int getCapacity(final ItemStack container) { - return this.getGlassware(container).getCapacity(); + public int getCapacity(ItemStack container) { + return getGlassware(container).getCapacity(); } @Override - public int fill(final ItemStack container, final FluidStack resource, final boolean doFill) { - if (resource == null || !container.hasTagCompound()) { + public int fill(ItemStack container, FluidStack resource, boolean doFill) { + if (resource == null || !container.hasTagCompound() || DrinkManager.getLiquid(resource.getFluid()) == null) { return 0; } - if (DrinkManager.getLiquid(resource.getFluid()) == null) { - return 0; - } - final FluidStack existing = this.getFluid(container); - final int space = this.getGlassware(container).getCapacity() - ((existing == null) ? 0 : existing.amount); - final int added = Math.min(space, resource.amount); + + FluidStack existing = getFluid(container); + int space = getGlassware(container).getCapacity() - ((existing == null) ? 0 : existing.amount); + int added = Math.min(space, resource.amount); if (space <= 0) { return 0; } + if (existing == null) { if (doFill) { - final FluidStack fill = resource.copy(); + FluidStack fill = resource.copy(); fill.amount = added; - this.saveFluid(fill, container); + saveFluid(fill, container); } return added; } + if (!existing.isFluidEqual(resource)) { return 0; } + if (doFill) { - final FluidStack fill = existing.copy(); + FluidStack fill = existing.copy(); fill.amount += added; - this.saveFluid(fill, container); + saveFluid(fill, container); } return added; } @Override - public FluidStack drain(final ItemStack container, final int maxDrain, final boolean doDrain) { + public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { if (!container.hasTagCompound()) { return null; } - final FluidStack content = this.getFluid(container); + + FluidStack content = getFluid(container); if (content == null) { return null; } - final int toRemove = Math.min(maxDrain, content.amount); + + int toRemove = Math.min(maxDrain, content.amount); FluidStack fill = content.copy(); - final FluidStack drain = content.copy(); + FluidStack drain = content.copy(); drain.amount = toRemove; fill.amount -= toRemove; if (fill.amount == 0) { fill = null; } + if (doDrain) { - this.saveFluid(fill, container); + saveFluid(fill, container); } return drain; } @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - for (final Glassware glassware : Glassware.values()) { - par3List.add(this.getStack(glassware, null)); + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (Glassware glassware : Glassware.values()) { + list.add(getStack(glassware, null)); } - par3List.add(this.getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); + list.add(getStack(Glassware.Wine, Alcohol.RedWine.get(Glassware.Wine.getCapacity()))); } @Override - public String getItemStackDisplayName(final ItemStack stack) { - final FluidStack fluid = this.getFluid(stack); - final IDrinkLiquid liquid = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); - return this.getGlassware(stack).getName((liquid == null) ? null : liquid.getName()); + public String getItemStackDisplayName(ItemStack stack) { + FluidStack fluid = getFluid(stack); + IDrinkLiquid liquid = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + return getGlassware(stack).getName((liquid == null) ? null : liquid.getName()); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister par1IconRegister) { - for (final Glassware glassware : Glassware.values()) { - glassware.registerIcons(par1IconRegister); + public void registerIcons(IIconRegister register) { + for (Glassware glassware : Glassware.values()) { + glassware.registerIcons(register); } } @Override - public IIcon getIcon(final ItemStack stack, final int pass) { - final Glassware glass = this.getGlassware(stack); - return (pass == 0) ? glass.glass : ((this.getFluid(stack) == null) ? glass.glass : glass.contents); + public IIcon getIcon(ItemStack stack, int pass) { + Glassware glass = getGlassware(stack); + return (pass == 0) ? glass.glass : ((getFluid(stack) == null) ? glass.glass : glass.contents); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(final ItemStack stack, final int pass) { - final FluidStack fluid = this.getFluid(stack); - final IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); - return (pass == 0) ? 16777215 : ((drink == null) ? 16777215 : drink.getColour()); + public int getColorFromItemStack(ItemStack stack, int pass) { + FluidStack fluid = getFluid(stack); + IDrinkLiquid drink = (fluid == null) ? null : DrinkManager.getLiquid(fluid.getFluid()); + if (pass == 0 || drink == null) { + return 0xffffff; + } + return drink.getColour(); } @Override - public int getRenderPasses(final int metadata) { + public int getRenderPasses(int metadata) { return 2; } @Override - public ItemStack onEaten(final ItemStack p_77654_1_, final World p_77654_2_, final EntityPlayer p_77654_3_) { - this.drain(p_77654_1_, 30, true); - AlcoholEffect.makeDrunk(p_77654_3_, 2.1f); - return p_77654_1_; + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + drain(stack, 30, true); + AlcoholEffect.makeDrunk(player, 2.1f); + return stack; } @Override - public EnumAction getItemUseAction(final ItemStack p_77661_1_) { - return (this.getFluid(p_77661_1_) == null) ? EnumAction.none : EnumAction.drink; + public EnumAction getItemUseAction(ItemStack stack) { + return (getFluid(stack) == null) ? EnumAction.none : EnumAction.drink; } @Override @@ -203,13 +205,13 @@ public class ItemDrink extends ItemFood implements IFluidContainerItem } @Override - public int getMaxItemUseDuration(final ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 16; } @Override - public ItemStack onItemRightClick(final ItemStack p_77659_1_, final World p_77659_2_, final EntityPlayer p_77659_3_) { - p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); - return p_77659_1_; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } } diff --git a/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java b/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java index 7ab3c207..3def841a 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/TileEntityDrink.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.alcohol.drink; import net.minecraft.tileentity.TileEntity; -public class TileEntityDrink extends TileEntity -{ +public class TileEntityDrink extends TileEntity { } diff --git a/src/main/java/binnie/extratrees/api/CarpentryManager.java b/src/main/java/binnie/extratrees/api/CarpentryManager.java index 4922b618..81d14c94 100644 --- a/src/main/java/binnie/extratrees/api/CarpentryManager.java +++ b/src/main/java/binnie/extratrees/api/CarpentryManager.java @@ -1,10 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; -public class CarpentryManager -{ +public class CarpentryManager { public static ICarpentryInterface carpentryInterface; } diff --git a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java index 903b86e9..ac43f272 100644 --- a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java +++ b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java @@ -1,34 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; -import java.util.List; -import java.util.Collection; import net.minecraft.item.ItemStack; -public interface ICarpentryInterface -{ - boolean registerCarpentryWood(final int p0, final IDesignMaterial p1); +import java.util.Collection; +import java.util.List; - int getCarpentryWoodIndex(final IDesignMaterial p0); +public interface ICarpentryInterface { + boolean registerCarpentryWood(int index, IDesignMaterial wood); - IDesignMaterial getWoodMaterial(final int p0); + int getCarpentryWoodIndex(IDesignMaterial wood); - boolean registerDesign(final int p0, final IDesign p1); + IDesignMaterial getWoodMaterial(int index); - int getDesignIndex(final IDesign p0); + boolean registerDesign(int index, IDesign wood); - IDesign getDesign(final int p0); + int getDesignIndex(IDesign wood); - ILayout getLayout(final IPattern p0, final boolean p1); + IDesign getDesign(int p0); - IDesignMaterial getWoodMaterial(final ItemStack p0); + ILayout getLayout(IPattern pattern, boolean inverted); - boolean registerDesignCategory(final IDesignCategory p0); + IDesignMaterial getWoodMaterial(ItemStack stack); - IDesignCategory getDesignCategory(final String p0); + boolean registerDesignCategory(IDesignCategory category); + + IDesignCategory getDesignCategory(String id); Collection getAllDesignCategories(); diff --git a/src/main/java/binnie/extratrees/api/IDesign.java b/src/main/java/binnie/extratrees/api/IDesign.java index 76f42eac..f7cd1f02 100644 --- a/src/main/java/binnie/extratrees/api/IDesign.java +++ b/src/main/java/binnie/extratrees/api/IDesign.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; -public interface IDesign -{ +public interface IDesign { String getName(); ILayout getTopPattern(); diff --git a/src/main/java/binnie/extratrees/api/IDesignCategory.java b/src/main/java/binnie/extratrees/api/IDesignCategory.java index d20c14d7..34c0753e 100644 --- a/src/main/java/binnie/extratrees/api/IDesignCategory.java +++ b/src/main/java/binnie/extratrees/api/IDesignCategory.java @@ -1,18 +1,13 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; import java.util.List; -public interface IDesignCategory -{ +public interface IDesignCategory { String getName(); List getDesigns(); - void addDesign(final IDesign p0); + void addDesign(IDesign design); String getId(); } diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/src/main/java/binnie/extratrees/api/IDesignMaterial.java index dcfeabfc..1c6a4cc2 100644 --- a/src/main/java/binnie/extratrees/api/IDesignMaterial.java +++ b/src/main/java/binnie/extratrees/api/IDesignMaterial.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; import net.minecraft.item.ItemStack; -public interface IDesignMaterial -{ +public interface IDesignMaterial { ItemStack getStack(); String getName(); diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/src/main/java/binnie/extratrees/api/IDesignSystem.java index 1a998456..e18a357b 100644 --- a/src/main/java/binnie/extratrees/api/IDesignSystem.java +++ b/src/main/java/binnie/extratrees/api/IDesignSystem.java @@ -1,30 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; -import net.minecraft.item.ItemStack; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -public interface IDesignSystem -{ - IIcon getPrimaryIcon(final IPattern p0); +public interface IDesignSystem { + IIcon getPrimaryIcon(IPattern pattern); - IIcon getSecondaryIcon(final IPattern p0); + IIcon getSecondaryIcon(IPattern pattern); - void registerIcons(final IIconRegister p0); + void registerIcons(IIconRegister register); IDesignMaterial getDefaultMaterial(); - IDesignMaterial getMaterial(final int p0); + IDesignMaterial getMaterial(int id); - int getMaterialIndex(final IDesignMaterial p0); + int getMaterialIndex(IDesignMaterial wood); IDesignMaterial getDefaultMaterial2(); ItemStack getAdhesive(); - IDesignMaterial getMaterial(final ItemStack p0); + IDesignMaterial getMaterial(ItemStack stack); } diff --git a/src/main/java/binnie/extratrees/api/ILayout.java b/src/main/java/binnie/extratrees/api/ILayout.java index 3b2bbe78..73ad209a 100644 --- a/src/main/java/binnie/extratrees/api/ILayout.java +++ b/src/main/java/binnie/extratrees/api/ILayout.java @@ -1,13 +1,8 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; import net.minecraft.util.IIcon; -public interface ILayout -{ +public interface ILayout { IPattern getPattern(); boolean isInverted(); @@ -22,7 +17,7 @@ public interface ILayout ILayout invert(); - IIcon getPrimaryIcon(final IDesignSystem p0); + IIcon getPrimaryIcon(IDesignSystem system); - IIcon getSecondaryIcon(final IDesignSystem p0); + IIcon getSecondaryIcon(IDesignSystem system); } diff --git a/src/main/java/binnie/extratrees/api/IPattern.java b/src/main/java/binnie/extratrees/api/IPattern.java index 6391b46f..7768b9b2 100644 --- a/src/main/java/binnie/extratrees/api/IPattern.java +++ b/src/main/java/binnie/extratrees/api/IPattern.java @@ -1,21 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -public interface IPattern -{ - IIcon getPrimaryIcon(final IDesignSystem p0); +public interface IPattern { + IIcon getPrimaryIcon(IDesignSystem system); - IIcon getSecondaryIcon(final IDesignSystem p0); + IIcon getSecondaryIcon(IDesignSystem system); ILayout getRotation(); ILayout getHorizontalFlip(); - void registerIcons(final IIconRegister p0); + void registerIcons(IIconRegister register); } diff --git a/src/main/java/binnie/extratrees/api/IToolHammer.java b/src/main/java/binnie/extratrees/api/IToolHammer.java index 35bfc523..52e331b7 100644 --- a/src/main/java/binnie/extratrees/api/IToolHammer.java +++ b/src/main/java/binnie/extratrees/api/IToolHammer.java @@ -1,15 +1,10 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.api; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public interface IToolHammer -{ - boolean isActive(final ItemStack p0); +public interface IToolHammer { + boolean isActive(ItemStack stack); - void onHammerUsed(final ItemStack p0, final EntityPlayer p1); + void onHammerUsed(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/binnie/extratrees/block/BlockBranch.java b/src/main/java/binnie/extratrees/block/BlockBranch.java index a0524f16..bd1fad2f 100644 --- a/src/main/java/binnie/extratrees/block/BlockBranch.java +++ b/src/main/java/binnie/extratrees/block/BlockBranch.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.core.block.BlockMetadata; @@ -27,18 +23,18 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; import java.util.List; -public class BlockBranch extends BlockLog implements IBlockMetadata -{ +// TODO unused class? +public class BlockBranch extends BlockLog implements IBlockMetadata { public BlockBranch() { - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("branch"); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("branch"); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < ILogType.ExtraTreeLog.values().length; ++i) { itemList.add(TileEntityMetadata.getItemStack(this, i)); } @@ -46,17 +42,17 @@ public class BlockBranch extends BlockLog implements IBlockMetadata @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z)); + return getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z)); } return super.getIcon(world, x, y, z, side); } - public IIcon getIcon(final int side, final int tileMeta, final int blockMeta) { - final int oriented = blockMeta & 0xC; - final ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta]; + public IIcon getIcon(int side, int tileMeta, int blockMeta) { + int oriented = blockMeta & 0xC; + ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta]; if (side > 3) { return log.getTrunk(); } @@ -64,8 +60,8 @@ public class BlockBranch extends BlockLog implements IBlockMetadata } @Override - public IIcon getIcon(final int side, final int tileMeta) { - return this.getIcon(side, tileMeta, 0); + public IIcon getIcon(int side, int tileMeta) { + return getIcon(side, tileMeta, 0); } @Override @@ -74,65 +70,66 @@ public class BlockBranch extends BlockLog implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return ILogType.ExtraTreeLog.values()[meta].getName() + " Branch"; } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index e2eee419..c682368e 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -28,22 +28,6 @@ import java.util.ArrayList; import java.util.List; public class BlockETDoor extends BlockDoor implements IBlockMetadata { - private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { - final DoorType type = getDoorType(tileMeta); - if (upper) { - return flip ? type.iconDoorUpperFlip : type.iconDoorUpper; - } - return flip ? type.iconDoorLowerFlip : type.iconDoorLower; - } - - public static DoorType getDoorType(final int tileMeta) { - final int type = (tileMeta & 0xF00) >> 8; - if (type >= 0 && type < DoorType.values().length) { - return DoorType.values()[type]; - } - return DoorType.Standard; - } - protected BlockETDoor() { super(Material.wood); setHardness(3.0f).setStepSound(Block.soundTypeWood); @@ -51,20 +35,36 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { setBlockName("door"); } + public static DoorType getDoorType(int tileMeta) { + int type = (tileMeta & 0xF00) >> 8; + if (type >= 0 && type < DoorType.values().length) { + return DoorType.values()[type]; + } + return DoorType.Standard; + } + + private IIcon getFlippedIcon(boolean upper, boolean flip, int tileMeta) { + DoorType type = getDoorType(tileMeta); + if (upper) { + return flip ? type.iconDoorUpperFlip : type.iconDoorUpper; + } + return flip ? type.iconDoorLowerFlip : type.iconDoorLower; + } + @Override - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(int side, int meta) { return DoorType.Standard.iconDoorLower; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess blockAccess, final int x, final int y, final int z, final int par5) { + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int par5) { if (par5 != 1 && par5 != 0) { - final int i1 = getFullMetadata(blockAccess, x, y, z); - final int j1 = i1 & 0x3; - final boolean flag = (i1 & 0x4) != 0; + int i1 = getFullMetadata(blockAccess, x, y, z); + int j1 = i1 & 0x3; + boolean flag = (i1 & 0x4) != 0; boolean flag2; - final boolean flag3 = (i1 & 0x8) != 0; + boolean flag3 = (i1 & 0x8) != 0; if (flag) { flag2 = (j1 == 0 && par5 == 2) || (j1 == 1 && par5 == 5) @@ -80,6 +80,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { flag2 = !flag2; } } + int tileMeta; if (flag3) { tileMeta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z); @@ -93,8 +94,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister register) { - for (final DoorType type : DoorType.values()) { + public void registerBlockIcons(IIconRegister register) { + for (DoorType type : DoorType.values()) { type.iconDoorLower = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".lower"); type.iconDoorUpper = ExtraTrees.proxy.getIcon(register, "door." + type.id + ".upper"); type.iconDoorLowerFlip = new IconFlipped(type.iconDoorLower, true, false); @@ -109,19 +110,20 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @Override @SideOnly(Side.CLIENT) - public int colorMultiplier(final IBlockAccess blockAccess, final int x, final int y, final int z) { - final int i1 = getFullMetadata(blockAccess, x, y, z); + public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { + int i1 = getFullMetadata(blockAccess, x, y, z); if ((i1 & 0x8) != 0) { - final int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z); + int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y - 1, z); return WoodManager.getPlankType(meta & 0xFF).getColour(); } - final int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y, z); + + int meta = TileEntityMetadata.getTileMetadata(blockAccess, x, y, z); return WoodManager.getPlankType(meta & 0xFF).getColour(); } - public int getFullMetadata(final IBlockAccess blockAccess, final int x, final int y, final int pzr4) { - final int l = blockAccess.getBlockMetadata(x, y, pzr4); - final boolean flag = (l & 0x8) != 0x0; + public int getFullMetadata(IBlockAccess blockAccess, int x, int y, int pzr4) { + int l = blockAccess.getBlockMetadata(x, y, pzr4); + boolean flag = (l & 0x8) != 0x0; int i1; int j1; if (flag) { @@ -131,65 +133,66 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { i1 = l; j1 = blockAccess.getBlockMetadata(x, y + 1, pzr4); } - final boolean flag2 = (j1 & 0x1) != 0x0; + + boolean flag2 = (j1 & 0x1) != 0x0; return (i1 & 0x7) | (flag ? 8 : 0) | (flag2 ? 16 : 0); } @Override @SideOnly(Side.CLIENT) - public void onBlockHarvested(final World world, final int x, final int y, final int z, final int par5, final EntityPlayer player) { - if (player.capabilities.isCreativeMode && (par5 & 0x8) != 0x0 && world.getBlock(x, y - 1, z) == this) { + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if (player.capabilities.isCreativeMode && (meta & 0x8) != 0x0 && world.getBlock(x, y - 1, z) == this) { world.setBlockToAir(x, y - 1, z); } } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { int yCoord = y; - if ((blockMeta & 0x08) != 0) { + if ((meta & 0x08) != 0) { yCoord -= 1; } - return BlockMetadata.getBlockDropped(this, world, x, yCoord, z, blockMeta); + return BlockMetadata.getBlockDropped(this, world, x, yCoord, z, meta); } @Override // TODO fix deprecated code - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World world, final int k) { + public TileEntity createNewTileEntity(World world, int k) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World world, final int x, final int y, final int z, final int eventId, final int eventType) { + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { super.onBlockEventReceived(world, x, y, z, eventId, eventType); - final TileEntity tileentity = world.getTileEntity(x, y, z); + TileEntity tileentity = world.getTileEntity(x, y, z); return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack stack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack stack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(stack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); - final String typeName = getDoorType(meta).getName(); - final String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); + String typeName = getDoorType(meta).getName(); + String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); if (typeName.equals("")) { return Binnie.Language.localise(ExtraTrees.instance, "block.door.name", woodName); } @@ -197,61 +200,61 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { // ignored } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { dropBlockAsItem(world, x, y, z, itemStack); } @Override - public void getSubBlocks(final Item item, final CreativeTabs tab, final List itemList) { - for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { + public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { + for (IPlankType type : PlankType.ExtraTreePlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } - for (final IPlankType type : PlankType.ForestryPlanks.values()) { + for (IPlankType type : PlankType.ForestryPlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } - for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { + for (IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } } - for (final IPlankType type : PlankType.VanillaPlanks.values()) { + for (IPlankType type : PlankType.VanillaPlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override - public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int par6) { + public void breakBlock(World world, int x, int y, int z, Block block, int par6) { super.breakBlock(world, x, y, z, block, par6); world.removeTileEntity(x, y, z); } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index fe4ad558..4857256d 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -1,93 +1,86 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.MovingObjectPosition; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.block.BlockMetadata; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.client.renderer.texture.IIconRegister; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.block.Block; -import binnie.core.block.TileEntityMetadata; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import forestry.api.core.Tabs; -import binnie.core.block.IBlockMetadata; +import net.minecraft.block.Block; import net.minecraft.block.BlockLog; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockETLog extends BlockLog implements IBlockMetadata -{ +import java.util.ArrayList; +import java.util.List; + +public class BlockETLog extends BlockLog implements IBlockMetadata { public BlockETLog() { - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("log"); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("log"); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < ILogType.ExtraTreeLog.values().length; ++i) { - itemList.add(TileEntityMetadata.getItemStack(this, i)); + list.add(TileEntityMetadata.getItemStack(this, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z)); + return getIcon(side, tile.getTileMetadata(), world.getBlockMetadata(x, y, z)); } return super.getIcon(world, x, y, z, side); } - public IIcon getIcon(final int side, final int tileMeta, final int blockMeta) { - final int oriented = blockMeta & 0xC; - final ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta]; + public IIcon getIcon(int side, int tileMeta, int blockMeta) { + int oriented = blockMeta & 0xC; + ILogType.ExtraTreeLog log = ILogType.ExtraTreeLog.values()[tileMeta]; switch (oriented) { - case 4: { - if (side > 3) { - return log.getTrunk(); - } - return log.getBark(); - } - case 8: { - if (side == 2 || side == 3) { - return log.getTrunk(); - } - return log.getBark(); - } - default: { - if (side < 2) { - return log.getTrunk(); - } - return log.getBark(); + case 4: + if (side > 3) { + return log.getTrunk(); + } + return log.getBark(); + + case 8: + if (side == 2 || side == 3) { + return log.getTrunk(); + } + return log.getBark(); } + if (side < 2) { + return log.getTrunk(); } + return log.getBark(); } @Override - public IIcon getIcon(final int side, final int tileMeta) { - return this.getIcon(side, tileMeta, 0); + public IIcon getIcon(int side, int tileMeta) { + return getIcon(side, tileMeta, 0); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister register) { + public void registerBlockIcons(IIconRegister register) { ILogType.ExtraTreeLog.registerIcons(register); } @@ -97,113 +90,112 @@ public class BlockETLog extends BlockLog implements IBlockMetadata } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World var1, int i) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { } @Override - public boolean canSustainLeaves(final IBlockAccess world, final int x, final int y, final int z) { + public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int onBlockPlaced(final World world, final int x, final int y, final int z, final int side, final float par6, final float par7, final float par8, final int meta) { + public int onBlockPlaced(World world, int x, int y, int z, int side, float par6, float par7, float par8, int meta) { byte b0 = 0; switch (side) { - case 0: - case 1: { - b0 = 0; - break; - } - case 2: - case 3: { - b0 = 8; - break; - } - case 4: - case 5: { - b0 = 4; - break; - } + case 0: + case 1: + b0 = 0; + break; + + case 2: + case 3: + b0 = 8; + break; + + case 4: + case 5: + b0 = 4; + break; } return b0; } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index 558863d2..5018fe16 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -1,153 +1,150 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.client.renderer.texture.IIconRegister; +import binnie.Binnie; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import java.util.List; -import binnie.extratrees.ExtraTrees; -import binnie.Binnie; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; -import binnie.core.block.BlockMetadata; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import net.minecraft.world.World; import forestry.api.core.Tabs; -import binnie.core.block.IBlockMetadata; +import net.minecraft.block.Block; import net.minecraft.block.BlockWood; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockETPlanks extends BlockWood implements IBlockMetadata -{ +import java.util.ArrayList; +import java.util.List; + +public class BlockETPlanks extends BlockWood implements IBlockMetadata { public BlockETPlanks() { - this.setBlockName("planks"); - this.setCreativeTab(Tabs.tabArboriculture); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setBlockName("planks"); + setCreativeTab(Tabs.tabArboriculture); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World var1, int i) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) { - itemList.add(TileEntityMetadata.getItemStack(this, i)); + list.add(TileEntityMetadata.getItemStack(this, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata()); + return getIcon(side, tile.getTileMetadata()); } return super.getIcon(world, x, y, z, side); } @Override - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(int side, int meta) { return PlankType.ExtraTreePlanks.values()[meta].getIcon(); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister register) { - for (final PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) { + public void registerBlockIcons(IIconRegister register) { + for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) { plank.loadIcon(register); } } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index ee5f39b1..d2778194 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -1,131 +1,128 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.MovingObjectPosition; +import binnie.Binnie; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import java.util.List; -import binnie.Binnie; -import net.minecraftforge.common.util.ForgeDirection; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; -import binnie.core.block.BlockMetadata; -import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import net.minecraft.world.World; import forestry.api.core.Tabs; -import binnie.core.block.IBlockMetadata; +import net.minecraft.block.Block; import net.minecraft.block.BlockWoodSlab; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata -{ - public BlockETSlab(final boolean par2) { - super(par2); - this.setCreativeTab(Tabs.tabArboriculture); - this.setHardness(2.0f).setResistance(5.0f).setStepSound(Block.soundTypeWood); - if (!this.field_150004_a) { - this.useNeighborBrightness = true; +import java.util.ArrayList; +import java.util.List; + +public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { + public BlockETSlab(boolean isDouble) { + super(isDouble); + setCreativeTab(Tabs.tabArboriculture); + setHardness(2.0f).setResistance(5.0f).setStepSound(Block.soundTypeWood); + if (!field_150004_a) { + useNeighborBrightness = true; } - this.setLightOpacity(0); - this.setBlockName("slabs"); + + setLightOpacity(0); + setBlockName("slabs"); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { - final ArrayList drops = new ArrayList(); + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { + ArrayList drops = new ArrayList(); drops.addAll(BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); - if (this.field_150004_a) { + if (field_150004_a) { drops.addAll(BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); } return drops; } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - if (this.field_150004_a) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + if (field_150004_a) { return; } for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) { - itemList.add(TileEntityMetadata.getItemStack(this, i)); + list.add(TileEntityMetadata.getItemStack(this, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata()); + return getIcon(side, tile.getTileMetadata()); } return super.getIcon(world, x, y, z, side); } @Override - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(int side, int meta) { return PlankType.ExtraTreePlanks.values()[meta].getIcon(); } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override @@ -134,27 +131,27 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index 1f2e9f25..69f903ce 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -1,145 +1,141 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.Binnie; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.block.BlockMetadata; -import java.util.ArrayList; -import net.minecraft.world.World; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.item.ItemStack; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import forestry.api.core.Tabs; import net.minecraft.block.Block; -import binnie.extratrees.ExtraTrees; -import binnie.core.block.IBlockMetadata; import net.minecraft.block.BlockStairs; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; + +public class BlockETStairs extends BlockStairs implements IBlockMetadata { + public BlockETStairs(Block par2Block) { + super(par2Block, 0); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("stairs"); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); + useNeighborBrightness = true; + } -public class BlockETStairs extends BlockStairs implements IBlockMetadata -{ @Override public int getRenderType() { return ExtraTrees.stairsID; } - public BlockETStairs(final Block par2Block) { - super(par2Block, 0); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("stairs"); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); - this.useNeighborBrightness = true; - } - @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for (int i = 0; i < PlankType.ExtraTreePlanks.values().length; ++i) { - itemList.add(new ItemStack(this, 1, i)); + list.add(new ItemStack(this, 1, i)); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata()); + return getIcon(side, tile.getTileMetadata()); } return super.getIcon(world, x, y, z, side); } @Override - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(int side, int meta) { return WoodManager.getPlankType(meta + 32).getIcon(); } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } } diff --git a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java index 20ef798f..657d5c5e 100644 --- a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.extratrees.ExtraTrees; -import net.minecraft.world.IBlockAccess; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; -public class BranchBlockRenderer implements ISimpleBlockRenderingHandler -{ +public class BranchBlockRenderer implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block par1Block, final int modelId, final RenderBlocks renderer) { - renderer.renderStandardBlock(par1Block, par2, par3, par4); + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + renderer.renderStandardBlock(block, x, y, z); return true; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return false; } diff --git a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java index 8b088d44..26324858 100644 --- a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java @@ -1,82 +1,77 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.extratrees.ExtraTrees; -import net.minecraft.util.IIcon; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; -public class DoorBlockRenderer implements ISimpleBlockRenderingHandler -{ +public class DoorBlockRenderer implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + // ignored } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block par1Block, final int modelId, final RenderBlocks renderer) { - final int c = par1Block.colorMultiplier(renderer.blockAccess, par2, par3, par4); - final float c2 = (c >> 16 & 0xFF) / 255.0f; - final float c3 = (c >> 8 & 0xFF) / 255.0f; - final float c4 = (c & 0xFF) / 255.0f; - final Tessellator tessellator = Tessellator.instance; - final int l = renderer.blockAccess.getBlockMetadata(par2, par3, par4); + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + int c = block.colorMultiplier(renderer.blockAccess, x, y, z); + float c2 = (c >> 16 & 0xFF) / 255.0f; + float c3 = (c >> 8 & 0xFF) / 255.0f; + float c4 = (c & 0xFF) / 255.0f; + Tessellator tessellator = Tessellator.instance; + int l = renderer.blockAccess.getBlockMetadata(x, y, z); if ((l & 0x8) != 0x0) { - if (renderer.blockAccess.getBlock(par2, par3 - 1, par4) != par1Block) { + if (renderer.blockAccess.getBlock(x, y - 1, z) != block) { return false; } - } - else if (renderer.blockAccess.getBlock(par2, par3 + 1, par4) != par1Block) { + } else if (renderer.blockAccess.getBlock(x, y + 1, z) != block) { return false; } - boolean flag = false; - final float f = 0.5f; - final float f2 = 1.0f; - final float f3 = 0.8f; - final float f4 = 0.6f; - final int i1 = par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4); - tessellator.setBrightness((renderer.renderMinY > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 - 1, par4)); + + float f = 0.5f; + float f2 = 1.0f; + float f3 = 0.8f; + float f4 = 0.6f; + + int i1 = block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z); + tessellator.setBrightness((renderer.renderMinY > 0.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x, y - 1, z)); tessellator.setColorOpaque_F(f * c2, f * c3, f * c4); - renderer.renderFaceYNeg(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 0)); - flag = true; - tessellator.setBrightness((renderer.renderMaxY < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3 + 1, par4)); + renderer.renderFaceYNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 0)); + + tessellator.setBrightness((renderer.renderMaxY < 1.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x, y + 1, z)); tessellator.setColorOpaque_F(f2 * c2, f2 * c3, f2 * c4); - renderer.renderFaceYPos(par1Block, par2, par3, par4, renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 1)); - flag = true; - tessellator.setBrightness((renderer.renderMinZ > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 - 1)); + renderer.renderFaceYPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 1)); + + tessellator.setBrightness((renderer.renderMinZ > 0.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z - 1)); tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); - IIcon icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 2); - renderer.renderFaceZNeg(par1Block, par2, par3, par4, icon); - flag = true; + IIcon icon = renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 2); + renderer.renderFaceZNeg(block, x, y, z, icon); + renderer.flipTexture = false; - tessellator.setBrightness((renderer.renderMaxZ < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4 + 1)); + tessellator.setBrightness((renderer.renderMaxZ < 1.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z + 1)); tessellator.setColorOpaque_F(f3 * c2, f3 * c3, f3 * c4); - icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 3); - renderer.renderFaceZPos(par1Block, par2, par3, par4, icon); - flag = true; + icon = renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 3); + renderer.renderFaceZPos(block, x, y, z, icon); + renderer.flipTexture = false; - tessellator.setBrightness((renderer.renderMinX > 0.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 - 1, par3, par4)); + tessellator.setBrightness((renderer.renderMinX > 0.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x - 1, y, z)); tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); - icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 4); - renderer.renderFaceXNeg(par1Block, par2, par3, par4, icon); - flag = true; + icon = renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 4); + renderer.renderFaceXNeg(block, x, y, z, icon); + renderer.flipTexture = false; - tessellator.setBrightness((renderer.renderMaxX < 1.0) ? i1 : par1Block.getMixedBrightnessForBlock(renderer.blockAccess, par2 + 1, par3, par4)); + tessellator.setBrightness((renderer.renderMaxX < 1.0) ? i1 : block.getMixedBrightnessForBlock(renderer.blockAccess, x + 1, y, z)); tessellator.setColorOpaque_F(f4 * c2, f4 * c3, f4 * c4); - icon = renderer.getBlockIcon(par1Block, renderer.blockAccess, par2, par3, par4, 5); - renderer.renderFaceXPos(par1Block, par2, par3, par4, icon); - flag = true; + icon = renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 5); + renderer.renderFaceXPos(block, x, y, z, icon); renderer.flipTexture = false; - return flag; + return true; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return false; } diff --git a/src/main/java/binnie/extratrees/block/DoorType.java b/src/main/java/binnie/extratrees/block/DoorType.java index 1a7bb705..7ac64226 100644 --- a/src/main/java/binnie/extratrees/block/DoorType.java +++ b/src/main/java/binnie/extratrees/block/DoorType.java @@ -1,31 +1,26 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.extratrees.ExtraTrees; import net.minecraft.util.IIcon; -public enum DoorType -{ +public enum DoorType { Standard("standard"), Solid("solid"), Double("double"), Full("full"); - String id; - IIcon iconDoorLower; - IIcon iconDoorUpper; - IIcon iconDoorLowerFlip; - IIcon iconDoorUpperFlip; - IIcon iconItem; + protected String id; + protected IIcon iconDoorLower; + protected IIcon iconDoorUpper; + protected IIcon iconDoorLowerFlip; + protected IIcon iconDoorUpperFlip; + protected IIcon iconItem; - private DoorType(final String iconName) { - this.id = iconName; + DoorType(String iconName) { + id = iconName; } public String getName() { - return ExtraTrees.proxy.localise("block.door.type." + this.id); + return ExtraTrees.proxy.localise("block.door.type." + id); } } diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index dce380ad..b51c6d5f 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,19 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; +import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; -import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.BinnieCore; -import net.minecraft.util.IIcon; import forestry.api.core.IIconProvider; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; -public enum FruitPod implements IIconProvider -{ +public enum FruitPod implements IIconProvider { Cocoa, Banana, Coconut, @@ -21,33 +16,37 @@ public enum FruitPod implements IIconProvider RedBanana, Papayimar; - short[] textures; - IIcon[] icons; + protected short[] textures; + protected IIcon[] icons; - private FruitPod() { - this.textures = new short[] { BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID() }; - this.icons = new IIcon[3]; + FruitPod() { + textures = new short[]{ + BinnieCore.proxy.getUniqueTextureUID(), + BinnieCore.proxy.getUniqueTextureUID(), + BinnieCore.proxy.getUniqueTextureUID(), + }; + icons = new IIcon[3]; } public short[] getTextures() { - return this.textures; + return textures; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final short texUID) { - final int index = this.textures[0] - texUID; + public IIcon getIcon(short texUID) { + int index = textures[0] - texUID; if (index >= 0 && index < 3) { - return this.icons[index]; + return icons[index]; } return null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.icons[0] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".0"); - this.icons[1] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".1"); - this.icons[2] = ExtraTrees.proxy.getIcon(register, "pods/" + this.toString().toLowerCase() + ".2"); + public void registerIcons(IIconRegister register) { + icons[0] = ExtraTrees.proxy.getIcon(register, "pods/" + toString().toLowerCase() + ".0"); + icons[1] = ExtraTrees.proxy.getIcon(register, "pods/" + toString().toLowerCase() + ".1"); + icons[2] = ExtraTrees.proxy.getIcon(register, "pods/" + toString().toLowerCase() + ".2"); } } diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/src/main/java/binnie/extratrees/block/GateItemRenderer.java index 4a2c60f0..38033aff 100644 --- a/src/main/java/binnie/extratrees/block/GateItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/GateItemRenderer.java @@ -1,24 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.IIcon; import net.minecraft.block.Block; -import org.lwjgl.opengl.GL11; -import net.minecraft.item.ItemBlock; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; -public class GateItemRenderer implements IItemRenderer -{ - private void renderStairBlock(final RenderBlocks renderBlocks, final ItemStack item, final float f, final float g, final float h) { - final Tessellator tessellator = Tessellator.instance; - final Block block = ((ItemBlock) item.getItem()).field_150939_a; - final IIcon textureIndex = WoodManager.getPlankType(item.getItemDamage()).getIcon(); +public class GateItemRenderer implements IItemRenderer { + private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { + Tessellator tessellator = Tessellator.instance; + Block block = ((ItemBlock) item.getItem()).field_150939_a; + IIcon textureIndex = WoodManager.getPlankType(item.getItemDamage()).getIcon(); for (int k = 0; k < 3; ++k) { float f2 = 0.0625f; if (k == 0) { @@ -61,43 +56,36 @@ public class GateItemRenderer implements IItemRenderer } @Override - public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { switch (type) { - case ENTITY: { - return true; - } - case EQUIPPED: { - return true; - } - case INVENTORY: { - return true; - } - default: { - return false; - } + case ENTITY: + case EQUIPPED: + case INVENTORY: + return true; } + return false; } @Override - public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { return true; } @Override - public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: { - this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - } - case EQUIPPED: { - this.renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); - break; - } - case INVENTORY: { - this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - } + case ENTITY: + renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + + case EQUIPPED: + renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); + break; + + case INVENTORY: + renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + } } } diff --git a/src/main/java/binnie/extratrees/block/IFenceProvider.java b/src/main/java/binnie/extratrees/block/IFenceProvider.java index 600043be..568737b0 100644 --- a/src/main/java/binnie/extratrees/block/IFenceProvider.java +++ b/src/main/java/binnie/extratrees/block/IFenceProvider.java @@ -1,12 +1,7 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import net.minecraft.item.ItemStack; -public interface IFenceProvider -{ +public interface IFenceProvider { ItemStack getFence(); } diff --git a/src/main/java/binnie/extratrees/block/ILogType.java b/src/main/java/binnie/extratrees/block/ILogType.java index 6b9e5850..1c55eb56 100644 --- a/src/main/java/binnie/extratrees/block/ILogType.java +++ b/src/main/java/binnie/extratrees/block/ILogType.java @@ -1,40 +1,27 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.init.Blocks; -import net.minecraft.client.renderer.texture.IIconRegister; - import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; - +import binnie.extratrees.api.IDesignMaterial; import cpw.mods.fml.common.registry.GameRegistry; - -import net.minecraftforge.common.util.ForgeDirection; - import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.worldgen.BlockTypeLog; - -import net.minecraft.util.IIcon; - -import binnie.extratrees.api.IDesignMaterial; - +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public interface ILogType -{ - void placeBlock(final World p0, final int p1, final int p2, final int p3); +public interface ILogType { + void placeBlock(World p0, int p1, int p2, int p3); ItemStack getItemStack(); int getColour(); - public enum ExtraTreeLog implements ILogType - { + enum ExtraTreeLog implements ILogType { Apple("Apple", 8092283, PlankType.ExtraTreePlanks.Apple), Fig("Fig", 8418135, PlankType.ExtraTreePlanks.Fig), Butternut("Butternut", 12037536, PlankType.ExtraTreePlanks.Butternut), @@ -76,75 +63,74 @@ public interface ILogType Cinnamon("Cinnamon", 8804412, PlankType.VanillaPlanks.JUNGLE), PinkIvory("Pink Ivory", 8349012, PlankType.ExtraTreePlanks.PinkIvory); - String name; - int color; - IDesignMaterial plank; - IIcon trunk; - IIcon bark; + protected String name; + protected int color; + protected IDesignMaterial plank; + protected IIcon trunk; + protected IIcon bark; - private ExtraTreeLog(final String name, final int color) { - this.plank = null; + ExtraTreeLog(String name, int color) { + plank = null; this.name = name; this.color = color; } - private ExtraTreeLog(final String name, final int color, final IDesignMaterial plank) { + ExtraTreeLog(String name, int color, IDesignMaterial plank) { this.plank = null; this.name = name; this.color = color; this.plank = plank; } - public String getName() { - return this.name; - } - - public void addRecipe() { - if (this.plank == null) { - return; - } - final ItemStack log = this.getItemStack(); - final ItemStack result = this.plank.getStack(); - result.stackSize = 4; - GameRegistry.addShapelessRecipe(result, new Object[] { log }); - } - - @Override - public void placeBlock(final World world, final int x, final int y, final int z) { - world.setBlock(x, y, z, ExtraTrees.blockLog, 0, 2); - if (world.getTileEntity(x, y, z) != null) { - ((TileEntityMetadata) world.getTileEntity(x, y, z)).setTileMetadata(this.ordinal(), false); - } - } - - public IIcon getTrunk() { - return this.trunk; - } - - public IIcon getBark() { - return this.bark; - } - - public static void registerIcons(final IIconRegister register) { - for (final ExtraTreeLog log : values()) { + public static void registerIcons(IIconRegister register) { + for (ExtraTreeLog log : values()) { log.trunk = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Trunk"); log.bark = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Bark"); } } + public String getName() { + return name; + } + + public void addRecipe() { + if (plank == null) { + return; + } + ItemStack log = getItemStack(); + ItemStack result = plank.getStack(); + result.stackSize = 4; + GameRegistry.addShapelessRecipe(result, log); + } + + @Override + public void placeBlock(World world, int x, int y, int z) { + world.setBlock(x, y, z, ExtraTrees.blockLog, 0, 2); + if (world.getTileEntity(x, y, z) != null) { + ((TileEntityMetadata) world.getTileEntity(x, y, z)).setTileMetadata(ordinal(), false); + } + } + + public IIcon getTrunk() { + return trunk; + } + + public IIcon getBark() { + return bark; + } + @Override public ItemStack getItemStack() { - return TileEntityMetadata.getItemStack(ExtraTrees.blockLog, this.ordinal()).copy(); + return TileEntityMetadata.getItemStack(ExtraTrees.blockLog, ordinal()).copy(); } @Override public int getColour() { - return this.color; + return color; } } - public enum ForestryLog implements ILogType - { + enum ForestryLog implements ILogType { LARCH(1, 0, 6376529), TEAK(1, 1, 3486249), ACACIA(1, 2, 7565906), @@ -170,19 +156,19 @@ public interface ILogType MAPLE(6, 2, 9078657), CITRUS(6, 3, 5983033); - int block; - int metadata; - int colour; + protected int block; + protected int metadata; + protected int colour; - private ForestryLog(final int blockOffset, final int meta, final int colour) { - this.block = blockOffset; - this.metadata = meta; + ForestryLog(int blockOffset, int meta, int colour) { + block = blockOffset; + metadata = meta; this.colour = colour; } @Override - public void placeBlock(final World world, final int x, final int y, final int z) { - BlockTypeLog logBlock = new BlockTypeLog(TreeManager.woodItemAccess.getLog(EnumWoodType.valueOf(this.name().toUpperCase()), false)); + public void placeBlock(World world, int x, int y, int z) { + BlockTypeLog logBlock = new BlockTypeLog(TreeManager.woodItemAccess.getLog(EnumWoodType.valueOf(name().toUpperCase()), false)); logBlock.setDirection(ForgeDirection.UP); logBlock.setBlock(world, x, y, z); @@ -190,43 +176,42 @@ public interface ILogType @Override public ItemStack getItemStack() { - return TreeManager.woodItemAccess.getLog(EnumWoodType.valueOf(this.name().toUpperCase()), false); + return TreeManager.woodItemAccess.getLog(EnumWoodType.valueOf(name().toUpperCase()), false); // return new ItemStack(Mods.Forestry.item("logs"), 1, // this.metadata); } @Override public int getColour() { - return this.colour; + return colour; } } - public enum VanillaLog implements ILogType - { + enum VanillaLog implements ILogType { Oak(6376752), Spruce(2759179), Birch(6376752), Jungle(5456154); - int colour; + protected int colour; - private VanillaLog(final int colour) { + VanillaLog(int colour) { this.colour = colour; } @Override - public void placeBlock(final World world, final int x, final int y, final int z) { - world.setBlock(x, y, z, Blocks.log, this.ordinal(), 2); + public void placeBlock(World world, int x, int y, int z) { + world.setBlock(x, y, z, Blocks.log, ordinal(), 2); } @Override public ItemStack getItemStack() { - return new ItemStack(Blocks.log, 1, this.ordinal()); + return new ItemStack(Blocks.log, 1, ordinal()); } @Override public int getColour() { - return this.colour; + return colour; } } } diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index e8ac682f..de9877b3 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.IIcon; import binnie.extratrees.api.IDesignMaterial; +import net.minecraft.util.IIcon; -public interface IPlankType extends IDesignMaterial -{ +public interface IPlankType extends IDesignMaterial { IIcon getIcon(); String getDescription(); diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index fc1bd64c..7b12fc61 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -1,101 +1,97 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.IIcon; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.IBlockAccess; +import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.block.Block; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.ExtraTrees; +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.core.block.ItemMetadata; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class ItemETDoor extends ItemMetadata { + public ItemETDoor(Block block) { + super(block); + maxStackSize = 1; + setCreativeTab(CreativeTabs.tabRedstone); + } + + public static void placeDoorBlock(World world, int x, int y, int z, int meta, Block block, ItemStack item, EntityPlayer player) { + byte b0 = 0; + byte b2 = 0; + if (meta == 0) { + b2 = 1; + } + if (meta == 1) { + b0 = -1; + } + if (meta == 2) { + b2 = -1; + } + if (meta == 3) { + b0 = 1; + } + + int i1 = (world.isBlockNormalCubeDefault(x - b0, y, z - b2, false) ? 1 : 0) + (world.isBlockNormalCubeDefault(x - b0, y + 1, z - b2, false) ? 1 : 0); + int j1 = (world.isBlockNormalCubeDefault(x + b0, y, z + b2, false) ? 1 : 0) + (world.isBlockNormalCubeDefault(x + b0, y + 1, z + b2, false) ? 1 : 0); + boolean flag = world.getBlock(x - b0, y, z - b2) == block || world.getBlock(x - b0, y + 1, z - b2) == block; + boolean flag2 = world.getBlock(x + b0, y, z + b2) == block || world.getBlock(x + b0, y + 1, z + b2) == block; + boolean flag3 = false; + if (flag && !flag2) { + flag3 = true; + } else if (j1 > i1) { + flag3 = true; + } + + world.setBlock(x, y, z, block, meta, 2); + world.setBlock(x, y + 1, z, block, 0x8 | (flag3 ? 1 : 0), 2); + if (world.getBlock(x, y, z) == block) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + if (tile != null) { + tile.setTileMetadata(TileEntityMetadata.getItemDamage(item), false); + } + block.onBlockPlacedBy(world, x, y, z, player, item); + block.onPostBlockPlaced(world, x, y, z, meta); + } + + world.notifyBlocksOfNeighborChange(x, y, z, block); + world.notifyBlocksOfNeighborChange(x, y + 1, z, block); + } -public class ItemETDoor extends ItemMetadata -{ @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - for (final DoorType type : DoorType.values()) { + public void registerIcons(IIconRegister register) { + for (DoorType type : DoorType.values()) { type.iconItem = ExtraTrees.proxy.getIcon(register, "door." + type.id); } } - public ItemETDoor(final Block block) { - super(block); - this.maxStackSize = 1; - this.setCreativeTab(CreativeTabs.tabRedstone); - } - @Override - public boolean onItemUse(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World, final int par4, int par5, final int par6, final int par7, final float par8, final float par9, final float par10) { - if (par7 != 1) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int meta, float hitX, float hitY, float hitZ) { + if (meta != 1) { return false; } - ++par5; - final Block block = ExtraTrees.blockDoor; - if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) || !par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) { + + y++; + Block block = ExtraTrees.blockDoor; + if (!player.canPlayerEdit(x, y, z, meta, stack) || !player.canPlayerEdit(x, y + 1, z, meta, stack)) { return false; } - if (!block.canPlaceBlockAt(par3World, par4, par5, par6)) { + if (!block.canPlaceBlockAt(world, x, y, z)) { return false; } - final int i1 = MathHelper.floor_double((par2EntityPlayer.rotationYaw + 180.0f) * 4.0f / 360.0f - 0.5) & 0x3; - placeDoorBlock(par3World, par4, par5, par6, i1, block, par1ItemStack, par2EntityPlayer); - --par1ItemStack.stackSize; + + int newMeta = MathHelper.floor_double((player.rotationYaw + 180.0f) * 4.0f / 360.0f - 0.5) & 0x3; + placeDoorBlock(world, x, y, z, newMeta, block, stack, player); + stack.stackSize--; return true; } - public static void placeDoorBlock(final World par0World, final int par1, final int par2, final int par3, final int par4, final Block par5Block, final ItemStack item, final EntityPlayer player) { - byte b0 = 0; - byte b2 = 0; - if (par4 == 0) { - b2 = 1; - } - if (par4 == 1) { - b0 = -1; - } - if (par4 == 2) { - b2 = -1; - } - if (par4 == 3) { - b0 = 1; - } - - final int i1 = (par0World.isBlockNormalCubeDefault(par1 - b0, par2, par3 - b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 - b0, par2 + 1, par3 - b2, false) ? 1 : 0); - final int j1 = (par0World.isBlockNormalCubeDefault(par1 + b0, par2, par3 + b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 + b0, par2 + 1, par3 + b2, false) ? 1 : 0); - final boolean flag = par0World.getBlock(par1 - b0, par2, par3 - b2) == par5Block || par0World.getBlock(par1 - b0, par2 + 1, par3 - b2) == par5Block; - final boolean flag2 = par0World.getBlock(par1 + b0, par2, par3 + b2) == par5Block || par0World.getBlock(par1 + b0, par2 + 1, par3 + b2) == par5Block; - boolean flag3 = false; - if (flag && !flag2) { - flag3 = true; - } - else if (j1 > i1) { - flag3 = true; - } - par0World.setBlock(par1, par2, par3, par5Block, par4, 2); - par0World.setBlock(par1, par2 + 1, par3, par5Block, 0x8 | (flag3 ? 1 : 0), 2); - if (par0World.getBlock(par1, par2, par3) == par5Block) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(par0World, par1, par2, par3); - if (tile != null) { - tile.setTileMetadata(TileEntityMetadata.getItemDamage(item), false); - } - par5Block.onBlockPlacedBy(par0World, par1, par2, par3, player, item); - par5Block.onPostBlockPlaced(par0World, par1, par2, par3, par4); - } - par0World.notifyBlocksOfNeighborChange(par1, par2, par3, par5Block); - par0World.notifyBlocksOfNeighborChange(par1, par2 + 1, par3, par5Block); - } - @Override @SideOnly(Side.CLIENT) public int getSpriteNumber() { @@ -104,14 +100,14 @@ public class ItemETDoor extends ItemMetadata @SideOnly(Side.CLIENT) @Override - public IIcon getIconFromDamage(final int damage) { - final DoorType type = BlockETDoor.getDoorType(damage); + public IIcon getIconFromDamage(int damage) { + DoorType type = BlockETDoor.getDoorType(damage); return type.iconItem; } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { - return WoodManager.getPlankType((par1ItemStack == null) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); + public int getColorFromItemStack(ItemStack stack, int meta) { + return WoodManager.getPlankType((stack == null) ? 0 : (stack.getItemDamage() & 0xFF)).getColour(); } } diff --git a/src/main/java/binnie/extratrees/block/ItemETSlab.java b/src/main/java/binnie/extratrees/block/ItemETSlab.java index 69aff134..fef0fe06 100644 --- a/src/main/java/binnie/extratrees/block/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/ItemETSlab.java @@ -1,96 +1,86 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; +import binnie.core.block.ItemMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.world.IBlockAccess; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.world.World; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import binnie.extratrees.ExtraTrees; -import net.minecraft.block.Block; -import binnie.core.block.ItemMetadata; +import net.minecraft.world.World; -public class ItemETSlab extends ItemMetadata -{ - private final boolean isFullBlock; - private final BlockETSlab theHalfSlab; - private final BlockETSlab doubleSlab; +public class ItemETSlab extends ItemMetadata { + private boolean isFullBlock; + private BlockETSlab theHalfSlab; + private BlockETSlab doubleSlab; - public ItemETSlab(final Block block) { + public ItemETSlab(Block block) { super(block); - this.theHalfSlab = (BlockETSlab) ExtraTrees.blockSlab; - this.doubleSlab = (BlockETSlab) ExtraTrees.blockDoubleSlab; - this.isFullBlock = (block != this.theHalfSlab); - this.setMaxDamage(0); - this.setHasSubtypes(true); + theHalfSlab = (BlockETSlab) ExtraTrees.blockSlab; + doubleSlab = (BlockETSlab) ExtraTrees.blockDoubleSlab; + isFullBlock = (block != theHalfSlab); + setMaxDamage(0); + setHasSubtypes(true); } @Override @SideOnly(Side.CLIENT) - public boolean onItemUse(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World, final int par4, final int par5, final int par6, final int par7, final float par8, final float par9, final float par10) { - if (this.isFullBlock) { - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int meta, float hitX, float hitY, float hitZ) { + if (isFullBlock) { + return super.onItemUse(stack, player, world, x, y, z, meta, hitX, hitY, hitZ); } - if (par1ItemStack.stackSize == 0) { + if (stack.stackSize == 0 || !player.canPlayerEdit(x, y, z, meta, stack)) { return false; } - if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack)) { - return false; - } - final Block i1 = par3World.getBlock(par4, par5, par6); - final int j1 = par3World.getBlockMetadata(par4, par5, par6); - final int tileMeta = TileEntityMetadata.getTileMetadata(par3World, par4, par5, par6); - final int k1 = j1 & 0x7; - final boolean flag = (j1 & 0x8) != 0x0; - if (((par7 == 1 && !flag) || (par7 == 0 && flag)) && i1 == this.theHalfSlab && tileMeta == par1ItemStack.getItemDamage()) { - if (par3World.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlock(par4, par5, par6, this.doubleSlab, k1, 3)) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(par3World, par4, par5, par6); + + Block i1 = world.getBlock(x, y, z); + int j1 = world.getBlockMetadata(x, y, z); + int tileMeta = TileEntityMetadata.getTileMetadata(world, x, y, z); + int k1 = j1 & 0x7; + boolean flag = (j1 & 0x8) != 0x0; + + if (((meta == 1 && !flag) || (meta == 0 && flag)) && i1 == theHalfSlab && tileMeta == stack.getItemDamage()) { + if (world.checkNoEntityCollision(doubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z)) && world.setBlock(x, y, z, doubleSlab, k1, 3)) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { tile.setTileMetadata(tileMeta, true); } - --par1ItemStack.stackSize; + stack.stackSize--; } return true; } - return this.func_77888_a(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7) || super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + return func_77888_a(stack, player, world, x, y, z, meta) || super.onItemUse(stack, player, world, x, y, z, meta, hitX, hitY, hitZ); } - private boolean func_77888_a(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final World par3World, int par4, int par5, int par6, final int par7) { - if (par7 == 0) { - --par5; + private boolean func_77888_a(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { + if (side == 0) { + y--; + } else if (side == 1) { + y++; + } else if (side == 2) { + z--; + } else if (side == 3) { + z++; + } else if (side == 4) { + x--; + } else if (side == 5) { + x++; } - if (par7 == 1) { - ++par5; - } - if (par7 == 2) { - --par6; - } - if (par7 == 3) { - ++par6; - } - if (par7 == 4) { - --par4; - } - if (par7 == 5) { - ++par4; - } - final Block i1 = par3World.getBlock(par4, par5, par6); - final int j1 = par3World.getBlockMetadata(par4, par5, par6); - final int k1 = j1 & 0x7; - final int tileMeta = TileEntityMetadata.getTileMetadata(par3World, par4, par5, par6); - if (i1 == this.theHalfSlab && tileMeta == par1ItemStack.getItemDamage()) { - if (par3World.checkNoEntityCollision(this.doubleSlab.getCollisionBoundingBoxFromPool(par3World, par4, par5, par6)) && par3World.setBlock(par4, par5, par6, this.doubleSlab, k1, 3)) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(par3World, par4, par5, par6); + + Block i1 = world.getBlock(x, y, z); + int j1 = world.getBlockMetadata(x, y, z); + int k1 = j1 & 0x7; + int tileMeta = TileEntityMetadata.getTileMetadata(world, x, y, z); + + if (i1 == theHalfSlab && tileMeta == stack.getItemDamage()) { + if (world.checkNoEntityCollision(doubleSlab.getCollisionBoundingBoxFromPool(world, x, y, z)) && world.setBlock(x, y, z, doubleSlab, k1, 3)) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { tile.setTileMetadata(tileMeta, false); - par3World.markBlockForUpdate(par4, par5, par6); + world.markBlockForUpdate(x, y, z); } - --par1ItemStack.stackSize; + stack.stackSize--; } return true; } diff --git a/src/main/java/binnie/extratrees/block/ItemETStairs.java b/src/main/java/binnie/extratrees/block/ItemETStairs.java index 73c09e24..6abd68ee 100644 --- a/src/main/java/binnie/extratrees/block/ItemETStairs.java +++ b/src/main/java/binnie/extratrees/block/ItemETStairs.java @@ -1,39 +1,34 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.block.Block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; +import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ItemETStairs extends ItemBlock { + public ItemETStairs(Block block) { + super(block); + setCreativeTab(CreativeTabs.tabBlock); + setUnlocalizedName("stairs"); + } -public class ItemETStairs extends ItemBlock -{ @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(final int par1) { + public IIcon getIconFromDamage(int par1) { return PlankType.ExtraTreePlanks.values()[par1].getIcon(); } - public ItemETStairs(final Block block) { - super(block); - this.setCreativeTab(CreativeTabs.tabBlock); - this.setUnlocalizedName("stairs"); - } - @Override - public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, final World world, final int x, final int y, final int z, final int side, final float hitX, final float hitY, final float hitZ, final int metadata) { - final boolean done = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); - final TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + boolean done = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); if (tile != null) { tile.setTileMetadata(stack.getItemDamage(), false); } @@ -42,7 +37,7 @@ public class ItemETStairs extends ItemBlock @Override @SideOnly(Side.CLIENT) - public String getItemStackDisplayName(final ItemStack par1ItemStack) { - return ((IBlockMetadata) this.field_150939_a).getBlockName(par1ItemStack); + public String getItemStackDisplayName(ItemStack par1ItemStack) { + return ((IBlockMetadata) field_150939_a).getBlockName(par1ItemStack); } } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 79f7e762..4d10ce07 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -1,46 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; import binnie.core.Mods; -import forestry.api.recipes.RecipeManagers; -import binnie.core.liquid.ILiquidType; -import binnie.extratrees.item.ExtraTreeLiquid; -import binnie.extratrees.block.decor.FenceType; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraft.item.crafting.CraftingManager; +import binnie.core.block.ItemMetadata; +import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.block.decor.MultiFenceRecipeSolid; -import binnie.extratrees.block.decor.MultiFenceRecipeEmbedded; -import net.minecraftforge.oredict.RecipeSorter; -import binnie.extratrees.block.decor.MultiFenceRecipeSize; -import binnie.extratrees.block.decor.HedgeRenderer; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import binnie.core.liquid.ILiquidType; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.decor.BlockFence; +import binnie.extratrees.block.decor.BlockGate; +import binnie.extratrees.block.decor.BlockMultiFence; import binnie.extratrees.block.decor.FenceRenderer; +import binnie.extratrees.block.decor.FenceType; +import binnie.extratrees.block.decor.HedgeRenderer; +import binnie.extratrees.block.decor.MultiFenceRecipeEmbedded; +import binnie.extratrees.block.decor.MultiFenceRecipeSize; +import binnie.extratrees.block.decor.MultiFenceRecipeSolid; +import binnie.extratrees.item.ExtraTreeLiquid; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.event.FMLInterModComms; -import net.minecraft.item.ItemStack; -import net.minecraft.init.Items; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.client.IItemRenderer; -import binnie.core.block.ItemMetadataRenderer; -import net.minecraft.item.Item; -import binnie.core.BinnieCore; -import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; -import binnie.core.block.ItemMetadata; -import binnie.extratrees.block.decor.BlockMultiFence; -import binnie.extratrees.block.decor.BlockGate; -import binnie.extratrees.block.decor.BlockFence; -import binnie.extratrees.ExtraTrees; -import binnie.core.IInitializable; +import forestry.api.recipes.RecipeManagers; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; -public class ModuleBlocks implements IInitializable -{ +public class ModuleBlocks implements IInitializable { public static int hedgeRenderID; @Override @@ -67,13 +58,15 @@ public class ModuleBlocks implements IInitializable GameRegistry.registerBlock(ExtraTrees.blockStairs, ItemETStairs.class, "stairs"); BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStairs), new StairItemRenderer()); BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockGate), new GateItemRenderer()); - for (final ILogType plank : ILogType.ExtraTreeLog.values()) { + for (ILogType plank : ILogType.ExtraTreeLog.values()) { OreDictionary.registerOre("logWood", plank.getItemStack()); } + GameRegistry.addSmelting(ExtraTrees.blockLog, new ItemStack(Items.coal, 1, 1), 0.15f); - for (final IPlankType plank2 : PlankType.ExtraTreePlanks.values()) { + for (IPlankType plank2 : PlankType.ExtraTreePlanks.values()) { OreDictionary.registerOre("plankWood", plank2.getStack()); } + FMLInterModComms.sendMessage("Forestry", "add-fence-block", "ExtraTrees:fence"); FMLInterModComms.sendMessage("Forestry", "add-fence-block", "ExtraTrees:gate"); // FMLInterModComms.sendMessage("Forestry", "add-alveary-slab", @@ -100,49 +93,50 @@ public class ModuleBlocks implements IInitializable @Override public void postInit() { - for (final PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) { - final ItemStack planks = plank.getStack(); - final ItemStack slabs = TileEntityMetadata.getItemStack(ExtraTrees.blockSlab, plank.ordinal()); - final ItemStack stairs = TileEntityMetadata.getItemStack(ExtraTrees.blockStairs, plank.ordinal()); + for (PlankType.ExtraTreePlanks plank : PlankType.ExtraTreePlanks.values()) { + ItemStack planks = plank.getStack(); + ItemStack slabs = TileEntityMetadata.getItemStack(ExtraTrees.blockSlab, plank.ordinal()); + ItemStack stairs = TileEntityMetadata.getItemStack(ExtraTrees.blockStairs, plank.ordinal()); stairs.stackSize = 4; - GameRegistry.addRecipe(stairs.copy(), new Object[] { "# ", "## ", "###", '#', planks.copy() }); + GameRegistry.addRecipe(stairs.copy(), "# ", "## ", "###", '#', planks.copy()); slabs.stackSize = 6; - CraftingManager.getInstance().getRecipeList().add(0, new ShapedOreRecipe(slabs.copy(), new Object[] { "###", '#', planks.copy() })); + CraftingManager.getInstance().getRecipeList().add(0, new ShapedOreRecipe(slabs.copy(), "###", '#', planks.copy())); } + GameRegistry.addRecipe(new MultiFenceRecipeSize()); GameRegistry.addRecipe(new MultiFenceRecipeEmbedded()); GameRegistry.addRecipe(new MultiFenceRecipeSolid()); - for (final IPlankType plank2 : WoodManager.getAllPlankTypes()) { - final ItemStack planks2 = plank2.getStack(); - final ItemStack fenceNormal = WoodManager.getFence(plank2, new FenceType(0), 1); - final ItemStack gate = WoodManager.getGate(plank2); - final ItemStack doorStandard = WoodManager.getDoor(plank2, DoorType.Standard); - final ItemStack doorSolid = WoodManager.getDoor(plank2, DoorType.Solid); - final ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.Double); - final ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.Full); + for (IPlankType plank2 : WoodManager.getAllPlankTypes()) { + ItemStack planks2 = plank2.getStack(); + ItemStack fenceNormal = WoodManager.getFence(plank2, new FenceType(0), 1); + ItemStack gate = WoodManager.getGate(plank2); + ItemStack doorStandard = WoodManager.getDoor(plank2, DoorType.Standard); + ItemStack doorSolid = WoodManager.getDoor(plank2, DoorType.Solid); + ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.Double); + ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.Full); if (planks2 != null) { if (gate == null) { continue; } gate.stackSize = 1; - GameRegistry.addRecipe(gate.copy(), new Object[] { "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy() }); + GameRegistry.addRecipe(gate.copy(), "fpf", 'f', fenceNormal.copy(), 'p', planks2.copy()); fenceNormal.stackSize = 4; - GameRegistry.addRecipe(fenceNormal.copy(), new Object[] { "###", "# #", '#', planks2.copy() }); - GameRegistry.addRecipe(doorSolid.copy(), new Object[] { "###", "###", "###", '#', planks2.copy() }); - GameRegistry.addRecipe(doorStandard.copy(), new Object[] { "# #", "###", "###", '#', planks2.copy() }); - GameRegistry.addRecipe(doorSplit.copy(), new Object[] { "# #", "###", "# #", '#', planks2.copy() }); - GameRegistry.addRecipe(doorFull.copy(), new Object[] { "# #", "# #", "# #", '#', planks2.copy() }); + GameRegistry.addRecipe(fenceNormal.copy(), "###", "# #", '#', planks2.copy()); + GameRegistry.addRecipe(doorSolid.copy(), "###", "###", "###", '#', planks2.copy()); + GameRegistry.addRecipe(doorStandard.copy(), "# #", "###", "###", '#', planks2.copy()); + GameRegistry.addRecipe(doorSplit.copy(), "# #", "###", "# #", '#', planks2.copy()); + GameRegistry.addRecipe(doorFull.copy(), "# #", "# #", "# #", '#', planks2.copy()); } } - this.addSqueezer(ILogType.VanillaLog.Spruce, ExtraTreeLiquid.Resin, 50); + addSqueezer(ILogType.VanillaLog.Spruce, ExtraTreeLiquid.Resin, 50); } - public void addSqueezer(final ILogType log, final ILiquidType liquid, final int amount, final float pulpChance) { - final FluidStack liquidStack = liquid.get(amount); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] { log.getItemStack() }, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance)); + public void addSqueezer(ILogType log, ILiquidType liquid, int amount, float pulpChance) { + FluidStack liquidStack = liquid.get(amount); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{log.getItemStack()}, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance)); } - public void addSqueezer(final ILogType log, final ILiquidType liquid, final int amount) { - this.addSqueezer(log, liquid, amount, 0.5f); + public void addSqueezer(ILogType log, ILiquidType liquid, int amount) { + addSqueezer(log, liquid, amount, 0.5f); } } diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 4c7706dc..dfd057a8 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -1,43 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import com.google.common.base.Optional; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.Item; import binnie.core.Mods; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.client.renderer.texture.IIconRegister; import binnie.core.block.TileEntityMetadata; -import net.minecraft.item.ItemStack; import binnie.extratrees.ExtraTrees; -import net.minecraft.util.IIcon; import binnie.extratrees.api.CarpentryManager; +import com.google.common.base.Optional; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public class PlankType -{ - public static final int MAX_PLANKS = 256; - +public class PlankType { public static void setup() { - for (final VanillaPlanks plank : VanillaPlanks.values()) { + for (VanillaPlanks plank : VanillaPlanks.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal(), plank); } - for (final ExtraTreePlanks plank2 : ExtraTreePlanks.values()) { + for (ExtraTreePlanks plank2 : ExtraTreePlanks.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank2.ordinal() + 32, plank2); } - for (final ForestryPlanks plank3 : ForestryPlanks.values()) { + for (ForestryPlanks plank3 : ForestryPlanks.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank3.ordinal() + 128, plank3); } - for (final ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) { + for (ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank4.ordinal() + 192, plank4); } } - public enum ExtraTreePlanks implements IPlankType, IFenceProvider - { + public enum ExtraTreePlanks implements IPlankType, IFenceProvider { Fir(12815444), Cedar(14181940), Hemlock(13088108), @@ -74,40 +66,40 @@ public class PlankType Gingko(16050106), PinkIvory(15502496); - int color; - IIcon icon; + protected int color; + protected IIcon icon; - private ExtraTreePlanks(final int color) { + ExtraTreePlanks(int color) { this.color = color; } @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); + return ExtraTrees.proxy.localise("block.planks." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase() + ".desc"); + return ExtraTrees.proxy.localise("block.planks." + toString().toLowerCase() + ".desc"); } @Override public int getColour() { - return this.color; + return color; } @Override public ItemStack getStack() { - return TileEntityMetadata.getItemStack(ExtraTrees.blockPlanks, this.ordinal()); + return TileEntityMetadata.getItemStack(ExtraTrees.blockPlanks, ordinal()); } - public IIcon loadIcon(final IIconRegister register) { - return this.icon = ExtraTrees.proxy.getIcon(register, "planks/" + this.toString()); + public IIcon loadIcon(IIconRegister register) { + return icon = ExtraTrees.proxy.getIcon(register, "planks/" + toString()); } @Override public IIcon getIcon() { - return this.icon; + return icon; } @Override @@ -116,116 +108,111 @@ public class PlankType } } - public enum VanillaPlanks implements IPlankType - { - OAK(11833434), - SPRUCE(8412726), - BIRCH(14139781), - JUNGLE(11632732), - ACACIA(12215095), - DARKOAK(4599061); + public enum VanillaPlanks implements IPlankType { + OAK(0xb4905a), + SPRUCE(0x805e36), + BIRCH(0xd7c185), + JUNGLE(0xb1805c), + ACACIA(0xba6337), + DARKOAK(0x462d15); - int color; + protected int color; - private VanillaPlanks(final int color) { + VanillaPlanks(int color) { this.color = color; } @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + this.toString().toLowerCase()); + return ExtraTrees.proxy.localise("block.planks.vanilla." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + this.toString().toLowerCase() + ".desc"); + return ExtraTrees.proxy.localise("block.planks.vanilla." + toString().toLowerCase() + ".desc"); } @Override public int getColour() { - return this.color; + return color; } @Override public ItemStack getStack() { - return new ItemStack(Blocks.planks, 1, this.ordinal()); + return new ItemStack(Blocks.planks, 1, ordinal()); } @Override public IIcon getIcon() { - if (this.getStack() != null) { - final int meta = this.getStack().getItemDamage(); - final Block block = Blocks.planks; - return block.getIcon(2, meta); - } - return null; + int meta = getStack().getItemDamage(); + Block block = Blocks.planks; + return block.getIcon(2, meta); } } - public enum ForestryPlanks implements IPlankType, IFenceProvider - { - LARCH(14131085), - TEAK(8223075), - ACACIA(9745287), - LIME(13544048), - CHESTNUT(12298845), - WENGE(6182474), - BAOBAB(9608290), - SEQUOIA(10050135), - KAPOK(8156212), - EBONY(3946288), - MAHOGANY(7749432), - BALSA(11117209), - WILLOW(11710818), - WALNUT(6836802), - GREENHEART(5144156), - CHERRY(11895348), - MAHOE(8362154), - POPLAR(13619074), - PALM(13271115), - PAPAYA(14470005), - PINE(12885585), - PLUM(11364479), - MAPLE(11431211), - CITRUS(10266653), - GIGANTEUM(5186590), - IPE(5057822), - PADAUK(11756341), - COCOBOLO(7541506), - ZEBRAWOOD(10912334); + public enum ForestryPlanks implements IPlankType, IFenceProvider { + LARCH(0xd79f8d), + TEAK(0x7d7963), + ACACIA(0x94b387), + LIME(0xceaa70), + CHESTNUT(0xbbaa5d), + WENGE(0x5e564a), + BAOBAB(0x929c62), + SEQUOIA(0x995a57), + KAPOK(0x7c7434), + EBONY(0x3c3730), + MAHOGANY(0x763f38), + BALSA(0xa9a299), + WILLOW(0xb2b162), + WALNUT(0x685242), + GREENHEART(0x4e7e5c), + CHERRY(0xb58234), + MAHOE(0x7f98aa), + POPLAR(0xcfcf82), + PALM(0xca804b), + PAPAYA(0xdccb75), + PINE(0xc49e51), + PLUM(0xad687f), + MAPLE(0xae6d2b), + CITRUS(0x9ca81d), + GIGANTEUM(0x4f241e), + IPE(0x4d2d1e), + PADAUK(0xb36335), + COCOBOLO(0x731302), + ZEBRAWOOD(0xa6824e); - int color; + protected int color; - private ForestryPlanks(final int color) { + ForestryPlanks(int color) { this.color = color; } @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase()); + return ExtraTrees.proxy.localise("block.planks.forestry." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.forestry." + this.toString().toLowerCase() + ".desc"); + return ExtraTrees.proxy.localise("block.planks.forestry." + toString().toLowerCase() + ".desc"); } @Override public int getColour() { - return this.color; + return color; } @Override public ItemStack getStack() { - final Item stack = Mods.Forestry.item("planks"); - return new ItemStack(stack, 1, this.ordinal()); + Item stack = Mods.Forestry.item("planks"); + return new ItemStack(stack, 1, ordinal()); } @Override public IIcon getIcon() { - if (this.getStack() != null) { - final int meta = this.getStack().getItemDamage(); - final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; + if (getStack() != null) { + int meta = getStack().getItemDamage(); + Block block = ((ItemBlock) getStack().getItem()).field_150939_a; return block.getIcon(2, meta); } return null; @@ -233,45 +220,44 @@ public class PlankType @Override public ItemStack getFence() { - final ItemStack fence = Mods.Forestry.stack("fences"); - fence.setItemDamage(this.ordinal()); + ItemStack fence = Mods.Forestry.stack("fences"); + fence.setItemDamage(ordinal()); return fence; } } - public enum ExtraBiomesPlank implements IPlankType - { - Redwood(10185538), - Fir(8288074), - Acacia(12561022); + public enum ExtraBiomesPlank implements IPlankType { + Redwood(0x9b6b42), + Fir(0x7e774a), + Acacia(0xbfaa7e); - int color; + protected int color; - private ExtraBiomesPlank(final int color) { + ExtraBiomesPlank(int color) { this.color = color; } @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + this.toString().toLowerCase()); + return ExtraTrees.proxy.localise("block.planks.ebxl." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + this.toString().toLowerCase() + ".desc"); + return ExtraTrees.proxy.localise("block.planks.ebxl." + toString().toLowerCase() + ".desc"); } @Override public int getColour() { - return this.color; + return color; } @Override public ItemStack getStack() { try { - final Class clss = Class.forName("extrabiomes.api.Stuff"); - final Block block = (Block) ((Optional) clss.getField("planks").get(null)).get(); - return new ItemStack(block, 1, this.ordinal()); + Class clss = Class.forName("extrabiomes.api.Stuff"); + Block block = (Block) ((Optional) clss.getField("planks").get(null)).get(); + return new ItemStack(block, 1, ordinal()); } catch (Exception e) { return null; } @@ -279,9 +265,9 @@ public class PlankType @Override public IIcon getIcon() { - if (this.getStack() != null) { - final int meta = this.getStack().getItemDamage(); - final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; + if (getStack() != null) { + int meta = getStack().getItemDamage(); + Block block = ((ItemBlock) getStack().getItem()).field_150939_a; return block.getIcon(2, meta); } return null; diff --git a/src/main/java/binnie/extratrees/block/StairItemRenderer.java b/src/main/java/binnie/extratrees/block/StairItemRenderer.java index 3561048a..885ce339 100644 --- a/src/main/java/binnie/extratrees/block/StairItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/StairItemRenderer.java @@ -1,24 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import net.minecraft.util.IIcon; import net.minecraft.block.Block; -import org.lwjgl.opengl.GL11; -import net.minecraft.item.ItemBlock; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +public class StairItemRenderer implements IItemRenderer { + private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { + Tessellator tessellator = Tessellator.instance; + Block block = ((ItemBlock) item.getItem()).field_150939_a; + IIcon textureIndex = PlankType.ExtraTreePlanks.values()[item.getItemDamage()].getIcon(); -public class StairItemRenderer implements IItemRenderer -{ - private void renderStairBlock(final RenderBlocks renderBlocks, final ItemStack item, final float f, final float g, final float h) { - final Tessellator tessellator = Tessellator.instance; - final Block block = ((ItemBlock) item.getItem()).field_150939_a; - final IIcon textureIndex = PlankType.ExtraTreePlanks.values()[item.getItemDamage()].getIcon(); for (int i = 0; i < 2; ++i) { if (i == 0) { renderBlocks.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 0.5); @@ -56,43 +52,35 @@ public class StairItemRenderer implements IItemRenderer } @Override - public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { + public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { switch (type) { - case ENTITY: { - return true; - } - case EQUIPPED: { - return true; - } - case INVENTORY: { - return true; - } - default: { - return false; - } + case ENTITY: + case EQUIPPED: + case INVENTORY: + return true; } + return false; } @Override - public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { return true; } @Override - public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { + public void renderItem(IItemRenderer.ItemRenderType type, ItemStack item, Object... data) { switch (type) { - case ENTITY: { - this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - } - case EQUIPPED: { - this.renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); - break; - } - case INVENTORY: { - this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); - break; - } + case ENTITY: + renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; + + case EQUIPPED: + renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); + break; + + case INVENTORY: + renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); + break; } } } diff --git a/src/main/java/binnie/extratrees/block/StairsRenderer.java b/src/main/java/binnie/extratrees/block/StairsRenderer.java index d505048b..c80ce6ad 100644 --- a/src/main/java/binnie/extratrees/block/StairsRenderer.java +++ b/src/main/java/binnie/extratrees/block/StairsRenderer.java @@ -1,22 +1,17 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -public class StairsRenderer implements ISimpleBlockRenderingHandler -{ +public class StairsRenderer implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(final Block par1Block, final int metadata, final int modelID, final RenderBlocks renderer) { - final Tessellator var4 = Tessellator.instance; + public void renderInventoryBlock(Block par1Block, int metadata, int modelID, RenderBlocks renderer) { + Tessellator var4 = Tessellator.instance; for (int var5 = 0; var5 < 2; ++var5) { if (var5 == 0) { renderer.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 0.5); @@ -24,6 +19,7 @@ public class StairsRenderer implements ISimpleBlockRenderingHandler if (var5 == 1) { renderer.setRenderBounds(0.0, 0.0, 0.5, 1.0, 0.5, 1.0); } + GL11.glTranslatef(-0.5f, -0.5f, -0.5f); var4.startDrawingQuads(); var4.setNormal(0.0f, -1.0f, 0.0f); @@ -54,23 +50,23 @@ public class StairsRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) { - final BlockETStairs blockStairs = (BlockETStairs) block; - blockStairs.func_150147_e(renderer.blockAccess, par2, par3, par4); + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + BlockETStairs blockStairs = (BlockETStairs) block; + blockStairs.func_150147_e(renderer.blockAccess, x, y, z); renderer.setRenderBoundsFromBlock(blockStairs); - renderer.renderStandardBlock(blockStairs, par2, par3, par4); - final boolean var5 = blockStairs.func_150145_f(renderer.blockAccess, par2, par3, par4); + renderer.renderStandardBlock(blockStairs, x, y, z); + boolean var5 = blockStairs.func_150145_f(renderer.blockAccess, x, y, z); renderer.setRenderBoundsFromBlock(blockStairs); - renderer.renderStandardBlock(blockStairs, par2, par3, par4); - if (var5 && blockStairs.func_150144_g(renderer.blockAccess, par2, par3, par4)) { + renderer.renderStandardBlock(blockStairs, x, y, z); + if (var5 && blockStairs.func_150144_g(renderer.blockAccess, x, y, z)) { renderer.setRenderBoundsFromBlock(blockStairs); - renderer.renderStandardBlock(blockStairs, par2, par3, par4); + renderer.renderStandardBlock(blockStairs, x, y, z); } return true; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return true; } diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 1085ac80..1e67602e 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -1,53 +1,51 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Blocks; import binnie.core.block.TileEntityMetadata; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.decor.FenceDescription; import binnie.extratrees.block.decor.FenceType; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.CarpentryManager; -public class WoodManager -{ - public static IPlankType getPlankType(final int index) { - final IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index); +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class WoodManager { + public static IPlankType getPlankType(int index) { + IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index); if (wood instanceof IPlankType) { return (IPlankType) wood; } return PlankType.ExtraTreePlanks.Fir; } - public static int getPlankTypeIndex(final IPlankType type) { - final int index = CarpentryManager.carpentryInterface.getCarpentryWoodIndex(type); + public static int getPlankTypeIndex(IPlankType type) { + int index = CarpentryManager.carpentryInterface.getCarpentryWoodIndex(type); return (index < 0) ? 0 : index; } - public static FenceType getFenceType(final ItemStack stack) { - final FenceDescription desc = getFenceDescription(stack); + public static FenceType getFenceType(ItemStack stack) { + FenceDescription desc = getFenceDescription(stack); return (desc == null) ? null : desc.getFenceType(); } - public static FenceDescription getFenceDescription(final ItemStack stack) { + public static FenceDescription getFenceDescription(ItemStack stack) { if (stack == null) { return null; } + if (stack.getItem() == Item.getItemFromBlock(ExtraTrees.blockMultiFence)) { - final int damage = TileEntityMetadata.getItemDamage(stack); + int damage = TileEntityMetadata.getItemDamage(stack); return getFenceDescription(damage); } - for (final IPlankType type : getAllPlankTypes()) { + + for (IPlankType type : getAllPlankTypes()) { if (type instanceof IFenceProvider) { - final ItemStack f = ((IFenceProvider) type).getFence(); + ItemStack f = ((IFenceProvider) type).getFence(); if (f != null && ItemStack.areItemStacksEqual(stack, f)) { return new FenceDescription(new FenceType(0), type, type); } @@ -57,65 +55,61 @@ public class WoodManager return null; } - public static FenceDescription getFenceDescription(final int meta) { + public static FenceDescription getFenceDescription(int meta) { return new FenceDescription(meta); } - public static FenceType getFenceType(final int meta) { + public static FenceType getFenceType(int meta) { return getFenceDescription(meta).getFenceType(); } - public static ItemStack getGate(final IPlankType plank) { + public static ItemStack getGate(IPlankType plank) { if (plank == PlankType.VanillaPlanks.OAK) { return new ItemStack(Blocks.fence_gate); } return TileEntityMetadata.getItemStack(ExtraTrees.blockGate, getPlankTypeIndex(plank)); } - public static ItemStack getFence(final IPlankType plank, final FenceType type, final int amount) { + public static ItemStack getFence(IPlankType plank, FenceType type, int amount) { return getFence(plank, plank, type, amount); } - public static ItemStack getFence(final IPlankType plank, final IPlankType plank2, final FenceType type, final int amount) { + public static ItemStack getFence(IPlankType plank, IPlankType plank2, FenceType type, int amount) { if (plank instanceof IFenceProvider && plank == plank2 && type.isPlain()) { - final ItemStack original = ((IFenceProvider) plank).getFence(); + ItemStack original = ((IFenceProvider) plank).getFence(); if (original != null) { original.stackSize = amount; return original; } } - final int ord = type.ordinal(); - final int i = getPlankTypeIndex(plank) + 256 * ord; - final ItemStack stack = TileEntityMetadata.getItemStack(ExtraTrees.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); + + int ord = type.ordinal(); + int i = getPlankTypeIndex(plank) + 256 * ord; + ItemStack stack = TileEntityMetadata.getItemStack(ExtraTrees.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); stack.stackSize = amount; return stack; } - public static ItemStack getDoor(final IPlankType plank, final DoorType type) { + public static ItemStack getDoor(IPlankType plank, DoorType type) { return TileEntityMetadata.getItemStack(ExtraTrees.blockDoor, type.ordinal() * 256 + getPlankTypeIndex(plank)); } public static List getAllPlankTypes() { - final List list = new ArrayList(); - for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { - list.add(type); - } - for (final IPlankType type : PlankType.ForestryPlanks.values()) { - list.add(type); - } - for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { + List list = new ArrayList(); + Collections.addAll(list, PlankType.ExtraTreePlanks.values()); + Collections.addAll(list, PlankType.ForestryPlanks.values()); + for (IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { list.add(type); } } - for (final IPlankType type : PlankType.VanillaPlanks.values()) { - list.add(type); - } + + Collections.addAll(list, PlankType.VanillaPlanks.values()); return list; } - public static IPlankType get(final ItemStack species) { - for (final IPlankType type : getAllPlankTypes()) { + public static IPlankType get(ItemStack species) { + for (IPlankType type : getAllPlankTypes()) { if (type.getStack() != null && type.getStack().isItemEqual(species)) { return type; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 0451409c..7aad8b3c 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -1,7 +1,3 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; import binnie.Binnie; @@ -35,41 +31,44 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; import java.util.List; -public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence -{ +public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence { public BlockFence() { super("", Material.wood); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("fence"); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("fence"); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); + } + + public static boolean canConnect(Block block) { + return block == ((ItemBlock) Mods.Forestry.item("fences")).field_150939_a || block == Blocks.fence || block == Blocks.fence_gate || block == Blocks.nether_brick_fence || block instanceof IBlockFence || block == ExtraTrees.blockGate; } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final IFenceProvider type : PlankType.ExtraTreePlanks.values()) { - itemList.add(type.getFence()); + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (IFenceProvider type : PlankType.ExtraTreePlanks.values()) { + list.add(type.getFence()); } } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata()); + return getIcon(side, tile.getTileMetadata()); } return super.getIcon(world, x, y, z, side); } - public FenceDescription getDescription(final int meta) { + public FenceDescription getDescription(int meta) { return WoodManager.getFenceDescription(meta); } @Override - public IIcon getIcon(final int side, final int meta) { - return this.getDescription(meta).getPlankType().getIcon(); + public IIcon getIcon(int side, int meta) { + return getDescription(meta).getPlankType().getIcon(); } @Override @@ -78,113 +77,109 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodfence.name", this.getDescription(meta).getPlankType().getName()); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); + return Binnie.Language.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { } @Override - public boolean canPlaceTorchOnTop(final World world, final int x, final int y, final int z) { + public boolean canPlaceTorchOnTop(World world, int x, int y, int z) { return true; } @Override - public boolean canConnectFenceTo(final IBlockAccess world, final int x, final int y, final int z) { - if (!this.isFence(world, x, y, z)) { - final Block block = world.getBlock(x, y, z); + public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) { + if (!isFence(world, x, y, z)) { + Block block = world.getBlock(x, y, z); return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock(); } return true; } - public boolean isFence(final IBlockAccess world, final int x, final int y, final int z) { - final Block block = world.getBlock(x, y, z); + public boolean isFence(IBlockAccess world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); return canConnect(block); } - public static boolean canConnect(final Block block) { - return block == ((ItemBlock) Mods.Forestry.item("fences")).field_150939_a || block == Blocks.fence || block == Blocks.fence_gate || block == Blocks.nether_brick_fence || block instanceof IBlockFence || block == ExtraTrees.blockGate; + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); - } - - @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister p_149651_1_) { + public void registerBlockIcons(IIconRegister register) { } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index a10e7cdd..7933c527 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -1,47 +1,43 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.block.Block; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.block.BlockMetadata; -import java.util.ArrayList; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.item.ItemStack; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import binnie.core.block.IBlockMetadata; +import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockGate extends BlockFenceGate implements IBlockMetadata -{ +import java.util.ArrayList; +import java.util.List; + +public class BlockGate extends BlockFenceGate implements IBlockMetadata { public BlockGate() { - this.setCreativeTab(Tabs.tabArboriculture); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final IPlankType type : WoodManager.getAllPlankTypes()) { - final ItemStack gate = WoodManager.getGate(type); + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List itemList) { + for (IPlankType type : WoodManager.getAllPlankTypes()) { + ItemStack gate = WoodManager.getGate(type); if (gate != null) { itemList.add(gate); } @@ -50,104 +46,104 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final IBlockAccess world, final int x, final int y, final int z, final int side) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null) { - return this.getIcon(side, tile.getTileMetadata()); + return getIcon(side, tile.getTileMetadata()); } return super.getIcon(world, x, y, z, side); } @Override - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(int side, int meta) { return WoodManager.getPlankType(meta).getIcon(); } @Override - public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack itemStack) { - this.dropBlockAsItem(world, x, y, z, itemStack); + public void dropAsStack(World world, int x, int y, int z, ItemStack itemStack) { + dropBlockAsItem(world, x, y, z, itemStack); } @Override - public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); } @Override - public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @Override - public TileEntity createNewTileEntity(final World var1, final int i) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityMetadata(); } @Override - public boolean hasTileEntity(final int meta) { + public boolean hasTileEntity(int meta) { return true; } @Override - public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null && tileentity.receiveClientEvent(par5, par6); + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventType) { + super.onBlockEventReceived(world, x, y, z, eventId, eventType); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null && tileentity.receiveClientEvent(eventId, eventType); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection direction) { + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction) { return TileEntityMetadata.getItemDamage(itemStack); } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(int blockMeta, int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); return Binnie.Language.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { + public void getBlockTooltip(ItemStack itemStack, List tooltip) { } @Override - public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block block, int side) { + super.breakBlock(world, x, y, z, block, side); + world.removeTileEntity(x, y, z); } @Override - public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { + public boolean isWood(IBlockAccess world, int x, int y, int z) { return true; } @Override - public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFlammability(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 20; } @Override - public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return true; } @Override - public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { + public int getFireSpreadSpeed(IBlockAccess world, int x, int y, int z, ForgeDirection face) { return 5; } @Override - public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { return BlockMetadata.getPickBlock(world, x, y, z); } @Override - public boolean getBlocksMovement(final IBlockAccess p_149655_1_, final int p_149655_2_, final int p_149655_3_, final int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess world, int x, int y, int z) { return false; } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index 7826ab50..b6daadca 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -1,44 +1,54 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.world.ColorizerFoliage; -import net.minecraft.item.ItemStack; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import forestry.api.core.ForestryAPI; -import net.minecraft.util.IIcon; +import binnie.extratrees.block.ModuleBlocks; import binnie.extratrees.genetics.ExtraTreeSpecies; -import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.init.Blocks; -import binnie.extratrees.block.ModuleBlocks; -import net.minecraft.world.IBlockAccess; -import net.minecraft.entity.Entity; -import java.util.List; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; +import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import net.minecraft.block.material.Material; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.ColorizerFoliage; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -public class BlockHedge extends Block implements IBlockFence -{ +import java.util.List; + +public class BlockHedge extends Block implements IBlockFence { public BlockHedge() { super(Material.leaves); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("hedge"); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("hedge"); + } + + public static boolean func_149825_a(Block block) { + return BlockFence.canConnect(block); + } + + public static int getColor(int meta) { + ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6]; + if (type == ExtraTreeSpecies.LeafType.Conifer) { + return ColorizerFoliage.getFoliageColorPine(); + } + double d0 = 0.5; + double d2 = 1.0; + return ColorizerFoliage.getFoliageColor(d0, d2); } @Override - public void addCollisionBoxesToList(final World world, final int x, final int y, final int z, final AxisAlignedBB aabb, final List list, final Entity p_149743_7_) { - final boolean connectNegZ = this.canConnectFenceTo(world, x, y, z - 1); - final boolean connectPosZ = this.canConnectFenceTo(world, x, y, z + 1); - final boolean connectNegX = this.canConnectFenceTo(world, x - 1, y, z); - final boolean connectPosX = this.canConnectFenceTo(world, x + 1, y, z); + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { + boolean connectNegZ = canConnectFenceTo(world, x, y, z - 1); + boolean connectPosZ = canConnectFenceTo(world, x, y, z + 1); + boolean connectNegX = canConnectFenceTo(world, x - 1, y, z); + boolean connectPosX = canConnectFenceTo(world, x + 1, y, z); float f = 0.25f; float f2 = 0.75f; float f3 = 0.25f; @@ -50,9 +60,10 @@ public class BlockHedge extends Block implements IBlockFence f4 = 1.0f; } if (connectNegZ || connectPosZ) { - this.setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); - super.addCollisionBoxesToList(world, x, y, z, aabb, list, p_149743_7_); + setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); + super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } + f3 = 0.25f; f4 = 0.75f; if (connectNegX) { @@ -62,8 +73,8 @@ public class BlockHedge extends Block implements IBlockFence f2 = 1.0f; } if (connectNegX || connectPosX || (!connectNegZ && !connectPosZ)) { - this.setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); - super.addCollisionBoxesToList(world, x, y, z, aabb, list, p_149743_7_); + setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); + super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } if (connectNegZ) { f3 = 0.0f; @@ -71,15 +82,15 @@ public class BlockHedge extends Block implements IBlockFence if (connectPosZ) { f4 = 1.0f; } - this.setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); + setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); } @Override - public void setBlockBoundsBasedOnState(final IBlockAccess world, final int x, final int y, final int z) { - final boolean connectNegZ = this.canConnectFenceTo(world, x, y, z - 1); - final boolean connectPosZ = this.canConnectFenceTo(world, x, y, z + 1); - final boolean connectNegX = this.canConnectFenceTo(world, x - 1, y, z); - final boolean connectPosX = this.canConnectFenceTo(world, x + 1, y, z); + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + boolean connectNegZ = canConnectFenceTo(world, x, y, z - 1); + boolean connectPosZ = canConnectFenceTo(world, x, y, z + 1); + boolean connectNegX = canConnectFenceTo(world, x - 1, y, z); + boolean connectPosX = canConnectFenceTo(world, x + 1, y, z); float f = 0.25f; float f2 = 0.75f; float f3 = 0.25f; @@ -96,7 +107,7 @@ public class BlockHedge extends Block implements IBlockFence if (connectPosX) { f2 = 1.0f; } - this.setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); + setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); } @Override @@ -110,7 +121,7 @@ public class BlockHedge extends Block implements IBlockFence } @Override - public boolean getBlocksMovement(final IBlockAccess p_149655_1_, final int p_149655_2_, final int p_149655_3_, final int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess world, int x, int y, int z) { return false; } @@ -119,44 +130,45 @@ public class BlockHedge extends Block implements IBlockFence return ModuleBlocks.hedgeRenderID; } - public boolean canConnectFenceTo(final IBlockAccess p_149826_1_, final int p_149826_2_, final int p_149826_3_, final int p_149826_4_) { - final Block block = p_149826_1_.getBlock(p_149826_2_, p_149826_3_, p_149826_4_); - return block == this || block == Blocks.fence_gate || func_149825_a(block) || block.isLeaves(p_149826_1_, p_149826_2_, p_149826_3_, p_149826_4_) || (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd); - } - - public static boolean func_149825_a(final Block p_149825_0_) { - return BlockFence.canConnect(p_149825_0_); + public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + return block == this + || block == Blocks.fence_gate + || func_149825_a(block) + || block.isLeaves(world, x, y, z) + || (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd); } @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(final IBlockAccess p_149646_1_, final int p_149646_2_, final int p_149646_3_, final int p_149646_4_, final int p_149646_5_) { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister p_149651_1_) { + public void registerBlockIcons(IIconRegister register) { + // ignored } - private ExtraTreeSpecies.LeafType getType(final int meta) { + private ExtraTreeSpecies.LeafType getType(int meta) { return ExtraTreeSpecies.LeafType.values()[meta % 8]; } - private boolean isFull(final int meta) { + private boolean isFull(int meta) { return meta / 8 > 0; } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int meta) { - final ExtraTreeSpecies.LeafType type = this.getType(meta); - return ForestryAPI.textureManager.getIcon(this.isFull(meta) ? type.plainUID : type.fancyUID); + public IIcon getIcon(int side, int meta) { + ExtraTreeSpecies.LeafType type = getType(meta); + return ForestryAPI.textureManager.getIcon(isFull(meta) ? type.plainUID : type.fancyUID); } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 6; ++i) { for (int f = 0; f < 2; ++f) { list.add(new ItemStack(item, 1, i + f * 8)); @@ -166,17 +178,7 @@ public class BlockHedge extends Block implements IBlockFence @Override @SideOnly(Side.CLIENT) - public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { return getColor(world.getBlockMetadata(x, y, z)); } - - public static int getColor(final int meta) { - final ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6]; - if (type == ExtraTreeSpecies.LeafType.Conifer) { - return ColorizerFoliage.getFoliageColorPine(); - } - final double d0 = 0.5; - final double d2 = 1.0; - return ColorizerFoliage.getFoliageColor(d0, d2); - } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 67ab6d7a..84245586 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -1,47 +1,45 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; +import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.PlankType; -import java.util.List; +import binnie.extratrees.block.WoodManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import binnie.core.block.IBlockMetadata; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public class BlockMultiFence extends BlockFence implements IBlockMetadata -{ +import java.util.List; + +public class BlockMultiFence extends BlockFence implements IBlockMetadata { public BlockMultiFence() { - this.setBlockName("multifence"); + setBlockName("multifence"); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final FenceType type : FenceType.values()) { - itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (FenceType type : FenceType.values()) { + list.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } } @Override - public IIcon getIcon(final int side, final int meta) { - return (FenceRenderer.layer == 0) ? this.getDescription(meta).getPlankType().getIcon() : this.getDescription(meta).getSecondaryPlankType().getIcon(); + public IIcon getIcon(int side, int meta) { + return (FenceRenderer.layer == 0) + ? getDescription(meta).getPlankType().getIcon() + : getDescription(meta).getSecondaryPlankType().getIcon(); } @Override - public String getBlockName(final ItemStack itemStack) { - final int meta = TileEntityMetadata.getItemDamage(itemStack); - final IPlankType type1 = this.getDescription(meta).getPlankType(); - final IPlankType type2 = this.getDescription(meta).getSecondaryPlankType(); - final boolean twoTypes = type1 != type2; - final FenceType type3 = this.getDescription(meta).getFenceType(); + public String getBlockName(ItemStack itemStack) { + int meta = TileEntityMetadata.getItemDamage(itemStack); + IPlankType type1 = getDescription(meta).getPlankType(); + IPlankType type2 = getDescription(meta).getSecondaryPlankType(); + boolean twoTypes = type1 != type2; + FenceType type3 = getDescription(meta).getFenceType(); return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); } } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceDescription.java b/src/main/java/binnie/extratrees/block/decor/FenceDescription.java index c4c39c04..dbc2cec2 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceDescription.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceDescription.java @@ -1,39 +1,34 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; -public class FenceDescription -{ - FenceType fenceType; - IPlankType plankType; - IPlankType secondaryPlankType; +public class FenceDescription { + protected FenceType fenceType; + protected IPlankType plankType; + protected IPlankType secondaryPlankType; - public FenceDescription(final FenceType fenceType, final IPlankType plankType, final IPlankType secondaryPlankType) { + public FenceDescription(FenceType fenceType, IPlankType plankType, IPlankType secondaryPlankType) { this.fenceType = fenceType; this.plankType = plankType; this.secondaryPlankType = secondaryPlankType; } - public FenceDescription(final int meta) { - this.fenceType = new FenceType(meta >> 8 & 0xFF); - this.plankType = WoodManager.getPlankType(meta & 0xFF); - this.secondaryPlankType = WoodManager.getPlankType(meta >> 16 & 0xFF); + public FenceDescription(int meta) { + fenceType = new FenceType(meta >> 8 & 0xFF); + plankType = WoodManager.getPlankType(meta & 0xFF); + secondaryPlankType = WoodManager.getPlankType(meta >> 16 & 0xFF); } public FenceType getFenceType() { - return this.fenceType; + return fenceType; } public IPlankType getPlankType() { - return this.plankType; + return plankType; } public IPlankType getSecondaryPlankType() { - return this.secondaryPlankType; + return secondaryPlankType; } } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java index cced1b80..cc5dfbfc 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.tileentity.TileEntity; import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.WoodManager; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import binnie.extratrees.block.WoodManager; -import binnie.extratrees.ExtraTrees; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -public class FenceRenderer implements ISimpleBlockRenderingHandler -{ +public class FenceRenderer implements ISimpleBlockRenderingHandler { public static int layer; @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { - final Tessellator tess = Tessellator.instance; + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + Tessellator tess = Tessellator.instance; for (int i = 0; i < 5; ++i) { - final float thickness = 0.125f; + float thickness = 0.125f; FenceRenderer.layer = 0; if (i == 0) { block.setBlockBounds(0.5f - thickness, 0.0f, 0.0f, 0.5f + thickness, 1.0f, thickness * 2.0f); @@ -31,9 +26,10 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler if (i == 1) { block.setBlockBounds(0.5f - thickness, 0.0f, 1.0f - thickness * 2.0f, 0.5f + thickness, 1.0f, 1.0f); } - final float s = 0.0625f; - final FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0); - final boolean bottomBar = !fenceType.solid; + + float s = 0.0625f; + FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0); + boolean bottomBar = !fenceType.solid; float topBarMaxY = 1.0f - s; float topBarMinY = 1.0f - s * 3.0f; float bottomBarMaxY = 0.5f - s; @@ -44,13 +40,16 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler topBarMinY -= 4.0f * s; topBarMaxY -= 4.0f * s; } + if (fenceType.size == 1) { bottomBarMinY -= 4.0f * s; bottomBarMaxY -= 4.0f * s; } + if (fenceType.solid) { topBarMinY = bottomBarMinY; } + float minX = 0.5f - s; float maxX = 0.5f + s; float minZ = -s * 2.0f; @@ -58,31 +57,28 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler if (i == 2) { block.setBlockBounds(minX, topBarMinY, minZ, maxX, topBarMaxY, maxZ); FenceRenderer.layer = 1; - } - if (i == 3) { + } else if (i == 3) { if (!bottomBar) { continue; } block.setBlockBounds(minX, bottomBarMinY, minZ, maxX, bottomBarMaxY, maxZ); FenceRenderer.layer = 1; - } - if (i == 4) { + } else if (i == 4) { if (fenceType.embossed) { minX -= s * 0.9f; maxX += s * 0.9f; minZ -= s; maxZ += s; - float minY = 0.0f; - float maxY = 1.0f; + float minY; + float maxY; + if (fenceType.size != 1 && !fenceType.solid) { minY = bottomBarMinY + 2.0f * s; maxY = topBarMaxY - 2.0f * s; - } - else if (fenceType.size == 1 && fenceType.solid) { + } else if (fenceType.size == 1 && fenceType.solid) { minY = bottomBarMinY + 2.0f * s; maxY = topBarMaxY - 2.0f * s; - } - else { + } else { minY = 0.5f - 2.0f * s; maxY = 0.5f + 2.0f * s; } @@ -96,8 +92,7 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler } block.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); FenceRenderer.layer = 0; - } - else { + } else { if (fenceType.size != 1 || fenceType.solid) { continue; } @@ -105,6 +100,7 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler FenceRenderer.layer = 1; } } + renderer.setRenderBoundsFromBlock(block); GL11.glTranslatef(-0.5f, -0.5f, -0.5f); tess.startDrawingQuads(); @@ -138,46 +134,49 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { FenceRenderer.layer = 0; - final BlockFence blockFence = (BlockFence) block; - final float i = 0.0625f; + BlockFence blockFence = (BlockFence) block; + float i = 0.0625f; FenceType fenceType = new FenceType(0); - final TileEntity tile = world.getTileEntity(par2, par3, par4); + TileEntity tile = world.getTileEntity(x, y, z); if (tile != null && tile instanceof TileEntityMetadata && block instanceof BlockMultiFence) { fenceType = WoodManager.getFenceType(((TileEntityMetadata) tile).getTileMetadata()); } - boolean rendered = false; - final float postWidth = 0.25f; - final float postHeight = 1.0f; + + boolean rendered; + float postWidth = 0.25f; + float postHeight = 1.0f; float minPostPos = 0.5f - postWidth / 2.0f; float maxPostPos = 0.5f + postWidth / 2.0f; renderer.setRenderBounds(minPostPos, 0.0, minPostPos, maxPostPos, postHeight, maxPostPos); - renderer.renderStandardBlock(block, par2, par3, par4); + renderer.renderStandardBlock(block, x, y, z); rendered = true; boolean connectAnyX = false; boolean connectAnyZ = false; - if (blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4) || blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4)) { + if (blockFence.canConnectFenceTo(renderer.blockAccess, x - 1, y, z) || blockFence.canConnectFenceTo(renderer.blockAccess, x + 1, y, z)) { connectAnyX = true; } - if (blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1) || blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1)) { + if (blockFence.canConnectFenceTo(renderer.blockAccess, x, y, z - 1) || blockFence.canConnectFenceTo(renderer.blockAccess, x, y, z + 1)) { connectAnyZ = true; } - final boolean connectNegX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4); - final boolean connectPosX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4); - final boolean connectNegZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1); - final boolean connectPosZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1); + + boolean connectNegX = blockFence.canConnectFenceTo(renderer.blockAccess, x - 1, y, z); + boolean connectPosX = blockFence.canConnectFenceTo(renderer.blockAccess, x + 1, y, z); + boolean connectNegZ = blockFence.canConnectFenceTo(renderer.blockAccess, x, y, z - 1); + boolean connectPosZ = blockFence.canConnectFenceTo(renderer.blockAccess, x, y, z + 1); if (!connectAnyX && !connectAnyZ) { connectAnyX = true; } + minPostPos = 7.0f * i; maxPostPos = 9.0f * i; float barMinY = 12.0f * i; float barMaxY = 15.0f * i; - final float minX = connectNegX ? 0.0f : minPostPos; - final float maxX = connectPosX ? 1.0f : maxPostPos; - final float minZ = connectNegZ ? 0.0f : minPostPos; - final float maxZ = connectPosZ ? 1.0f : maxPostPos; + float minX = connectNegX ? 0.0f : minPostPos; + float maxX = connectPosX ? 1.0f : maxPostPos; + float minZ = connectNegZ ? 0.0f : minPostPos; + float maxZ = connectPosZ ? 1.0f : maxPostPos; boolean renderBottom = true; if (fenceType.size == 2) { barMaxY -= 5.0f * i; @@ -187,23 +186,25 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler renderBottom = false; if (fenceType.size == 0) { barMinY = 6.0f * i; - } - else { + } else { barMinY = i; } } - final float totalMaxY = barMaxY; + + float totalMaxY = barMaxY; FenceRenderer.layer = 1; if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } + if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } + if (renderBottom) { barMinY -= 6.0f * i; barMaxY -= 6.0f * i; @@ -212,31 +213,33 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler } if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } } + if (renderBottom && fenceType.size == 1) { barMinY -= 6.0f * i; barMaxY -= 6.0f * i; barMaxY += i; if (connectAnyX) { renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } if (connectAnyZ) { renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); + renderer.renderStandardBlock(blockFence, x, y, z); rendered = true; } } - final float totalMinY = barMinY; + + float totalMinY = barMinY; FenceRenderer.layer = 0; if (fenceType.embossed) { minPostPos -= (float) (i - 0.25 * i); @@ -246,30 +249,30 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler if (fenceType.size == 1 && !fenceType.solid) { minY = 6.0f * i; maxY = 10.0f * i; - } - else if (fenceType.size == 0 && fenceType.solid) { + } else if (fenceType.size == 0 && fenceType.solid) { minY -= 4.0f * i; maxY -= 4.0f * i; - } - else if (fenceType.size == 2 && fenceType.solid) { + } else if (fenceType.size == 2 && fenceType.solid) { minY += 4.0f * i; maxY += 4.0f * i; } + if (connectAnyX) { renderer.setRenderBounds(minX, minY, minPostPos, maxX, maxY, maxPostPos); - renderer.renderStandardBlock(block, par2, par3, par4); + renderer.renderStandardBlock(block, x, y, z); } + if (connectAnyZ) { renderer.setRenderBounds(minPostPos, minY, minZ, maxPostPos, maxY, maxZ); - renderer.renderStandardBlock(block, par2, par3, par4); + renderer.renderStandardBlock(block, x, y, z); } } - blockFence.setBlockBoundsBasedOnState(renderer.blockAccess, par2, par3, par4); + blockFence.setBlockBoundsBasedOnState(renderer.blockAccess, x, y, z); return rendered; } @Override - public boolean shouldRender3DInInventory(final int i) { + public boolean shouldRender3DInInventory(int i) { return true; } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index d27606b5..1d4a56f9 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -1,44 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import java.util.List; import java.util.ArrayList; import java.util.Collection; +import java.util.List; -public class FenceType -{ +public class FenceType { public int size; public boolean solid; public boolean embossed; - public FenceType(final int size, final boolean solid, final boolean embedded) { + public FenceType(int size, boolean solid, boolean embedded) { this.size = size; this.solid = solid; - this.embossed = embedded; + embossed = embedded; } - public String getPrefix() { - return ((this.size == 0) ? "" : ((this.size == 1) ? "Full " : "Low ")) + (this.solid ? "Solid " : "") + (this.embossed ? "Embedded " : ""); - } - - public int ordinal() { - return this.size + ((this.solid ? 1 : 0) << 2) + ((this.embossed ? 1 : 0) << 3); - } - - public FenceType(final int meta) { - this.size = (meta & 0x3); - this.solid = ((meta >> 2 & 0x1) > 0); - this.embossed = ((meta >> 3 & 0x1) > 0); + public FenceType(int meta) { + size = (meta & 0x3); + solid = ((meta >> 2 & 0x1) > 0); + embossed = ((meta >> 3 & 0x1) > 0); } public static Collection values() { - final List list = new ArrayList(); + List list = new ArrayList(); for (int size = 0; size < 3; ++size) { - for (final boolean solid : new boolean[] { false, true }) { - for (final boolean embedded : new boolean[] { false, true }) { + for (boolean solid : new boolean[]{false, true}) { + for (boolean embedded : new boolean[]{false, true}) { list.add(new FenceType(size, solid, embedded)); } } @@ -46,15 +33,27 @@ public class FenceType return list; } + public String getPrefix() { + return ((size == 0) ? "" : ((size == 1) ? "Full " : "Low ")) + + (solid ? "Solid " : "") + + (embossed ? "Embedded " : ""); + } + + public int ordinal() { + return size + ((solid ? 1 : 0) << 2) + ((embossed ? 1 : 0) << 3); + } + public boolean isPlain() { - return this.size == 0 && !this.embossed && !this.solid; + return size == 0 && !embossed && !solid; } @Override - public boolean equals(final Object obj) { + public boolean equals(Object obj) { if (obj instanceof FenceType) { - final FenceType o = (FenceType) obj; - return o.size == this.size && o.embossed == this.embossed && o.solid == this.solid; + FenceType o = (FenceType) obj; + return o.size == size + && o.embossed == embossed + && o.solid == solid; } return super.equals(obj); } diff --git a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java index 13fde6bf..9c818233 100644 --- a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java @@ -1,30 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import binnie.extratrees.block.ModuleBlocks; -import net.minecraft.util.IIcon; import binnie.extratrees.ExtraTrees; -import net.minecraft.world.IBlockAccess; -import net.minecraft.client.renderer.Tessellator; -import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.block.Block; +import binnie.extratrees.block.ModuleBlocks; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; -public class HedgeRenderer implements ISimpleBlockRenderingHandler -{ +public class HedgeRenderer implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelId, final RenderBlocks renderer) { - final int color = BlockHedge.getColor(metadata); - final int r = color >> 16 & 0xFF; - final int g = color >> 8 & 0xFF; - final int b = color & 0xFF; + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + int color = BlockHedge.getColor(metadata); + int r = color >> 16 & 0xFF; + int g = color >> 8 & 0xFF; + int b = color & 0xFF; GL11.glColor3f(r / 255.0f, g / 255.0f, b / 255.0f); renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); - final Tessellator tess = Tessellator.instance; + Tessellator tess = Tessellator.instance; GL11.glTranslatef(-0.5f, -0.5f, -0.5f); tess.startDrawingQuads(); tess.setNormal(0.0f, -1.0f, 0.0f); @@ -54,13 +49,13 @@ public class HedgeRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean renderWorldBlock(final IBlockAccess world, final int x, final int y, final int z, final Block block, final int modelId, final RenderBlocks renderer) { - final IIcon icon = block.getIcon(0, world.getBlockMetadata(x, y, z)); - final BlockHedge hedge = ExtraTrees.blockHedge; - final boolean connectNegX = hedge.canConnectFenceTo(world, x - 1, y, z); - final boolean connectPosX = hedge.canConnectFenceTo(world, x + 1, y, z); - final boolean connectNegZ = hedge.canConnectFenceTo(world, x, y, z - 1); - final boolean connectPosZ = hedge.canConnectFenceTo(world, x, y, z + 1); + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + IIcon icon = block.getIcon(0, world.getBlockMetadata(x, y, z)); + BlockHedge hedge = ExtraTrees.blockHedge; + boolean connectNegX = hedge.canConnectFenceTo(world, x - 1, y, z); + boolean connectPosX = hedge.canConnectFenceTo(world, x + 1, y, z); + boolean connectNegZ = hedge.canConnectFenceTo(world, x, y, z - 1); + boolean connectPosZ = hedge.canConnectFenceTo(world, x, y, z + 1); GL11.glPushMatrix(); renderer.setRenderBounds(0.25, 0.0, 0.25, 0.75, 1.0, 0.75); renderer.renderStandardBlock(block, x, y, z); @@ -115,7 +110,7 @@ public class HedgeRenderer implements ISimpleBlockRenderingHandler } @Override - public boolean shouldRender3DInInventory(final int modelId) { + public boolean shouldRender3DInInventory(int modelId) { return true; } diff --git a/src/main/java/binnie/extratrees/block/decor/IBlockFence.java b/src/main/java/binnie/extratrees/block/decor/IBlockFence.java index 585f1098..5c82c36e 100644 --- a/src/main/java/binnie/extratrees/block/decor/IBlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/IBlockFence.java @@ -1,9 +1,4 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -public interface IBlockFence -{ +public interface IBlockFence { } diff --git a/src/main/java/binnie/extratrees/block/decor/ItemHedge.java b/src/main/java/binnie/extratrees/block/decor/ItemHedge.java index 643139d7..be1ce591 100644 --- a/src/main/java/binnie/extratrees/block/decor/ItemHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/ItemHedge.java @@ -1,23 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; import binnie.extratrees.genetics.ExtraTreeSpecies; -import net.minecraft.item.ItemStack; import net.minecraft.block.Block; import net.minecraft.item.ItemBlockWithMetadata; +import net.minecraft.item.ItemStack; -public class ItemHedge extends ItemBlockWithMetadata -{ - public ItemHedge(final Block block) { +// TODO unused class? +public class ItemHedge extends ItemBlockWithMetadata { + public ItemHedge(Block block) { super(block, block); } @Override - public String getItemStackDisplayName(final ItemStack item) { - final int meta = item.getItemDamage(); + public String getItemStackDisplayName(ItemStack item) { + int meta = item.getItemDamage(); return ExtraTreeSpecies.LeafType.values()[meta % 6].descript + ((meta >= 8) ? " Full" : "") + " Hedge"; } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 4361db11..5a1ab64d 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -1,38 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.init.Blocks; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; -import net.minecraft.world.World; +import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; -public class MultiFenceRecipeEmbedded implements IRecipe -{ - ItemStack cached; +public class MultiFenceRecipeEmbedded implements IRecipe { + protected ItemStack cached; @Override - public boolean matches(final InventoryCrafting inv, final World world) { - final String pattern = ""; - FenceType type = null; + public boolean matches(InventoryCrafting inv, World world) { + FenceType type; for (int row = 0; row < 3; ++row) { - final ItemStack a = inv.getStackInSlot(row * 3); - final ItemStack b = inv.getStackInSlot(row * 3 + 1); - final ItemStack c = inv.getStackInSlot(row * 3 + 2); + ItemStack a = inv.getStackInSlot(row * 3); + ItemStack b = inv.getStackInSlot(row * 3 + 1); + ItemStack c = inv.getStackInSlot(row * 3 + 2); if (a != null && b != null) { if (c != null) { type = WoodManager.getFenceType(a); - final FenceType type2 = WoodManager.getFenceType(c); + FenceType type2 = WoodManager.getFenceType(c); if (type != null && type2 != null) { if (type.equals(type2)) { - final IPlankType pType = WoodManager.get(b); + IPlankType pType = WoodManager.get(b); if (WoodManager.getFenceDescription(a).getPlankType() == pType) { - this.cached = WoodManager.getFence(WoodManager.getFenceDescription(a).getPlankType(), WoodManager.getFenceDescription(a).getSecondaryPlankType(), new FenceType(type.size, type.solid, true), 2); + cached = WoodManager.getFence( + WoodManager.getFenceDescription(a).getPlankType(), + WoodManager.getFenceDescription(a).getSecondaryPlankType(), + new FenceType(type.size, type.solid, true), + 2 + ); return true; } } @@ -44,8 +43,8 @@ public class MultiFenceRecipeEmbedded implements IRecipe } @Override - public ItemStack getCraftingResult(final InventoryCrafting inv) { - return this.getRecipeOutput(); + public ItemStack getCraftingResult(InventoryCrafting inv) { + return getRecipeOutput(); } @Override @@ -55,6 +54,6 @@ public class MultiFenceRecipeEmbedded implements IRecipe @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.fence) : this.cached; + return (cached == null) ? new ItemStack(Blocks.fence) : cached; } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index b0dabd59..4eac68a4 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -1,75 +1,69 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.init.Blocks; -import java.util.List; -import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.IPlankType; -import java.util.ArrayList; -import net.minecraft.world.World; +import binnie.extratrees.block.WoodManager; +import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; -public class MultiFenceRecipeSize implements IRecipe -{ - ItemStack cached; +import java.util.ArrayList; +import java.util.List; + +public class MultiFenceRecipeSize implements IRecipe { + protected ItemStack cached; @Override - public boolean matches(final InventoryCrafting inv, final World world) { - String pattern = ""; - final List types = new ArrayList(); + public boolean matches(InventoryCrafting inv, World world) { + StringBuilder pattern = new StringBuilder(); + List types = new ArrayList(); for (int i = 0; i < inv.getSizeInventory(); ++i) { - final ItemStack stack = inv.getStackInSlot(i); - final IPlankType type = (stack == null) ? null : WoodManager.get(stack); + ItemStack stack = inv.getStackInSlot(i); + IPlankType type = (stack == null) ? null : WoodManager.get(stack); if (stack != null && type == null) { return false; } + if (stack == null) { - pattern += " "; - } - else { + pattern.append(" "); + } else { if (!types.contains(type)) { types.add(type); if (types.size() > 2) { return false; } } - pattern += types.indexOf(type); + pattern.append(types.indexOf(type)); } } + if (types.isEmpty()) { return false; } + ItemStack fence = null; - if (pattern.contains("0100 0 ")) { + if (pattern.toString().contains("0100 0 ")) { fence = WoodManager.getFence(types.get(0), types.get(1), new FenceType(0, false, false), 4); - } - else if (pattern.contains("0000 0 ")) { + } else if (pattern.toString().contains("0000 0 ")) { fence = WoodManager.getFence(types.get(0), types.get(0), new FenceType(0, false, false), 4); - } - else if (pattern.contains("0100 0 1 ")) { + } else if (pattern.toString().contains("0100 0 1 ")) { fence = WoodManager.getFence(types.get(0), types.get(1), new FenceType(1, false, false), 4); - } - else if (pattern.contains("0000 0 0 ")) { + } else if (pattern.toString().contains("0000 0 0 ")) { fence = WoodManager.getFence(types.get(0), types.get(0), new FenceType(1, false, false), 4); - } - else if (pattern.contains(" 0 1 1101")) { + } else if (pattern.toString().contains(" 0 1 1101")) { fence = WoodManager.getFence(types.get(1), types.get(0), new FenceType(2, false, false), 4); - } - else if (pattern.contains(" 0 0 0000")) { + } else if (pattern.toString().contains(" 0 0 0000")) { fence = WoodManager.getFence(types.get(0), types.get(0), new FenceType(2, false, false), 4); } - this.cached = fence; + + cached = fence; return fence != null; } @Override - public ItemStack getCraftingResult(final InventoryCrafting inv) { - return this.getRecipeOutput(); + public ItemStack getCraftingResult(InventoryCrafting inv) { + return getRecipeOutput(); } @Override @@ -79,12 +73,6 @@ public class MultiFenceRecipeSize implements IRecipe @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.fence) : this.cached; - } - - public static void generateTypes() { - final int type = 0; - for (int type2 = 0; type2 < 2; ++type2) { - } + return (cached == null) ? new ItemStack(Blocks.fence) : cached; } } diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index abb140be..33146ca6 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -1,36 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import net.minecraft.init.Blocks; import binnie.extratrees.block.WoodManager; -import net.minecraft.world.World; +import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; -public class MultiFenceRecipeSolid implements IRecipe -{ +public class MultiFenceRecipeSolid implements IRecipe { ItemStack cached; @Override - public boolean matches(final InventoryCrafting inv, final World world) { - final String pattern = ""; - FenceType type = null; + public boolean matches(InventoryCrafting inv, World world) { + FenceType type; for (int row = 0; row < 3; ++row) { - final ItemStack a = inv.getStackInSlot(row * 3); - final ItemStack b = inv.getStackInSlot(row * 3 + 1); - final ItemStack c = inv.getStackInSlot(row * 3 + 2); + ItemStack a = inv.getStackInSlot(row * 3); + ItemStack b = inv.getStackInSlot(row * 3 + 1); + ItemStack c = inv.getStackInSlot(row * 3 + 2); if (a != null && b != null) { if (c != null) { type = WoodManager.getFenceType(a); - final FenceType type2 = WoodManager.getFenceType(b); - final FenceType type3 = WoodManager.getFenceType(c); + FenceType type2 = WoodManager.getFenceType(b); + FenceType type3 = WoodManager.getFenceType(c); if (type != null && type2 != null && type3 != null && type.equals(type2)) { if (type.equals(type3)) { - this.cached = WoodManager.getFence(WoodManager.getFenceDescription(a).getPlankType(), WoodManager.getFenceDescription(a).getSecondaryPlankType(), new FenceType(type.size, true, type.solid), 2); + cached = WoodManager.getFence( + WoodManager.getFenceDescription(a).getPlankType(), + WoodManager.getFenceDescription(a).getSecondaryPlankType(), + new FenceType(type.size, true, type.solid), + 2 + ); return true; } } @@ -41,8 +40,8 @@ public class MultiFenceRecipeSolid implements IRecipe } @Override - public ItemStack getCraftingResult(final InventoryCrafting inv) { - return this.getRecipeOutput(); + public ItemStack getCraftingResult(InventoryCrafting inv) { + return getRecipeOutput(); } @Override @@ -52,6 +51,6 @@ public class MultiFenceRecipeSolid implements IRecipe @Override public ItemStack getRecipeOutput() { - return (this.cached == null) ? new ItemStack(Blocks.fence) : this.cached; + return (cached == null) ? new ItemStack(Blocks.fence) : cached; } } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index 458ae30b..20c87fdf 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -1,40 +1,91 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import java.util.HashMap; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; -public class NBTShapedRecipe implements IRecipe -{ - public final int recipeWidth; - public final int recipeHeight; - public final ItemStack[] recipeItems; +import java.util.HashMap; + +public class NBTShapedRecipe implements IRecipe { + public int recipeWidth; + public int recipeHeight; + public ItemStack[] recipeItems; private ItemStack recipeOutput; private boolean field_92101_f; - private static final String __OBFID = "CL_00000093"; - @Override - public ItemStack getRecipeOutput() { - return this.recipeOutput; + + public NBTShapedRecipe(ItemStack stack, Object... p_92103_2_) { + String s = ""; + int i = 0; + int j = 0; + int k = 0; + + if (p_92103_2_[i] instanceof String[]) { + String[] astring = (String[]) p_92103_2_[i++]; + for (String s2 : astring) { + k++; + j = s2.length(); + s += s2; + } + } else { + while (p_92103_2_[i] instanceof String) { + String s3 = (String) p_92103_2_[i++]; + ++k; + j = s3.length(); + s += s3; + } + } + + HashMap hashmap = new HashMap(); + while (i < p_92103_2_.length) { + Character character = (Character) p_92103_2_[i]; + ItemStack itemstack1 = null; + if (p_92103_2_[i + 1] instanceof Item) { + itemstack1 = new ItemStack((Item) p_92103_2_[i + 1]); + } else if (p_92103_2_[i + 1] instanceof Block) { + itemstack1 = new ItemStack((Block) p_92103_2_[i + 1], 1, 32767); + } else if (p_92103_2_[i + 1] instanceof ItemStack) { + itemstack1 = (ItemStack) p_92103_2_[i + 1]; + } + + hashmap.put(character, itemstack1); + i += 2; + } + + ItemStack[] aitemstack = new ItemStack[j * k]; + for (int i2 = 0; i2 < j * k; ++i2) { + char c0 = s.charAt(i2); + if (hashmap.containsKey(c0)) { + aitemstack[i2] = ((ItemStack) hashmap.get(Character.valueOf(c0))).copy(); + } else { + aitemstack[i2] = null; + } + } + + recipeWidth = j; + recipeHeight = k; + recipeItems = aitemstack; + recipeOutput = stack; + NBTShapedRecipes.addRecipe(this); } @Override - public boolean matches(final InventoryCrafting p_77569_1_, final World p_77569_2_) { - for (int i = 0; i <= 3 - this.recipeWidth; ++i) { - for (int j = 0; j <= 3 - this.recipeHeight; ++j) { - if (this.checkMatch(p_77569_1_, i, j, true)) { + public ItemStack getRecipeOutput() { + return recipeOutput; + } + + @Override + public boolean matches(InventoryCrafting p_77569_1_, World p_77569_2_) { + for (int i = 0; i <= 3 - recipeWidth; ++i) { + for (int j = 0; j <= 3 - recipeHeight; ++j) { + if (checkMatch(p_77569_1_, i, j, true)) { return true; } - if (this.checkMatch(p_77569_1_, i, j, false)) { + if (checkMatch(p_77569_1_, i, j, false)) { return true; } } @@ -42,23 +93,23 @@ public class NBTShapedRecipe implements IRecipe return false; } - private boolean checkMatch(final InventoryCrafting p_77573_1_, final int p_77573_2_, final int p_77573_3_, final boolean p_77573_4_) { + private boolean checkMatch(InventoryCrafting crafting, int p_77573_2_, int p_77573_3_, boolean p_77573_4_) { for (int k = 0; k < 3; ++k) { for (int l = 0; l < 3; ++l) { - final int i1 = k - p_77573_2_; - final int j1 = l - p_77573_3_; + int i1 = k - p_77573_2_; + int j1 = l - p_77573_3_; ItemStack itemstack = null; - if (i1 >= 0 && j1 >= 0 && i1 < this.recipeWidth && j1 < this.recipeHeight) { + if (i1 >= 0 && j1 >= 0 && i1 < recipeWidth && j1 < recipeHeight) { if (p_77573_4_) { - itemstack = this.recipeItems[this.recipeWidth - i1 - 1 + j1 * this.recipeWidth]; - } - else { - itemstack = this.recipeItems[i1 + j1 * this.recipeWidth]; + itemstack = recipeItems[recipeWidth - i1 - 1 + j1 * recipeWidth]; + } else { + itemstack = recipeItems[i1 + j1 * recipeWidth]; } } - final ItemStack itemstack2 = p_77573_1_.getStackInRowAndColumn(k, l); + + ItemStack itemstack2 = crafting.getStackInRowAndColumn(k, l); if (itemstack2 != null || itemstack != null) { - if ((itemstack2 == null && itemstack != null) || (itemstack2 != null && itemstack == null)) { + if (itemstack2 == null || itemstack == null) { return false; } if (itemstack.getItem() != itemstack2.getItem()) { @@ -77,11 +128,11 @@ public class NBTShapedRecipe implements IRecipe } @Override - public ItemStack getCraftingResult(final InventoryCrafting p_77572_1_) { - final ItemStack itemstack = this.getRecipeOutput().copy(); - if (this.field_92101_f) { - for (int i = 0; i < p_77572_1_.getSizeInventory(); ++i) { - final ItemStack itemstack2 = p_77572_1_.getStackInSlot(i); + public ItemStack getCraftingResult(InventoryCrafting crafting) { + ItemStack itemstack = getRecipeOutput().copy(); + if (field_92101_f) { + for (int i = 0; i < crafting.getSizeInventory(); ++i) { + ItemStack itemstack2 = crafting.getStackInSlot(i); if (itemstack2 != null && itemstack2.hasTagCompound()) { itemstack.setTagCompound((NBTTagCompound) itemstack2.stackTagCompound.copy()); } @@ -92,61 +143,6 @@ public class NBTShapedRecipe implements IRecipe @Override public int getRecipeSize() { - return this.recipeWidth * this.recipeHeight; - } - - public NBTShapedRecipe(final ItemStack p_92103_1_, final Object... p_92103_2_) { - String s = ""; - int i = 0; - int j = 0; - int k = 0; - if (p_92103_2_[i] instanceof String[]) { - final String[] astring = (String[]) p_92103_2_[i++]; - for (int l = 0; l < astring.length; ++l) { - final String s2 = astring[l]; - ++k; - j = s2.length(); - s += s2; - } - } - else { - while (p_92103_2_[i] instanceof String) { - final String s3 = (String) p_92103_2_[i++]; - ++k; - j = s3.length(); - s += s3; - } - } - final HashMap hashmap = new HashMap(); - while (i < p_92103_2_.length) { - final Character character = (Character) p_92103_2_[i]; - ItemStack itemstack1 = null; - if (p_92103_2_[i + 1] instanceof Item) { - itemstack1 = new ItemStack((Item) p_92103_2_[i + 1]); - } - else if (p_92103_2_[i + 1] instanceof Block) { - itemstack1 = new ItemStack((Block) p_92103_2_[i + 1], 1, 32767); - } - else if (p_92103_2_[i + 1] instanceof ItemStack) { - itemstack1 = (ItemStack) p_92103_2_[i + 1]; - } - hashmap.put(character, itemstack1); - i += 2; - } - final ItemStack[] aitemstack = new ItemStack[j * k]; - for (int i2 = 0; i2 < j * k; ++i2) { - final char c0 = s.charAt(i2); - if (hashmap.containsKey(c0)) { - aitemstack[i2] = ((ItemStack) hashmap.get(Character.valueOf(c0))).copy(); - } - else { - aitemstack[i2] = null; - } - } - this.recipeWidth = j; - this.recipeHeight = k; - this.recipeItems = aitemstack; - this.recipeOutput = p_92103_1_; - NBTShapedRecipes.addRecipe(this); + return recipeWidth * recipeHeight; } } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java index fd4e1c41..6aabbe45 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java @@ -1,23 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.block.decor; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.inventory.InventoryCrafting; -import java.util.List; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; -public class NBTShapedRecipes implements IRecipe -{ - static List recipes; +import java.util.ArrayList; +import java.util.List; + +public class NBTShapedRecipes implements IRecipe { + static List recipes = new ArrayList<>(); + + public static void addRecipe(NBTShapedRecipe nbtShapedRecipe) { + NBTShapedRecipes.recipes.add(nbtShapedRecipe); + } @Override - public boolean matches(final InventoryCrafting inventory, final World world) { - for (final NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { + public boolean matches(InventoryCrafting inventory, World world) { + for (NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { if (recipe.matches(inventory, world)) { return true; } @@ -26,8 +26,8 @@ public class NBTShapedRecipes implements IRecipe } @Override - public ItemStack getCraftingResult(final InventoryCrafting inventory) { - for (final NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { + public ItemStack getCraftingResult(InventoryCrafting inventory) { + for (NBTShapedRecipe recipe : NBTShapedRecipes.recipes) { if (recipe.matches(inventory, null)) { return recipe.getCraftingResult(inventory); } @@ -44,12 +44,4 @@ public class NBTShapedRecipes implements IRecipe public ItemStack getRecipeOutput() { return null; } - - public static void addRecipe(final NBTShapedRecipe nbtShapedRecipe) { - NBTShapedRecipes.recipes.add(nbtShapedRecipe); - } - - static { - NBTShapedRecipes.recipes = new ArrayList(); - } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 3fc07608..636f6c7a 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -1,39 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; -import binnie.extratrees.block.PlankType; - -import net.minecraft.item.ItemStack; - +import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; +import binnie.extratrees.block.PlankType; import forestry.api.core.Tabs; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; -public class BlockCarpentry extends BlockDesign -{ +public class BlockCarpentry extends BlockDesign { public BlockCarpentry() { super(DesignSystem.Wood, Material.wood); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("carpentry"); - this.setResistance(5.0f); - this.setHardness(2.0f); - this.setStepSound(Block.soundTypeWood); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("carpentry"); + setResistance(5.0f); + setHardness(2.0f); + setStepSound(Block.soundTypeWood); } @Override - public ItemStack getCreativeStack(final IDesign design) { + public ItemStack getCreativeStack(IDesign design) { return ModuleCarpentry.getItemStack(this, PlankType.ExtraTreePlanks.Apple, PlankType.VanillaPlanks.BIRCH, design); } @Override - public String getBlockName(final DesignBlock design) { + public String getBlockName(DesignBlock design) { return Binnie.Language.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index ecda81f3..9e429d15 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -1,90 +1,97 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; +import binnie.Binnie; import binnie.core.block.BlockMetadata; -import net.minecraft.block.Block; -import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; -import binnie.extratrees.ExtraTrees; -import binnie.Binnie; -import binnie.core.block.TileEntityMetadata; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import java.util.List; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockCarpentryPanel extends BlockCarpentry -{ +import java.util.List; + +public class BlockCarpentryPanel extends BlockCarpentry { public BlockCarpentryPanel() { - this.useNeighborBrightness = true; - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); - this.setLightOpacity(0); + useNeighborBrightness = true; + setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); + setLightOpacity(0); + } + + public static boolean isValidPanelPlacement(World world, int x, int y, int z, ForgeDirection facing) { + if (facing == ForgeDirection.UNKNOWN) { + return false; + } + + int bx = x - facing.offsetX; + int by = y - facing.offsetY; + int bz = z - facing.offsetZ; + Block block = world.getBlock(bx, by, bz); + return block != null && block.isSideSolid(world, bx, by, bz, facing); } @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + // ignored } @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) - { - this.setBlockBoundsBasedOnState(world, x, y, z); + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + setBlockBoundsBasedOnState(world, x, y, z); return super.getCollisionBoundingBoxFromPool(world, x, y, z); } @Override - public void setBlockBoundsBasedOnState(final IBlockAccess world, final int x, final int y, final int z) { - final DesignBlock block = this.getCarpentryBlock(world, x, y, z); + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + DesignBlock block = getCarpentryBlock(world, x, y, z); switch (block.getFacing()) { - case DOWN: { - this.setBlockBounds(0.0f, 0.9375f, 0.0f, 1.0f, 1.0f, 1.0f); - break; - } - case EAST: { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 0.0625f, 1.0f, 1.0f); - break; - } - case NORTH: { - this.setBlockBounds(0.0f, 0.0f, 0.9375f, 1.0f, 1.0f, 1.0f); - break; - } - case SOUTH: { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0625f); - break; - } - case UP: { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); - break; - } - case WEST: { - this.setBlockBounds(0.9375f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - break; - } + case DOWN: + setBlockBounds(0.0f, 0.9375f, 0.0f, 1.0f, 1.0f, 1.0f); + break; + + case EAST: + setBlockBounds(0.0f, 0.0f, 0.0f, 0.0625f, 1.0f, 1.0f); + break; + + case NORTH: + setBlockBounds(0.0f, 0.0f, 0.9375f, 1.0f, 1.0f, 1.0f); + break; + + case SOUTH: + setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0625f); + break; + + case UP: + setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); + break; + + case WEST: + setBlockBounds(0.9375f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); + break; } } @Override public void setBlockBoundsForItemRender() { - this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); + setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); } @Override - public String getBlockName(final ItemStack itemStack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); + public String getBlockName(ItemStack stack) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); return Binnie.Language.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(final World par1World, final int par2, final int par3, final int par4) { - this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return AxisAlignedBB.getBoundingBox(par2 + this.minX, par3 + this.minY, par4 + this.minZ, par2 + this.maxX, par3 + this.maxY, par4 + this.maxZ); + public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { + setBlockBoundsBasedOnState(par1World, par2, par3, par4); + return AxisAlignedBB.getBoundingBox(par2 + minX, par3 + minY, par4 + minZ, par2 + maxX, par3 + maxY, par4 + maxZ); } @Override @@ -99,34 +106,23 @@ public class BlockCarpentryPanel extends BlockCarpentry @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(final IBlockAccess world, final int x, final int y, final int z, final int side) { + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return super.shouldSideBeRendered(world, x, y, z, side); } @Override - public DesignBlock getCarpentryBlock(final IBlockAccess world, final int x, final int y, final int z) { - return ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z)); - } - - public static boolean isValidPanelPlacement(final World world, final int x, final int y, final int z, final ForgeDirection facing) { - if (facing == ForgeDirection.UNKNOWN) { - return false; - } - final int bx = x - facing.offsetX; - final int by = y - facing.offsetY; - final int bz = z - facing.offsetZ; - final Block block = world.getBlock(bx, by, bz); - return block != null && block.isSideSolid(world, bx, by, bz, facing); + public DesignBlock getCarpentryBlock(IBlockAccess world, int x, int y, int z) { + return ModuleCarpentry.getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z)); } @Override - public int getPlacedMeta(final ItemStack itemStack, final World world, final int x, final int y, final int z, final ForgeDirection clickedBlock) { - final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); + public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection clickedBlock) { + DesignBlock block = ModuleCarpentry.getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); ForgeDirection facing = clickedBlock; boolean valid = true; if (!isValidPanelPlacement(world, x, y, z, facing)) { valid = false; - for (final ForgeDirection direction : ForgeDirection.values()) { + for (ForgeDirection direction : ForgeDirection.values()) { if (isValidPanelPlacement(world, x, y, z, direction)) { facing = direction; valid = true; @@ -134,22 +130,25 @@ public class BlockCarpentryPanel extends BlockCarpentry } } } + if (!valid) { return -1; } block.setFacing(facing); - return block.getBlockMetadata(this.getDesignSystem()); + return block.getBlockMetadata(getDesignSystem()); } @Override - public void onNeighborBlockChange(final World world, final int x, final int y, final int z, final Block par5) { - super.onNeighborBlockChange(world, x, y, z, par5); - final DesignBlock block = this.getCarpentryBlock(world, x, y, z); - if (!isValidPanelPlacement(world, x, y, z, block.getFacing())) { - for (final ItemStack stack : BlockMetadata.getBlockDropped(this, world, x, y, z, 0)) { - this.dropBlockAsItem(world, x, y, z, stack); - } - world.setBlockToAir(x, y, z); + public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { + super.onNeighborBlockChange(world, x, y, z, block); + DesignBlock carpentryBlock = getCarpentryBlock(world, x, y, z); + if (isValidPanelPlacement(world, x, y, z, carpentryBlock.getFacing())) { + return; } + + for (ItemStack stack : BlockMetadata.getBlockDropped(this, world, x, y, z, 0)) { + dropBlockAsItem(world, x, y, z, stack); + } + world.setBlockToAir(x, y, z); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 1119ee10..1fb3dff9 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -1,87 +1,93 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.block.Block; -import net.minecraft.util.IIcon; +import binnie.core.BinnieCore; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IMultipassBlock; +import binnie.core.block.MultipassBlockRenderer; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.IToolHammer; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.core.block.MultipassBlockRenderer; -import binnie.core.BinnieCore; -import binnie.extratrees.api.CarpentryManager; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import binnie.extratrees.api.IDesign; import net.minecraft.block.material.Material; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import binnie.core.block.TileEntityMetadata; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import binnie.extratrees.api.IToolHammer; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import binnie.extratrees.api.IDesignSystem; -import binnie.core.block.IMultipassBlock; -import binnie.core.block.BlockMetadata; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; -public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock -{ - IDesignSystem designSystem; - public static final ForgeDirection[] RENDER_DIRECTIONS; +import java.util.List; + +public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock { + public static ForgeDirection[] RENDER_DIRECTIONS = new ForgeDirection[]{ + ForgeDirection.DOWN, + ForgeDirection.UP, + ForgeDirection.EAST, + ForgeDirection.WEST, + ForgeDirection.NORTH, + ForgeDirection.SOUTH + }; + + protected IDesignSystem designSystem; + + public BlockDesign(IDesignSystem system, Material material) { + super(material); + designSystem = system; + } + + public static int getMetadata(int plank1, int plank2, int design) { + return plank1 + (plank2 << 9) + (design << 18); + } @SubscribeEvent - public void onClick(final PlayerInteractEvent event) { + public void onClick(PlayerInteractEvent event) { if (event.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { return; } - final World world = event.entityPlayer.worldObj; - final EntityPlayer player = event.entityPlayer; - final int x = event.x; - final int y = event.y; - final int z = event.z; + + World world = event.entityPlayer.worldObj; + EntityPlayer player = event.entityPlayer; + int x = event.x; + int y = event.y; + int z = event.z; if (!(world.getBlock(x, y, z) instanceof BlockDesign)) { return; } - final BlockDesign blockC = (BlockDesign) world.getBlock(x, y, z); - final ItemStack item = player.getHeldItem(); - if (item == null) { + + BlockDesign blockC = (BlockDesign) world.getBlock(x, y, z); + ItemStack item = player.getHeldItem(); + if (item == null + || !(item.getItem() instanceof IToolHammer) + || !((IToolHammer) item.getItem()).isActive(item)) { return; } - if (!(item.getItem() instanceof IToolHammer)) { - return; - } - if (!((IToolHammer) item.getItem()).isActive(item)) { - return; - } - final DesignBlock block = blockC.getCarpentryBlock(world, x, y, z); - final TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); + + DesignBlock block = blockC.getCarpentryBlock(world, x, y, z); + TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); block.rotate(event.face, item, player, world, x, y, z); - final int meta = block.getBlockMetadata(blockC.getDesignSystem()); + int meta = block.getBlockMetadata(blockC.getDesignSystem()); tile.setTileMetadata(meta, true); } - public BlockDesign(final IDesignSystem system, final Material material) { - super(material); - this.designSystem = system; - } - - public abstract ItemStack getCreativeStack(final IDesign p0); + public abstract ItemStack getCreativeStack(IDesign design); @Override - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) { - itemList.add(this.getCreativeStack(design)); + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) { + list.add(getCreativeStack(design)); } } public IDesignSystem getDesignSystem() { - return this.designSystem; + return designSystem; } @Override @@ -90,86 +96,79 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public String getBlockName(final ItemStack itemStack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); - return this.getBlockName(block); + public String getBlockName(ItemStack stack) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + return getBlockName(block); } - public abstract String getBlockName(final DesignBlock p0); + public abstract String getBlockName(DesignBlock p0); - public DesignBlock getCarpentryBlock(final IBlockAccess world, final int x, final int y, final int z) { - return ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z)); + public DesignBlock getCarpentryBlock(IBlockAccess world, int x, int y, int z) { + return ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getTileMetadata(world, x, y, z)); } @Override @SideOnly(Side.CLIENT) - public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { - final DesignBlock block = this.getCarpentryBlock(world, x, y, z); + public int colorMultiplier(IBlockAccess world, int x, int y, int z) { + DesignBlock block = getCarpentryBlock(world, x, y, z); return (MultipassBlockRenderer.getLayer() > 0) ? block.getSecondaryColour() : block.getPrimaryColour(); } @Override - public int colorMultiplier(final int meta) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), meta); + public int colorMultiplier(int meta) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), meta); return (MultipassBlockRenderer.getLayer() > 0) ? block.getSecondaryColour() : block.getPrimaryColour(); } @Override - public IIcon getIcon(final int side, final int damage) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), damage); - final IIcon icon = (MultipassBlockRenderer.getLayer() > 0) ? block.getSecondaryIcon(this.getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]) : block.getPrimaryIcon(this.getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]); - return icon; + public IIcon getIcon(int side, int damage) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), damage); + if (MultipassBlockRenderer.getLayer() > 0) { + return block.getSecondaryIcon(getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]); + } + return block.getPrimaryIcon(getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]); } @Override - public void getBlockTooltip(final ItemStack itemStack, final List tooltip) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); + public void getBlockTooltip(ItemStack stack, List tooltip) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); - } - else { + } else { tooltip.add(block.getPrimaryMaterial().getName()); } } - public int primaryColor(final int damage) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), damage); + public int primaryColor(int damage) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), damage); return block.getPrimaryColour(); } - public int secondaryColor(final int damage) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), damage); + public int secondaryColor(int damage) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), damage); return block.getSecondaryColour(); } - public ItemStack getItemStack(final int plank1, final int plank2, final int design) { + public ItemStack getItemStack(int plank1, int plank2, int design) { return TileEntityMetadata.getItemStack(this, getMetadata(plank1, plank2, design)); } - public static int getMetadata(final int plank1, final int plank2, final int design) { - return plank1 + (plank2 << 9) + (design << 18); - } - @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister register) { - for (final IDesignSystem system : DesignerManager.instance.getDesignSystems()) { + public void registerBlockIcons(IIconRegister register) { + for (IDesignSystem system : DesignerManager.instance.getDesignSystems()) { system.registerIcons(register); } } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), tileMeta); - return block.getItemMetadata(this.getDesignSystem()); + public int getDroppedMeta(int blockMeta, int tileMeta) { + DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), tileMeta); + return block.getItemMetadata(getDesignSystem()); } @Override public int getNumberOfPasses() { return 2; } - - static { - RENDER_DIRECTIONS = new ForgeDirection[] { ForgeDirection.DOWN, ForgeDirection.UP, ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.NORTH, ForgeDirection.SOUTH }; - } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index dbbe0be9..76804045 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -1,33 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; -import net.minecraft.item.ItemStack; -import binnie.extratrees.api.IDesign; -import net.minecraft.block.Block; import binnie.botany.Botany; -import net.minecraft.util.Facing; -import net.minecraft.world.IBlockAccess; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IDesign; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; import forestry.api.core.Tabs; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; -public class BlockStainedDesign extends BlockDesign -{ +import java.util.Random; + +public class BlockStainedDesign extends BlockDesign { public BlockStainedDesign() { super(DesignSystem.Glass, Material.glass); - this.setCreativeTab(Tabs.tabArboriculture); - this.setBlockName("stainedGlass"); + setCreativeTab(Tabs.tabArboriculture); + setBlockName("stainedGlass"); } @Override - public int quantityDropped(final Random p_149745_1_) { + public int quantityDropped(Random p_149745_1_) { return 0; } @@ -49,19 +44,21 @@ public class BlockStainedDesign extends BlockDesign @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(final IBlockAccess p_149646_1_, final int p_149646_2_, final int p_149646_3_, final int p_149646_4_, final int p_149646_5_) { - final Block block2 = p_149646_1_.getBlock(p_149646_2_ - Facing.offsetsXForSide[p_149646_5_], p_149646_3_ - Facing.offsetsYForSide[p_149646_5_], p_149646_4_ - Facing.offsetsZForSide[p_149646_5_]); - final Block block3 = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); - return block3 != this && block3 != Botany.stained && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { +// Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - Facing.offsetsZForSide[side]); + Block block = world.getBlock(x, y, z); + return block != this + && block != Botany.stained + && super.shouldSideBeRendered(world, x, y, z, side); } @Override - public ItemStack getCreativeStack(final IDesign design) { + public ItemStack getCreativeStack(IDesign design) { return ModuleCarpentry.getItemStack(this, GlassType.get(0), GlassType.get(1), design); } @Override - public String getBlockName(final DesignBlock design) { + public String getBlockName(DesignBlock design) { return Binnie.Language.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 521ffa71..6419c344 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -1,37 +1,33 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import java.util.HashMap; -import java.util.LinkedHashMap; -import net.minecraft.item.ItemStack; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; +import binnie.extratrees.api.ICarpentryInterface; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignCategory; +import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import binnie.extratrees.api.IDesignCategory; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignMaterial; -import java.util.Map; -import binnie.extratrees.api.ICarpentryInterface; +import net.minecraft.item.ItemStack; -public class CarpentryInterface implements ICarpentryInterface -{ - static Map woodMap; - static Map designMap; - static Map designCategories; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class CarpentryInterface implements ICarpentryInterface { + protected static Map woodMap = new LinkedHashMap<>(); + protected static Map designMap = new LinkedHashMap<>(); + protected static Map designCategories = new HashMap<>(); @Override - public boolean registerCarpentryWood(final int index, final IDesignMaterial wood) { + public boolean registerCarpentryWood(int index, IDesignMaterial wood) { return wood != null && CarpentryInterface.woodMap.put(index, wood) == null; } @Override - public int getCarpentryWoodIndex(final IDesignMaterial wood) { - for (final Integer integer : CarpentryInterface.woodMap.keySet()) { + public int getCarpentryWoodIndex(IDesignMaterial wood) { + for (Integer integer : CarpentryInterface.woodMap.keySet()) { if (CarpentryInterface.woodMap.get(integer).equals(wood)) { return integer; } @@ -40,18 +36,19 @@ public class CarpentryInterface implements ICarpentryInterface } @Override - public IDesignMaterial getWoodMaterial(final int index) { + public IDesignMaterial getWoodMaterial(int index) { return CarpentryInterface.woodMap.get(index); } @Override - public boolean registerDesign(final int index, final IDesign wood) { - return wood != null && CarpentryInterface.designMap.put(index, wood) == null; + public boolean registerDesign(int index, IDesign wood) { + return wood != null + && CarpentryInterface.designMap.put(index, wood) == null; } @Override - public int getDesignIndex(final IDesign wood) { - for (final Integer integer : CarpentryInterface.designMap.keySet()) { + public int getDesignIndex(IDesign wood) { + for (Integer integer : CarpentryInterface.designMap.keySet()) { if (CarpentryInterface.designMap.get(integer).equals(wood)) { return integer; } @@ -60,29 +57,31 @@ public class CarpentryInterface implements ICarpentryInterface } @Override - public IDesign getDesign(final int index) { + public IDesign getDesign(int index) { return CarpentryInterface.designMap.get(index); } @Override - public ILayout getLayout(final IPattern pattern, final boolean inverted) { + public ILayout getLayout(IPattern pattern, boolean inverted) { return Layout.get(pattern, inverted); } @Override - public boolean registerDesignCategory(final IDesignCategory category) { - return category != null && category.getId() != null && CarpentryInterface.designCategories.put(category.getId(), category) == null; + public boolean registerDesignCategory(IDesignCategory category) { + return category != null + && category.getId() != null + && CarpentryInterface.designCategories.put(category.getId(), category) == null; } @Override - public IDesignCategory getDesignCategory(final String id) { + public IDesignCategory getDesignCategory(String id) { return CarpentryInterface.designCategories.get(id); } @Override public Collection getAllDesignCategories() { - final List categories = new ArrayList(); - for (final IDesignCategory category : CarpentryInterface.designCategories.values()) { + List categories = new ArrayList(); + for (IDesignCategory category : CarpentryInterface.designCategories.values()) { if (category.getDesigns().size() > 0) { categories.add(category); } @@ -92,20 +91,21 @@ public class CarpentryInterface implements ICarpentryInterface @Override public List getSortedDesigns() { - final List designs = new ArrayList(); - for (final IDesignCategory category : this.getAllDesignCategories()) { + List designs = new ArrayList(); + for (IDesignCategory category : getAllDesignCategories()) { designs.addAll(category.getDesigns()); } return designs; } @Override - public IDesignMaterial getWoodMaterial(final ItemStack stack) { + public IDesignMaterial getWoodMaterial(ItemStack stack) { if (stack == null) { return null; } - for (final Map.Entry entry : CarpentryInterface.woodMap.entrySet()) { - final ItemStack key = entry.getValue().getStack(); + + for (Map.Entry entry : CarpentryInterface.woodMap.entrySet()) { + ItemStack key = entry.getValue().getStack(); if (key == null) { continue; } @@ -115,10 +115,4 @@ public class CarpentryInterface implements ICarpentryInterface } return null; } - - static { - CarpentryInterface.woodMap = new LinkedHashMap(); - CarpentryInterface.designMap = new LinkedHashMap(); - CarpentryInterface.designCategories = new HashMap(); - } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index 64b1cecb..08bba482 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,455 +1,442 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IToolHammer; -import net.minecraft.world.World; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IDesignSystem; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.IDesign; -public class DesignBlock -{ - IDesign design; - IDesignMaterial primaryMaterial; - IDesignMaterial secondaryMaterial; - int rotation; - ForgeDirection facing; - boolean panel; +public class DesignBlock { + protected IDesign design; + protected IDesignMaterial primaryMaterial; + protected IDesignMaterial secondaryMaterial; + protected int rotation; + protected ForgeDirection facing; + protected boolean panel; - @Override - public String toString() { - return super.toString() + " { design:" + this.design + " }, { primary:" + this.primaryMaterial + " }, { secondary:" + this.secondaryMaterial + " }, { rotation:" + this.rotation + " }, { facing:" + this.facing + " }"; - } - - public IDesign getDesign() { - return this.design; - } - - public IDesignMaterial getPrimaryMaterial() { - return this.primaryMaterial; - } - - public IDesignMaterial getSecondaryMaterial() { - return this.secondaryMaterial; - } - - DesignBlock(final IDesignSystem system, final IDesignMaterial primaryWood, final IDesignMaterial secondaryWood, final IDesign design, final int rotation, final ForgeDirection dir) { + DesignBlock(IDesignSystem system, IDesignMaterial primaryWood, IDesignMaterial secondaryWood, IDesign design, int rotation, ForgeDirection dir) { this.rotation = 0; - this.facing = ForgeDirection.UP; - this.panel = false; this.design = design; - this.primaryMaterial = primaryWood; - this.secondaryMaterial = secondaryWood; this.rotation = rotation; - this.facing = dir; + facing = ForgeDirection.UP; + panel = false; + primaryMaterial = primaryWood; + secondaryMaterial = secondaryWood; + facing = dir; + if (design == null) { this.design = EnumDesign.Blank; } if (primaryWood == null) { - this.primaryMaterial = system.getDefaultMaterial(); + primaryMaterial = system.getDefaultMaterial(); } if (secondaryWood == null) { - this.secondaryMaterial = system.getDefaultMaterial(); + secondaryMaterial = system.getDefaultMaterial(); } - if (this.rotation > 3 || this.rotation < 0) { + if (rotation > 3 || rotation < 0) { this.rotation = 0; } - if (this.facing == null || this.facing == ForgeDirection.UNKNOWN) { - this.facing = ForgeDirection.UP; + if (facing == null || facing == ForgeDirection.UNKNOWN) { + facing = ForgeDirection.UP; } } + @Override + public String toString() { + return super.toString() + " { design:" + design + " }, { primary:" + primaryMaterial + " }, { secondary:" + secondaryMaterial + " }, { rotation:" + rotation + " }, { facing:" + facing + " }"; + } + + public IDesign getDesign() { + return design; + } + + public IDesignMaterial getPrimaryMaterial() { + return primaryMaterial; + } + + public IDesignMaterial getSecondaryMaterial() { + return secondaryMaterial; + } + public int getPrimaryColour() { - return this.getPrimaryMaterial().getColour(); + return getPrimaryMaterial().getColour(); } public int getSecondaryColour() { - return this.getSecondaryMaterial().getColour(); + return getSecondaryMaterial().getColour(); } - ForgeDirection getRotation(final ForgeDirection dir, final ModuleCarpentry.Axis axis) { + // TODO unused method? + ForgeDirection getRotation(ForgeDirection dir, ModuleCarpentry.Axis axis) { if (axis == ModuleCarpentry.Axis.Y) { switch (dir) { - case EAST: { - return ForgeDirection.NORTH; + case EAST: + return ForgeDirection.NORTH; + + case NORTH: + return ForgeDirection.WEST; + + case SOUTH: + return ForgeDirection.EAST; + + case WEST: + return ForgeDirection.SOUTH; } - case NORTH: { - return ForgeDirection.WEST; - } - case SOUTH: { - return ForgeDirection.EAST; - } - case WEST: { - return ForgeDirection.SOUTH; - } - default: { - return dir; - } - } - } - else if (axis == ModuleCarpentry.Axis.X) { + return dir; + } else if (axis == ModuleCarpentry.Axis.X) { switch (dir) { - case EAST: { - return ForgeDirection.UP; + case EAST: + return ForgeDirection.UP; + + case UP: + return ForgeDirection.WEST; + + case WEST: + return ForgeDirection.DOWN; + + case DOWN: + return ForgeDirection.EAST; } - case UP: { - return ForgeDirection.WEST; - } - case WEST: { - return ForgeDirection.DOWN; - } - case DOWN: { - return ForgeDirection.EAST; - } - default: { - return dir; - } - } - } - else { + return dir; + } else { switch (dir) { - case SOUTH: { - return ForgeDirection.UP; - } - case UP: { - return ForgeDirection.NORTH; - } - case NORTH: { - return ForgeDirection.DOWN; - } - case DOWN: { - return ForgeDirection.SOUTH; - } - default: { - return dir; - } + case SOUTH: + return ForgeDirection.UP; + + case UP: + return ForgeDirection.NORTH; + + case NORTH: + return ForgeDirection.DOWN; + + case DOWN: + return ForgeDirection.SOUTH; } + return dir; } } public ILayout getLayout(ForgeDirection dir) { ForgeDirection adjustedDir; dir = (adjustedDir = dir.getRotation(ForgeDirection.DOWN)); - switch (this.getFacing()) { - case DOWN: { - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - break; + switch (getFacing()) { + case DOWN: + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + break; + + case EAST: + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + adjustedDir = adjustedDir.getRotation(ForgeDirection.NORTH); + break; + + case NORTH: + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); + adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); + break; + + case SOUTH: + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + break; + + case WEST: + adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); + adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); + break; } - case EAST: { - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - adjustedDir = adjustedDir.getRotation(ForgeDirection.NORTH); - break; - } - case NORTH: { - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); - adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); - break; - } - case SOUTH: { - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - break; - } - case WEST: { - adjustedDir = adjustedDir.getRotation(ForgeDirection.EAST); - adjustedDir = adjustedDir.getRotation(ForgeDirection.SOUTH); - break; - } - } - for (int i = 0; i < this.rotation; ++i) { + + for (int i = 0; i < rotation; ++i) { adjustedDir = adjustedDir.getRotation(ForgeDirection.DOWN); } - ILayout layout = null; + + ILayout layout; switch (adjustedDir) { - case EAST: { - layout = this.getDesign().getEastPattern(); - break; - } - case NORTH: { - layout = this.getDesign().getNorthPattern(); - break; - } - case SOUTH: { - layout = this.getDesign().getSouthPattern(); - break; - } - case WEST: { - layout = this.getDesign().getWestPattern(); - break; - } - case DOWN: { - layout = this.getDesign().getBottomPattern(); - break; - } - default: { - layout = this.getDesign().getTopPattern(); - break; - } - } - Label_1107: { - switch (this.getFacing()) { - case UP: { - if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break; - } + case EAST: + layout = getDesign().getEastPattern(); break; - } - case DOWN: { - switch (dir) { - case UP: - case DOWN: { - layout = layout.flipVertical(); - break; - } - case EAST: - case NORTH: - case SOUTH: - case WEST: { - layout = layout.rotateRight().rotateRight(); - break; - } - } - if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break; - } + + case NORTH: + layout = getDesign().getNorthPattern(); break; - } - case EAST: { - switch (dir) { - case SOUTH: + + case SOUTH: + layout = getDesign().getSouthPattern(); + break; + + case WEST: + layout = getDesign().getWestPattern(); + break; + + case DOWN: + layout = getDesign().getBottomPattern(); + break; + + default: + layout = getDesign().getTopPattern(); + } + + // TODO remove label + Label_1107: + { + switch (getFacing()) { case UP: { - layout = layout.rotateRight(); - break; - } - case NORTH: { - layout = layout.rotateLeft(); - break; - } - case DOWN: { - layout = layout.rotateLeft().flipHorizontal(); - break; - } - case WEST: { - layout = layout.flipHorizontal(); - break; - } - } - if (dir == ForgeDirection.EAST) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - } - if (dir == ForgeDirection.WEST) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); + if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateRight(); + } + break; } break; } - break; - } - case WEST: { - switch (dir) { - case NORTH: { - layout = layout.rotateRight(); - break; - } - case SOUTH: - case UP: { - layout = layout.rotateLeft(); - break; - } case DOWN: { - layout = layout.rotateLeft().flipVertical(); + switch (dir) { + case UP: + case DOWN: { + layout = layout.flipVertical(); + break; + } + case EAST: + case NORTH: + case SOUTH: + case WEST: { + layout = layout.rotateRight().rotateRight(); + break; + } + } + if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateLeft(); + } + break; + } break; } case EAST: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); + switch (dir) { + case SOUTH: + case UP: { + layout = layout.rotateRight(); + break; + } + case NORTH: { + layout = layout.rotateLeft(); + break; + } + case DOWN: { + layout = layout.rotateLeft().flipHorizontal(); + break; + } + case WEST: { + layout = layout.flipHorizontal(); + break; + } + } + if (dir == ForgeDirection.EAST) { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateRight(); + } + } + if (dir == ForgeDirection.WEST) { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateLeft(); + } + break; } break; } case WEST: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); + switch (dir) { + case NORTH: { + layout = layout.rotateRight(); + break; + } + case SOUTH: + case UP: { + layout = layout.rotateLeft(); + break; + } + case DOWN: { + layout = layout.rotateLeft().flipVertical(); + break; + } + case EAST: { + layout = layout.flipHorizontal(); + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateLeft(); + } + break; + } + case WEST: { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateRight(); + } + break; + } } break; } - } - break; - } - case NORTH: { - switch (dir) { - case WEST: { - layout = layout.rotateLeft(); - break Label_1107; - } - case EAST: { - layout = layout.rotateRight(); - break Label_1107; - } - case DOWN: { - layout = layout.flipHorizontal(); - break Label_1107; + case NORTH: { + switch (dir) { + case WEST: { + layout = layout.rotateLeft(); + break Label_1107; + } + case EAST: { + layout = layout.rotateRight(); + break Label_1107; + } + case DOWN: { + layout = layout.flipHorizontal(); + break Label_1107; + } + case SOUTH: { + layout = layout.flipHorizontal(); + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateLeft(); + } + break Label_1107; + } + case NORTH: { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateRight(); + } + break Label_1107; + } + default: { + break Label_1107; + } + } + } case SOUTH: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); + switch (dir) { + case EAST: { + layout = layout.rotateLeft(); + break Label_1107; + } + case WEST: { + layout = layout.rotateRight(); + break Label_1107; + } + case UP: { + layout = layout.rotateRight().rotateRight(); + break Label_1107; + } + case DOWN: { + layout = layout.flipVertical(); + break Label_1107; + } + case NORTH: { + layout = layout.flipHorizontal(); + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateLeft(); + } + break Label_1107; + } + case SOUTH: { + for (int j = 0; j < rotation; ++j) { + layout = layout.rotateRight(); + } + break Label_1107; + } + default: { + break Label_1107; + } } - break Label_1107; - } - case NORTH: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break Label_1107; - } - default: { - break Label_1107; - } - } - } - case SOUTH: { - switch (dir) { - case EAST: { - layout = layout.rotateLeft(); - break Label_1107; } - case WEST: { - layout = layout.rotateRight(); - break Label_1107; - } - case UP: { - layout = layout.rotateRight().rotateRight(); - break Label_1107; - } - case DOWN: { - layout = layout.flipVertical(); - break Label_1107; - } - case NORTH: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break Label_1107; - } - case SOUTH: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break Label_1107; - } - default: { - break Label_1107; - } - } - - } } } return layout; } - public IIcon getPrimaryIcon(final IDesignSystem system, final ForgeDirection dir) { - final ILayout l = this.getLayout(dir); - return (l == null) ? null : l.getPrimaryIcon(system); + public IIcon getPrimaryIcon(IDesignSystem system, ForgeDirection dir) { + ILayout layout = getLayout(dir); + return (layout == null) ? null : layout.getPrimaryIcon(system); } - public IIcon getSecondaryIcon(final IDesignSystem system, final ForgeDirection dir) { - final ILayout l = this.getLayout(dir); - return (l == null) ? null : l.getSecondaryIcon(system); + public IIcon getSecondaryIcon(IDesignSystem system, ForgeDirection dir) { + ILayout layout = getLayout(dir); + return (layout == null) ? null : layout.getSecondaryIcon(system); } - public IIcon getIcon(final IDesignSystem system, final boolean secondary, final ForgeDirection dir) { - return secondary ? this.getSecondaryIcon(system, dir) : this.getPrimaryIcon(system, dir); + public IIcon getIcon(IDesignSystem system, boolean secondary, ForgeDirection dir) { + return secondary ? getSecondaryIcon(system, dir) : getPrimaryIcon(system, dir); } public ForgeDirection getFacing() { - return this.facing; + return facing; + } + + public void setFacing(ForgeDirection facing) { + this.facing = facing; } public int getRotation() { - return this.rotation; + return rotation; } - public void rotate(final int face, final ItemStack hammer, final EntityPlayer player, final World world, final int x, final int y, final int z) { - final ForgeDirection dir = ForgeDirection.getOrientation(face); - final IToolHammer hammerI = (IToolHammer) hammer.getItem(); + public void rotate(int face, ItemStack hammer, EntityPlayer player, World world, int x, int y, int z) { + ForgeDirection dir = ForgeDirection.getOrientation(face); + IToolHammer hammerI = (IToolHammer) hammer.getItem(); if (player.isSneaking()) { - if (this.panel) { - ForgeDirection newFacing = this.getFacing(); + if (panel) { + ForgeDirection newFacing = getFacing(); do { newFacing = ForgeDirection.getOrientation(newFacing.ordinal() + 1); if (newFacing == ForgeDirection.UNKNOWN) { newFacing = ForgeDirection.DOWN; } - } while (newFacing != this.getFacing() && !BlockCarpentryPanel.isValidPanelPlacement(world, x, y, z, newFacing)); - if (newFacing != this.getFacing()) { + } while (newFacing != getFacing() && !BlockCarpentryPanel.isValidPanelPlacement(world, x, y, z, newFacing)); + + if (newFacing != getFacing()) { hammerI.onHammerUsed(hammer, player); } - this.setFacing(newFacing); - } - else { - if (dir != this.getFacing()) { + setFacing(newFacing); + } else { + if (dir != getFacing()) { hammerI.onHammerUsed(hammer, player); } - this.setFacing(dir); + setFacing(dir); } - } - else { - ++this.rotation; + } else { + rotation++; hammerI.onHammerUsed(hammer, player); } - if (this.rotation > 3) { - this.rotation = 0; + + if (rotation > 3) { + rotation = 0; } - if (this.rotation < 0) { - this.rotation = 3; + if (rotation < 0) { + rotation = 3; } } - public void setFacing(final ForgeDirection facing) { - this.facing = facing; - } - - public int getBlockMetadata(final IDesignSystem system) { + public int getBlockMetadata(IDesignSystem system) { return ModuleCarpentry.getBlockMetadata(system, this); } - public int getItemMetadata(final IDesignSystem system) { + public int getItemMetadata(IDesignSystem system) { return ModuleCarpentry.getItemMetadata(system, this); } public void setPanel() { - this.panel = true; + panel = true; } public String getString() { - String type = ""; - if (this.getPrimaryMaterial() != this.getSecondaryMaterial()) { - type = this.getPrimaryMaterial().getName() + " and " + this.getSecondaryMaterial().getName(); + String type; + if (getPrimaryMaterial() != getSecondaryMaterial()) { + type = getPrimaryMaterial().getName() + " and " + getSecondaryMaterial().getName(); + } else { + type = getPrimaryMaterial().getName(); } - else { - type = this.getPrimaryMaterial().getName(); - } - return super.toString() + " " + "{" + type + " " + this.getDesign().getName() + " " + (this.panel ? "Panel" : "Tile") + ", Facing:" + this.getFacing().toString() + ", Rotation:" + this.getRotation() + "}"; + return super.toString() + " " + "{" + type + " " + getDesign().getName() + " " + (panel ? "Panel" : "Tile") + ", Facing:" + getFacing().toString() + ", Rotation:" + getRotation() + "}"; } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index 15bc6d88..a2ecb976 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -1,163 +1,144 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import binnie.extratrees.ExtraTrees; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.extratrees.api.IPattern; -import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.item.ItemStack; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; -import binnie.extratrees.block.PlankType; import binnie.extratrees.api.IDesignMaterial; -import java.util.HashMap; -import net.minecraft.util.IIcon; -import java.util.Map; import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.api.IPattern; +import binnie.extratrees.block.PlankType; +import binnie.extratrees.item.ExtraTreeItems; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public enum DesignSystem implements IDesignSystem -{ +import java.util.HashMap; +import java.util.Map; + +public enum DesignSystem implements IDesignSystem { Wood, Glass; - Map primary; - Map secondary; + protected Map primary; + protected Map secondary; - private DesignSystem() { - this.primary = new HashMap(); - this.secondary = new HashMap(); + DesignSystem() { + primary = new HashMap<>(); + secondary = new HashMap<>(); DesignerManager.instance.registerDesignSystem(this); } @Override public IDesignMaterial getDefaultMaterial() { switch (this) { - case Glass: { - return GlassType.get(0); - } - case Wood: { - return PlankType.ExtraTreePlanks.Fir; - } - default: { - return null; - } + case Glass: { + return GlassType.get(0); + } + case Wood: { + return PlankType.ExtraTreePlanks.Fir; + } + default: { + return null; + } } } @Override public IDesignMaterial getDefaultMaterial2() { switch (this) { - case Glass: { - return GlassType.get(1); - } - case Wood: { - return PlankType.ExtraTreePlanks.Whitebeam; - } - default: { - return null; - } + case Glass: { + return GlassType.get(1); + } + case Wood: { + return PlankType.ExtraTreePlanks.Whitebeam; + } + default: { + return null; + } } } @Override - public IDesignMaterial getMaterial(final int id) { + public IDesignMaterial getMaterial(int id) { switch (this) { - case Glass: { - return GlassType.get(id); - } - case Wood: { - return CarpentryManager.carpentryInterface.getWoodMaterial(id); - } - default: { - return null; - } + case Glass: + return GlassType.get(id); + + case Wood: + return CarpentryManager.carpentryInterface.getWoodMaterial(id); } + return null; } @Override - public int getMaterialIndex(final IDesignMaterial id) { + public int getMaterialIndex(IDesignMaterial id) { switch (this) { - case Glass: { - return GlassType.getIndex(id); - } - case Wood: { - return CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id); - } - default: { - return 0; - } + case Glass: + return GlassType.getIndex(id); + + case Wood: + return CarpentryManager.carpentryInterface.getCarpentryWoodIndex(id); } + return 0; } public String getTexturePath() { switch (this) { - case Glass: { - return "glass"; - } - case Wood: { - return "patterns"; - } - default: { - return ""; - } + case Glass: + return "glass"; + + case Wood: + return "patterns"; } + return ""; } @Override - public IDesignMaterial getMaterial(final ItemStack stack) { + public IDesignMaterial getMaterial(ItemStack stack) { switch (this) { - case Glass: { - return GlassType.get(stack); - } - case Wood: { - return CarpentryManager.carpentryInterface.getWoodMaterial(stack); - } - default: { - return null; - } + case Glass: + return GlassType.get(stack); + + case Wood: + return CarpentryManager.carpentryInterface.getWoodMaterial(stack); } + return null; } @Override public ItemStack getAdhesive() { switch (this) { - case Glass: { - return ExtraTreeItems.GlassFitting.get(1); - } - case Wood: { - return ExtraTreeItems.WoodWax.get(1); - } - default: { - return null; - } - } - } + case Glass: + return ExtraTreeItems.GlassFitting.get(1); - @Override - public IIcon getPrimaryIcon(final IPattern pattern) { - if (pattern instanceof EnumPattern) { - return this.primary.get(((EnumPattern) pattern).ordinal()); + case Wood: + return ExtraTreeItems.WoodWax.get(1); } return null; } @Override - public IIcon getSecondaryIcon(final IPattern pattern) { + public IIcon getPrimaryIcon(IPattern pattern) { if (pattern instanceof EnumPattern) { - return this.secondary.get(((EnumPattern) pattern).ordinal()); + return primary.get(((EnumPattern) pattern).ordinal()); } return null; } @Override - public void registerIcons(final IIconRegister register) { - for (final EnumPattern pattern : EnumPattern.values()) { - this.primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0")); - this.secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, this.getMod().getModID(), this.getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1")); + public IIcon getSecondaryIcon(IPattern pattern) { + if (pattern instanceof EnumPattern) { + return secondary.get(((EnumPattern) pattern).ordinal()); + } + return null; + } + + @Override + public void registerIcons(IIconRegister register) { + for (EnumPattern pattern : EnumPattern.values()) { + primary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0")); + secondary.put(pattern.ordinal(), BinnieCore.proxy.getIcon(register, getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1")); } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java index d8c4b2df..853f2d57 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java @@ -1,36 +1,33 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import java.util.Collection; -import java.util.ArrayList; import binnie.extratrees.api.IDesignSystem; + +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -public class DesignerManager -{ +public class DesignerManager { public static DesignerManager instance; - List systems; - - public DesignerManager() { - this.systems = new ArrayList(); - } - - public void registerDesignSystem(final IDesignSystem system) { - this.systems.add(system); - } - - public Collection getDesignSystems() { - return this.systems; - } - - public void addDesignSystem(final DesignSystem system) { - this.systems.add(system); - } static { DesignerManager.instance = new DesignerManager(); } + + List systems; + + public DesignerManager() { + systems = new ArrayList<>(); + } + + public void registerDesignSystem(IDesignSystem system) { + systems.add(system); + } + + public Collection getDesignSystems() { + return systems; + } + + public void addDesignSystem(DesignSystem system) { + systems.add(system); + } } diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index e4411de3..530672fe 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -1,18 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; import binnie.extratrees.api.CarpentryManager; -import java.util.ArrayList; -import java.util.List; +import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IDesign; -public enum EnumDesign implements IDesign -{ +import java.util.ArrayList; +import java.util.List; + +public enum EnumDesign implements IDesign { Blank("Blank"), Octagon("Octagon"), Diamond("Diamond"), @@ -115,209 +111,6 @@ public enum EnumDesign implements IDesign OverlappedBarred("Overlapped Barred"), OverlappedSplitBarred("Overlapped Split Barred"); - String name; - ILayout topPattern; - ILayout bottomPattern; - ILayout northPattern; - ILayout southPattern; - ILayout eastPattern; - ILayout westPattern; - - void setEdgePatterns(final ILayout north, final ILayout east, final ILayout south, final ILayout west) { - this.setNorthPattern(north); - this.setEastPattern(east); - this.setSouthPattern(south); - this.setWestPattern(west); - } - - void setEdgePatterns(final ILayout face) { - this.setEdgePatterns(face, face, face, face); - } - - void setupStriped(final ILayout vert) { - this.setTopPattern(vert); - this.setEdgePatterns(vert.invert(), EnumPattern.Blank.layout(true), vert, EnumPattern.Blank.layout()); - } - - void setChequered(final ILayout cheq) { - this.setAllPatterns(cheq); - this.setNorthPattern(cheq.invert()); - this.setSouthPattern(cheq.invert()); - this.setBottomPattern(cheq.invert()); - } - - void setStripedChequered(final ILayout cheq, final ILayout stripe) { - this.setAllPatterns(cheq); - this.setNorthPattern(stripe.invert()); - this.setSouthPattern(stripe.invert()); - this.setEastPattern(stripe); - this.setWestPattern(stripe); - } - - void setCornered(final ILayout corner, final ILayout edge) { - this.setTopPattern(corner); - this.setNorthPattern(EnumPattern.Blank.layout()); - this.setEastPattern(edge.flipHorizontal()); - this.setSouthPattern(edge); - this.setWestPattern(EnumPattern.Blank.layout()); - } - - void setEdged(final ILayout edge) { - this.setAllPatterns(edge); - this.setWestPattern(EnumPattern.Blank.layout()); - this.setEastPattern(EnumPattern.Blank.layout(true)); - this.northPattern = this.northPattern.flipHorizontal(); - } - - void setBarred(final ILayout bar) { - this.setAllPatterns(bar); - this.setEastPattern(EnumPattern.Blank.layout(true)); - this.setWestPattern(EnumPattern.Blank.layout(true)); - } - - void setDiagonal(final ILayout diagonal, final ILayout edged) { - this.setAllPatterns(edged); - this.setTopPattern(diagonal); - this.northPattern = this.northPattern.flipHorizontal(); - this.southPattern = this.southPattern.flipHorizontal(); - } - - void setSaltire(final ILayout saltire, final ILayout bar) { - this.setTopPattern(saltire); - this.setEdgePatterns(bar.invert()); - } - - void setCross(final ILayout saltire, final ILayout bar) { - this.setTopPattern(saltire); - this.setEdgePatterns(bar); - } - - void setTSection(final ILayout tsection, final ILayout bar) { - this.setTopPattern(tsection); - this.setEdgePatterns(bar); - this.setWestPattern(EnumPattern.Blank.layout(true)); - } - - void setBarredCorner(final ILayout corner, final ILayout bar) { - this.setTSection(corner, bar); - this.setNorthPattern(EnumPattern.Blank.layout(true)); - } - - void setStripedCorner(final ILayout corner, final ILayout striped) { - this.setCornered(corner, striped); - } - - void setLetterPattern(final ILayout letter) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(letter); - this.setBottomPattern(EnumPattern.Blank.layout(true)); - } - - void setBarredEndPattern(final ILayout end, final ILayout bar) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(end); - this.setWestPattern(bar); - } - - void setDiagonalCorner(final ILayout diagonal, final ILayout bar, final ILayout edged) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(diagonal); - this.setWestPattern(bar.invert()); - this.setNorthPattern(edged.flipHorizontal()); - this.setSouthPattern(edged); - } - - void setDiagonalTSection(final ILayout diagonal, final ILayout bar, final ILayout edged) { - this.setAllPatterns(EnumPattern.Blank.layout(true)); - this.setTopPattern(diagonal); - this.setWestPattern(bar.invert()); - this.setNorthPattern(bar.invert()); - this.setEastPattern(edged.flipHorizontal()); - this.setSouthPattern(edged); - } - - private EnumDesign(final String name) { - this.topPattern = Layout.get(EnumPattern.Blank, false); - this.bottomPattern = Layout.get(EnumPattern.Blank, false); - this.northPattern = Layout.get(EnumPattern.Blank, false); - this.eastPattern = Layout.get(EnumPattern.Blank, false); - this.southPattern = Layout.get(EnumPattern.Blank, false); - this.westPattern = Layout.get(EnumPattern.Blank, false); - this.name = name; - } - - private void setAllPatterns(final ILayout layout) { - this.setTopPattern(layout); - this.setBottomPattern(layout); - this.setNorthPattern(layout); - this.setEastPattern(layout); - this.setSouthPattern(layout); - this.setWestPattern(layout); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public ILayout getTopPattern() { - return this.topPattern; - } - - public void setTopPattern(final ILayout layout) { - this.setBottomPattern(this.topPattern = layout); - } - - @Override - public ILayout getBottomPattern() { - return this.bottomPattern; - } - - public void setBottomPattern(final ILayout layout) { - this.bottomPattern = layout; - } - - @Override - public ILayout getNorthPattern() { - return this.northPattern; - } - - public void setNorthPattern(final ILayout layout) { - this.northPattern = layout; - } - - @Override - public ILayout getSouthPattern() { - return this.southPattern; - } - - public void setSouthPattern(final ILayout layout) { - this.southPattern = layout; - } - - @Override - public ILayout getEastPattern() { - return this.eastPattern; - } - - public void setEastPattern(final ILayout layout) { - this.eastPattern = layout; - } - - @Override - public ILayout getWestPattern() { - return this.westPattern; - } - - public void setWestPattern(final ILayout layout) { - this.westPattern = layout; - } - - public void setName(final String name) { - this.name = name; - } - static { Category.Design.addDesign(EnumDesign.Blank); Category.Design.addDesign(EnumDesign.Octagon); @@ -480,8 +273,210 @@ public enum EnumDesign implements IDesign EnumDesign.OverlappedBarred.setTopPattern(EnumPattern.OverlappedBarred.layout()); } - enum Category implements IDesignCategory - { + protected String name; + protected ILayout topPattern; + protected ILayout bottomPattern; + protected ILayout northPattern; + protected ILayout southPattern; + protected ILayout eastPattern; + protected ILayout westPattern; + + EnumDesign(String name) { + this.name = name; + topPattern = Layout.get(EnumPattern.Blank, false); + bottomPattern = Layout.get(EnumPattern.Blank, false); + northPattern = Layout.get(EnumPattern.Blank, false); + eastPattern = Layout.get(EnumPattern.Blank, false); + southPattern = Layout.get(EnumPattern.Blank, false); + westPattern = Layout.get(EnumPattern.Blank, false); + } + + void setEdgePatterns(ILayout north, ILayout east, ILayout south, ILayout west) { + setNorthPattern(north); + setEastPattern(east); + setSouthPattern(south); + setWestPattern(west); + } + + void setEdgePatterns(ILayout face) { + setEdgePatterns(face, face, face, face); + } + + void setupStriped(ILayout vert) { + setTopPattern(vert); + setEdgePatterns(vert.invert(), EnumPattern.Blank.layout(true), vert, EnumPattern.Blank.layout()); + } + + void setChequered(ILayout cheq) { + setAllPatterns(cheq); + setNorthPattern(cheq.invert()); + setSouthPattern(cheq.invert()); + setBottomPattern(cheq.invert()); + } + + void setStripedChequered(ILayout cheq, ILayout stripe) { + setAllPatterns(cheq); + setNorthPattern(stripe.invert()); + setSouthPattern(stripe.invert()); + setEastPattern(stripe); + setWestPattern(stripe); + } + + void setCornered(ILayout corner, ILayout edge) { + setTopPattern(corner); + setNorthPattern(EnumPattern.Blank.layout()); + setEastPattern(edge.flipHorizontal()); + setSouthPattern(edge); + setWestPattern(EnumPattern.Blank.layout()); + } + + void setEdged(ILayout edge) { + setAllPatterns(edge); + setWestPattern(EnumPattern.Blank.layout()); + setEastPattern(EnumPattern.Blank.layout(true)); + northPattern = northPattern.flipHorizontal(); + } + + void setBarred(ILayout bar) { + setAllPatterns(bar); + setEastPattern(EnumPattern.Blank.layout(true)); + setWestPattern(EnumPattern.Blank.layout(true)); + } + + void setDiagonal(ILayout diagonal, ILayout edged) { + setAllPatterns(edged); + setTopPattern(diagonal); + northPattern = northPattern.flipHorizontal(); + southPattern = southPattern.flipHorizontal(); + } + + void setSaltire(ILayout saltire, ILayout bar) { + setTopPattern(saltire); + setEdgePatterns(bar.invert()); + } + + void setCross(ILayout saltire, ILayout bar) { + setTopPattern(saltire); + setEdgePatterns(bar); + } + + void setTSection(ILayout tsection, ILayout bar) { + setTopPattern(tsection); + setEdgePatterns(bar); + setWestPattern(EnumPattern.Blank.layout(true)); + } + + void setBarredCorner(ILayout corner, ILayout bar) { + setTSection(corner, bar); + setNorthPattern(EnumPattern.Blank.layout(true)); + } + + void setStripedCorner(ILayout corner, ILayout striped) { + setCornered(corner, striped); + } + + void setLetterPattern(ILayout letter) { + setAllPatterns(EnumPattern.Blank.layout(true)); + setTopPattern(letter); + setBottomPattern(EnumPattern.Blank.layout(true)); + } + + void setBarredEndPattern(ILayout end, ILayout bar) { + setAllPatterns(EnumPattern.Blank.layout(true)); + setTopPattern(end); + setWestPattern(bar); + } + + void setDiagonalCorner(ILayout diagonal, ILayout bar, ILayout edged) { + setAllPatterns(EnumPattern.Blank.layout(true)); + setTopPattern(diagonal); + setWestPattern(bar.invert()); + setNorthPattern(edged.flipHorizontal()); + setSouthPattern(edged); + } + + void setDiagonalTSection(ILayout diagonal, ILayout bar, ILayout edged) { + setAllPatterns(EnumPattern.Blank.layout(true)); + setTopPattern(diagonal); + setWestPattern(bar.invert()); + setNorthPattern(bar.invert()); + setEastPattern(edged.flipHorizontal()); + setSouthPattern(edged); + } + + private void setAllPatterns(ILayout layout) { + setTopPattern(layout); + setBottomPattern(layout); + setNorthPattern(layout); + setEastPattern(layout); + setSouthPattern(layout); + setWestPattern(layout); + } + + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public ILayout getTopPattern() { + return topPattern; + } + + public void setTopPattern(ILayout layout) { + setBottomPattern(topPattern = layout); + } + + @Override + public ILayout getBottomPattern() { + return bottomPattern; + } + + public void setBottomPattern(ILayout layout) { + bottomPattern = layout; + } + + @Override + public ILayout getNorthPattern() { + return northPattern; + } + + public void setNorthPattern(ILayout layout) { + northPattern = layout; + } + + @Override + public ILayout getSouthPattern() { + return southPattern; + } + + public void setSouthPattern(ILayout layout) { + southPattern = layout; + } + + @Override + public ILayout getEastPattern() { + return eastPattern; + } + + public void setEastPattern(ILayout layout) { + eastPattern = layout; + } + + @Override + public ILayout getWestPattern() { + return westPattern; + } + + public void setWestPattern(ILayout layout) { + westPattern = layout; + } + + enum Category implements IDesignCategory { Design("Designs & Emblems"), Stripes("Squares & Stripes"), Edges("Edges"), @@ -489,33 +484,33 @@ public enum EnumDesign implements IDesign Letters("Letters"), Diagonal("Diagonals"); - String name; - List designs; + protected String name; + protected List designs; - private Category(final String name) { - this.designs = new ArrayList(); + Category(String name) { this.name = name; + designs = new ArrayList<>(); CarpentryManager.carpentryInterface.registerDesignCategory(this); } @Override public String getName() { - return this.name; + return name; } @Override public List getDesigns() { - return this.designs; + return designs; } @Override - public void addDesign(final IDesign design) { - this.designs.add(design); + public void addDesign(IDesign design) { + designs.add(design); } @Override public String getId() { - return this.toString().toLowerCase(); + return toString().toLowerCase(); } } } diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index 9802bded..ad14bbc1 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -1,17 +1,12 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; -public enum EnumPattern implements IPattern -{ +public enum EnumPattern implements IPattern { Blank, Octagon, Diamond, @@ -226,122 +221,6 @@ public enum EnumPattern implements IPattern OverlappedBarred, OverlappedBarred2; - ILayout leftRotation; - ILayout horizontalFlip; - - private EnumPattern() { - this.leftRotation = Layout.get(this, false); - this.horizontalFlip = Layout.get(this, false); - } - - static void setupStripedPattern(final EnumPattern vert, final EnumPattern hori) { - vert.setLeftRotation(hori, true); - hori.setLeftRotation(vert, false); - vert.setHorizontalFlip(vert, true); - } - - static void setupChequeredPattern(final EnumPattern cheq) { - cheq.setLeftRotation(cheq, true); - cheq.setHorizontalFlip(cheq, true); - } - - static void setupCornerPattern(final EnumPattern tl, final EnumPattern tr, final EnumPattern br, final EnumPattern bl) { - tl.setLeftRotation(bl, false); - tr.setLeftRotation(tl, false); - br.setLeftRotation(tr, false); - bl.setLeftRotation(br, false); - tl.setHorizontalFlip(tr, false); - bl.setHorizontalFlip(br, false); - } - - static void setupInvert2Rot(final EnumPattern a, final EnumPattern b) { - a.setLeftRotation(b, true); - b.setLeftRotation(a, false); - a.setHorizontalFlip(b, false); - } - - static void set2Rotation(final EnumPattern a, final EnumPattern b) { - a.setLeftRotation(b, false); - b.setLeftRotation(a, false); - a.setHorizontalFlip(b, false); - } - - static void setupBarredPattern(final EnumPattern vert, final EnumPattern hori) { - vert.setLeftRotation(hori, false); - hori.setLeftRotation(vert, false); - } - - static void setupEdgedPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) { - l.setLeftRotation(b, false); - t.setLeftRotation(l, false); - r.setLeftRotation(t, false); - b.setLeftRotation(r, false); - l.setHorizontalFlip(r, false); - } - - static void setupDiagonalPattern(final EnumPattern a, final EnumPattern b) { - a.setLeftRotation(b, false); - b.setLeftRotation(a, false); - a.setHorizontalFlip(b, false); - } - - static void setupBarredPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) { - l.setLeftRotation(b, false); - t.setLeftRotation(l, false); - r.setLeftRotation(t, false); - b.setLeftRotation(r, false); - l.setHorizontalFlip(r, false); - } - - static void setupTSectionPattern(final EnumPattern l, final EnumPattern t, final EnumPattern r, final EnumPattern b) { - setupEdgedPattern(l, t, r, b); - } - - @Override - public IIcon getPrimaryIcon(final IDesignSystem system) { - return system.getPrimaryIcon(this); - } - - private static void setupRotation(final EnumPattern t, final EnumPattern r, final EnumPattern b, final EnumPattern l) { - setupEdgedPattern(l, t, r, b); - } - - private void setHorizontalFlip(final EnumPattern pattern, final boolean inverted) { - this.horizontalFlip = Layout.get(pattern, inverted); - pattern.horizontalFlip = Layout.get(this, inverted); - } - - @Override - public IIcon getSecondaryIcon(final IDesignSystem system) { - return system.getSecondaryIcon(this); - } - - @Override - public ILayout getRotation() { - return this.leftRotation; - } - - @Override - public ILayout getHorizontalFlip() { - return this.horizontalFlip; - } - - protected void setLeftRotation(final EnumPattern pattern, final boolean inverted) { - this.leftRotation = Layout.get(pattern, inverted); - } - - @Override - public void registerIcons(final IIconRegister register) { - } - - public ILayout layout() { - return this.layout(false); - } - - public ILayout layout(final boolean invert) { - return Layout.get(this, invert); - } - static { setupStripedPattern(EnumPattern.ThinStriped, EnumPattern.ThinStriped2); setupStripedPattern(EnumPattern.Striped, EnumPattern.Striped2); @@ -404,4 +283,120 @@ public enum EnumPattern implements IPattern EnumPattern.OverlappedSplitBarred.setLeftRotation(EnumPattern.OverlappedSplitBarred2, false); EnumPattern.OverlappedSplitBarred2.setLeftRotation(EnumPattern.OverlappedSplitBarred, false); } + + protected ILayout leftRotation; + protected ILayout horizontalFlip; + + EnumPattern() { + leftRotation = Layout.get(this, false); + horizontalFlip = Layout.get(this, false); + } + + static void setupStripedPattern(EnumPattern vert, EnumPattern hori) { + vert.setLeftRotation(hori, true); + hori.setLeftRotation(vert, false); + vert.setHorizontalFlip(vert, true); + } + + static void setupChequeredPattern(EnumPattern cheq) { + cheq.setLeftRotation(cheq, true); + cheq.setHorizontalFlip(cheq, true); + } + + static void setupCornerPattern(EnumPattern tl, EnumPattern tr, EnumPattern br, EnumPattern bl) { + tl.setLeftRotation(bl, false); + tr.setLeftRotation(tl, false); + br.setLeftRotation(tr, false); + bl.setLeftRotation(br, false); + tl.setHorizontalFlip(tr, false); + bl.setHorizontalFlip(br, false); + } + + static void setupInvert2Rot(EnumPattern a, EnumPattern b) { + a.setLeftRotation(b, true); + b.setLeftRotation(a, false); + a.setHorizontalFlip(b, false); + } + + static void set2Rotation(EnumPattern a, EnumPattern b) { + a.setLeftRotation(b, false); + b.setLeftRotation(a, false); + a.setHorizontalFlip(b, false); + } + + static void setupBarredPattern(EnumPattern vert, EnumPattern hori) { + vert.setLeftRotation(hori, false); + hori.setLeftRotation(vert, false); + } + + static void setupEdgedPattern(EnumPattern l, EnumPattern t, EnumPattern r, EnumPattern b) { + l.setLeftRotation(b, false); + t.setLeftRotation(l, false); + r.setLeftRotation(t, false); + b.setLeftRotation(r, false); + l.setHorizontalFlip(r, false); + } + + static void setupDiagonalPattern(EnumPattern a, EnumPattern b) { + a.setLeftRotation(b, false); + b.setLeftRotation(a, false); + a.setHorizontalFlip(b, false); + } + + static void setupBarredPattern(EnumPattern l, EnumPattern t, EnumPattern r, EnumPattern b) { + l.setLeftRotation(b, false); + t.setLeftRotation(l, false); + r.setLeftRotation(t, false); + b.setLeftRotation(r, false); + l.setHorizontalFlip(r, false); + } + + static void setupTSectionPattern(EnumPattern l, EnumPattern t, EnumPattern r, EnumPattern b) { + setupEdgedPattern(l, t, r, b); + } + + private static void setupRotation(EnumPattern t, EnumPattern r, EnumPattern b, EnumPattern l) { + setupEdgedPattern(l, t, r, b); + } + + @Override + public IIcon getPrimaryIcon(IDesignSystem system) { + return system.getPrimaryIcon(this); + } + + private void setHorizontalFlip(EnumPattern pattern, boolean inverted) { + horizontalFlip = Layout.get(pattern, inverted); + pattern.horizontalFlip = Layout.get(this, inverted); + } + + @Override + public IIcon getSecondaryIcon(IDesignSystem system) { + return system.getSecondaryIcon(this); + } + + @Override + public ILayout getRotation() { + return leftRotation; + } + + @Override + public ILayout getHorizontalFlip() { + return horizontalFlip; + } + + protected void setLeftRotation(EnumPattern pattern, boolean inverted) { + leftRotation = Layout.get(pattern, inverted); + } + + @Override + public void registerIcons(IIconRegister register) { + } + + public ILayout layout() { + return layout(false); + } + + public ILayout layout(boolean invert) { + return Layout.get(this, invert); + } } diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index a7925b6e..28a14b59 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -1,52 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import binnie.botany.genetics.EnumFlowerColor; -import java.util.LinkedHashMap; -import binnie.core.block.TileEntityMetadata; import binnie.botany.Botany; -import net.minecraft.block.Block; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.api.IDesignMaterial; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; + +import java.util.LinkedHashMap; import java.util.Map; -import binnie.extratrees.api.IDesignMaterial; -public class GlassType implements IDesignMaterial -{ - static Map types; - String name; - int colour; - int id; +public class GlassType implements IDesignMaterial { + protected static Map types; - private GlassType(final int id, final String name, final int colour) { + static { + GlassType.types = new LinkedHashMap<>(); + for (StandardColor c : StandardColor.values()) { + GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.colour)); + } + for (EnumFlowerColor c2 : EnumFlowerColor.values()) { + GlassType.types.put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getName(), c2.getColor(false))); + } + } + + protected String name; + protected int colour; + protected int id; + + private GlassType(int id, String name, int colour) { this.id = id; this.name = name; this.colour = colour; } - @Override - public ItemStack getStack() { - if (this.id < 128) { - return new ItemStack(Blocks.stained_glass, 1, this.id); - } - return TileEntityMetadata.getItemStack(Botany.stained, this.id - 128); - } - - @Override - public String getName() { - return this.name; - } - - @Override - public int getColour() { - return this.colour; - } - - public static int getIndex(final IDesignMaterial id) { - for (final Map.Entry entry : GlassType.types.entrySet()) { + public static int getIndex(IDesignMaterial id) { + for (Map.Entry entry : GlassType.types.entrySet()) { if (entry.getValue() == id) { return entry.getKey(); } @@ -54,15 +42,15 @@ public class GlassType implements IDesignMaterial return 0; } - public static IDesignMaterial get(final int id) { + public static IDesignMaterial get(int id) { return GlassType.types.get(id); } - public static IDesignMaterial get(final ItemStack stack) { + public static IDesignMaterial get(ItemStack stack) { if (stack == null) { return null; } - for (final Map.Entry entry : GlassType.types.entrySet()) { + for (Map.Entry entry : GlassType.types.entrySet()) { if (stack.isItemEqual(entry.getValue().getStack())) { return entry.getValue(); } @@ -70,18 +58,25 @@ public class GlassType implements IDesignMaterial return null; } - static { - GlassType.types = new LinkedHashMap(); - for (final StandardColor c : StandardColor.values()) { - GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.colour)); - } - for (final EnumFlowerColor c2 : EnumFlowerColor.values()) { - GlassType.types.put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getName(), c2.getColor(false))); + @Override + public ItemStack getStack() { + if (id < 128) { + return new ItemStack(Blocks.stained_glass, 1, id); } + return TileEntityMetadata.getItemStack(Botany.stained, id - 128); } - private enum StandardColor - { + @Override + public String getName() { + return name; + } + + @Override + public int getColour() { + return colour; + } + + private enum StandardColor { White("White", 16777215), Orange("Orange", 14188339), Magenta("Magenta", 11685080), @@ -99,10 +94,10 @@ public class GlassType implements IDesignMaterial Red("Red", 10040115), Black("Black", 1644825); - String name; - int colour; + protected String name; + protected int colour; - private StandardColor(final String name, final int colour) { + StandardColor(String name, int colour) { this.name = name; this.colour = colour; } diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/src/main/java/binnie/extratrees/carpentry/Layout.java index 16cd4cf1..432ad605 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/src/main/java/binnie/extratrees/carpentry/Layout.java @@ -1,82 +1,77 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import net.minecraft.util.IIcon; import binnie.extratrees.api.IDesignSystem; -import binnie.extratrees.api.IPattern; import binnie.extratrees.api.ILayout; +import binnie.extratrees.api.IPattern; +import net.minecraft.util.IIcon; -public class Layout implements ILayout -{ - IPattern pattern; - boolean inverted; +public class Layout implements ILayout { + protected IPattern pattern; + protected boolean inverted; - @Override - public IPattern getPattern() { - return this.pattern; - } - - @Override - public boolean isInverted() { - return this.inverted; - } - - private Layout(final IPattern pattern, final boolean inverted) { + private Layout(IPattern pattern, boolean inverted) { this.pattern = pattern; this.inverted = inverted; } - private Layout(final IPattern pattern) { + private Layout(IPattern pattern) { this(pattern, false); } - ILayout newLayout(final ILayout newLayout) { - return new Layout(newLayout.getPattern(), this.inverted ^ newLayout.isInverted()); + public static ILayout get(IPattern pattern, boolean inverted) { + return new Layout(pattern, inverted); + } + + public static ILayout get(IPattern pattern) { + return new Layout(pattern, false); + } + + @Override + public IPattern getPattern() { + return pattern; + } + + @Override + public boolean isInverted() { + return inverted; + } + + ILayout newLayout(ILayout newLayout) { + return new Layout(newLayout.getPattern(), inverted ^ newLayout.isInverted()); } @Override public ILayout rotateRight() { - return this.rotateLeft().rotateLeft().rotateLeft(); + return rotateLeft().rotateLeft().rotateLeft(); } @Override public ILayout rotateLeft() { - return this.newLayout(this.pattern.getRotation()); + return newLayout(pattern.getRotation()); } @Override public ILayout flipHorizontal() { - return this.newLayout(this.pattern.getHorizontalFlip()); + return newLayout(pattern.getHorizontalFlip()); } @Override public ILayout flipVertical() { - return this.newLayout(this.pattern.getHorizontalFlip().rotateLeft().rotateLeft()); + return newLayout(pattern.getHorizontalFlip().rotateLeft().rotateLeft()); } @Override - public IIcon getPrimaryIcon(final IDesignSystem system) { - return this.inverted ? this.pattern.getSecondaryIcon(system) : this.pattern.getPrimaryIcon(system); + public IIcon getPrimaryIcon(IDesignSystem system) { + return inverted ? pattern.getSecondaryIcon(system) : pattern.getPrimaryIcon(system); } @Override - public IIcon getSecondaryIcon(final IDesignSystem system) { - return this.inverted ? this.pattern.getPrimaryIcon(system) : this.pattern.getSecondaryIcon(system); + public IIcon getSecondaryIcon(IDesignSystem system) { + return inverted ? pattern.getPrimaryIcon(system) : pattern.getSecondaryIcon(system); } @Override public ILayout invert() { - return new Layout(this.pattern, !this.inverted); - } - - public static ILayout get(final IPattern pattern, final boolean inverted) { - return new Layout(pattern, inverted); - } - - public static ILayout get(final IPattern pattern) { - return new Layout(pattern, false); + return new Layout(pattern, !inverted); } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 4aafc4f5..c800506d 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -1,29 +1,76 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.carpentry; -import binnie.extratrees.api.IDesignSystem; -import binnie.core.block.TileEntityMetadata; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraft.item.ItemStack; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.CarpentryManager; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.client.IItemRenderer; -import binnie.core.block.MultipassItemRenderer; -import net.minecraft.item.Item; import binnie.core.BinnieCore; -import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import binnie.core.block.ItemMetadata; -import binnie.extratrees.ExtraTrees; import binnie.core.IInitializable; +import binnie.core.block.ItemMetadata; +import binnie.core.block.MultipassItemRenderer; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.api.IDesignSystem; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + +public class ModuleCarpentry implements IInitializable { + static { + CarpentryManager.carpentryInterface = new CarpentryInterface(); + } + + public static ItemStack getItemStack(BlockDesign block, IDesignMaterial type1, IDesignMaterial type2, IDesign design) { + return getItemStack(block, block.getDesignSystem().getMaterialIndex(type1), block.getDesignSystem().getMaterialIndex(type2), CarpentryManager.carpentryInterface.getDesignIndex(design)); + } + + public static ItemStack getItemStack(BlockDesign block, int type1, int type2, int design) { + return TileEntityMetadata.getItemStack(block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal())); + } + + public static ItemStack getItemStack(BlockDesign blockC, DesignBlock block) { + return getItemStack(blockC, block.getPrimaryMaterial(), block.getSecondaryMaterial(), block.getDesign()); + } + + public static int getMetadata(int plank1, int plank2, int design, int rotation, int facing) { + return plank1 + (plank2 << 8) + (design << 16) + (rotation << 26) + (facing << 28); + } + + public static DesignBlock getDesignBlock(IDesignSystem system, int meta) { + int plankID1 = meta & 0xFF; + int plankID2 = meta >> 8 & 0xFF; + int tile = meta >> 16 & 0x3FF; + int rotation = meta >> 26 & 0x3; + int axis = meta >> 28 & 0x7; + IDesignMaterial type1 = system.getMaterial(plankID1); + IDesignMaterial type2 = system.getMaterial(plankID2); + IDesign type3 = CarpentryManager.carpentryInterface.getDesign(tile); + return new DesignBlock(system, type1, type2, type3, rotation, ForgeDirection.getOrientation(axis)); + } + + public static DesignBlock getCarpentryPanel(IDesignSystem system, int meta) { + DesignBlock block = getDesignBlock(system, meta); + block.setPanel(); + return block; + } + + public static int getBlockMetadata(IDesignSystem system, DesignBlock block) { + int plank1 = system.getMaterialIndex(block.getPrimaryMaterial()); + int plank2 = system.getMaterialIndex(block.getSecondaryMaterial()); + int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign()); + int rotation = block.getRotation(); + int facing = block.getFacing().ordinal(); + return getMetadata(plank1, plank2, design, rotation, facing); + } + + public static int getItemMetadata(IDesignSystem system, DesignBlock block) { + int plank1 = system.getMaterialIndex(block.getPrimaryMaterial()); + int plank2 = system.getMaterialIndex(block.getSecondaryMaterial()); + int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign()); + return getMetadata(plank1, plank2, design, 0, ForgeDirection.UP.ordinal()); + } -public class ModuleCarpentry implements IInitializable -{ @Override public void preInit() { ExtraTrees.blockCarpentry = new BlockCarpentry(); @@ -40,73 +87,19 @@ public class ModuleCarpentry implements IInitializable @Override public void init() { + // ignored } @Override public void postInit() { - for (final EnumDesign design : EnumDesign.values()) { + for (EnumDesign design : EnumDesign.values()) { CarpentryManager.carpentryInterface.registerDesign(design.ordinal(), design); } } - public static ItemStack getItemStack(final BlockDesign block, final IDesignMaterial type1, final IDesignMaterial type2, final IDesign design) { - return getItemStack(block, block.getDesignSystem().getMaterialIndex(type1), block.getDesignSystem().getMaterialIndex(type2), CarpentryManager.carpentryInterface.getDesignIndex(design)); - } - - public static ItemStack getItemStack(final BlockDesign block, final int type1, final int type2, final int design) { - return TileEntityMetadata.getItemStack(block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal())); - } - - public static ItemStack getItemStack(final BlockDesign blockC, final DesignBlock block) { - return getItemStack(blockC, block.getPrimaryMaterial(), block.getSecondaryMaterial(), block.getDesign()); - } - - public static int getMetadata(final int plank1, final int plank2, final int design, final int rotation, final int facing) { - return plank1 + (plank2 << 8) + (design << 16) + (rotation << 26) + (facing << 28); - } - - public static DesignBlock getDesignBlock(final IDesignSystem system, final int meta) { - final int plankID1 = meta & 0xFF; - final int plankID2 = meta >> 8 & 0xFF; - final int tile = meta >> 16 & 0x3FF; - final int rotation = meta >> 26 & 0x3; - final int axis = meta >> 28 & 0x7; - final IDesignMaterial type1 = system.getMaterial(plankID1); - final IDesignMaterial type2 = system.getMaterial(plankID2); - final IDesign type3 = CarpentryManager.carpentryInterface.getDesign(tile); - return new DesignBlock(system, type1, type2, type3, rotation, ForgeDirection.getOrientation(axis)); - } - - public static DesignBlock getCarpentryPanel(final IDesignSystem system, final int meta) { - final DesignBlock block = getDesignBlock(system, meta); - block.setPanel(); - return block; - } - - public static int getBlockMetadata(final IDesignSystem system, final DesignBlock block) { - final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial()); - final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial()); - final int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign()); - final int rotation = block.getRotation(); - final int facing = block.getFacing().ordinal(); - return getMetadata(plank1, plank2, design, rotation, facing); - } - - public static int getItemMetadata(final IDesignSystem system, final DesignBlock block) { - final int plank1 = system.getMaterialIndex(block.getPrimaryMaterial()); - final int plank2 = system.getMaterialIndex(block.getSecondaryMaterial()); - final int design = CarpentryManager.carpentryInterface.getDesignIndex(block.getDesign()); - return getMetadata(plank1, plank2, design, 0, ForgeDirection.UP.ordinal()); - } - - static { - CarpentryManager.carpentryInterface = new CarpentryInterface(); - } - - enum Axis - { + enum Axis { Y, X, - Z; + Z } } diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/src/main/java/binnie/extratrees/config/ConfigurationMain.java index 19da7dca..44c77e37 100644 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -1,21 +1,15 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.config; -import binnie.core.mod.config.PropBoolean; -import binnie.core.mod.config.ConfigProperty; import binnie.core.mod.config.ConfigFile; +import binnie.core.mod.config.ConfigProperty; +import binnie.core.mod.config.PropBoolean; @ConfigFile(filename = "/config/forestry/extratrees/main.conf") -public class ConfigurationMain -{ - @ConfigProperty(key = "lemon.citrus.family", comment = { "Uses reflection to convert the Forestry lemon tree to the Citrus family." }) +public class ConfigurationMain { + @ConfigProperty( + key = "lemon.citrus.family", + comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."} + ) @PropBoolean - public static boolean alterLemon; - - static { - ConfigurationMain.alterLemon = true; - } + public static boolean alterLemon = true; } diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index 44689f55..adae992e 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -1,51 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.core; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; import binnie.core.resource.BinnieResource; -import binnie.core.resource.ResourceType; import binnie.core.resource.IBinnieTexture; +import binnie.core.resource.ResourceType; +import binnie.extratrees.ExtraTrees; -public enum ExtraTreeTexture implements IBinnieTexture -{ +public enum ExtraTreeTexture implements IBinnieTexture { Gui(ResourceType.GUI, "gui"), Nursery(ResourceType.Tile, "Nursery"); - String texture; - ResourceType type; - public static String carpenterTexture; - public static String panelerTexture; - public static String tileworkerTexture; - public static String incubatorTexture; - public static String lumbermillTexture; - public static String pressTexture; - public static String distilleryTexture; - public static String breweryTexture; - public static String infuserTexture; + public static String carpenterTexture = "extratrees/carpenter_"; + public static String panelerTexture = "extratrees/paneler_"; + public static String tileworkerTexture = "extratrees/tileworker_"; + public static String incubatorTexture = "extratrees/incubator_"; + public static String lumbermillTexture = "extratrees/sawmill_"; + public static String pressTexture = "extratrees/press_"; + public static String distilleryTexture = "extratrees/distillery_"; + public static String breweryTexture = "extratrees/brewery_"; + public static String infuserTexture = "extratrees/infuser_"; - private ExtraTreeTexture(final ResourceType base, final String texture) { + protected String texture; + protected ResourceType type; + + ExtraTreeTexture(ResourceType base, String texture) { this.texture = texture; - this.type = base; + type = base; } @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(ExtraTrees.instance, this.type, this.texture); - } - - static { - ExtraTreeTexture.carpenterTexture = "extratrees/carpenter_"; - ExtraTreeTexture.panelerTexture = "extratrees/paneler_"; - ExtraTreeTexture.tileworkerTexture = "extratrees/tileworker_"; - ExtraTreeTexture.incubatorTexture = "extratrees/incubator_"; - ExtraTreeTexture.lumbermillTexture = "extratrees/sawmill_"; - ExtraTreeTexture.pressTexture = "extratrees/press_"; - ExtraTreeTexture.distilleryTexture = "extratrees/distillery_"; - ExtraTreeTexture.breweryTexture = "extratrees/brewery_"; - ExtraTreeTexture.infuserTexture = "extratrees/infuser_"; + return Binnie.Resource.getPNG(ExtraTrees.instance, type, texture); } } diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index a684d312..c7e7a2b2 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -1,28 +1,23 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.core; -import net.minecraft.tileentity.TileEntity; -import binnie.extratrees.craftgui.dictionary.WindowSetSquare; -import binnie.extratrees.craftgui.dictionary.WindowLepidopteristDatabase; -import binnie.extratrees.craftgui.dictionary.WindowDistillery; -import binnie.extratrees.craftgui.dictionary.WindowBrewery; -import binnie.extratrees.craftgui.dictionary.WindowPress; -import binnie.extratrees.craftgui.kitchen.WindowBottleRack; -import binnie.extratrees.craftgui.dictionary.WindowLumbermill; -import binnie.extratrees.craftgui.dictionary.WindowWoodworker; -import binnie.extratrees.craftgui.dictionary.WindowArboristDatabase; -import net.minecraft.inventory.IInventory; import binnie.core.craftgui.minecraft.Window; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.gui.IBinnieGUID; +import binnie.extratrees.craftgui.dictionary.WindowArboristDatabase; +import binnie.extratrees.craftgui.dictionary.WindowBrewery; +import binnie.extratrees.craftgui.dictionary.WindowDistillery; +import binnie.extratrees.craftgui.dictionary.WindowLepidopteristDatabase; +import binnie.extratrees.craftgui.dictionary.WindowLumbermill; +import binnie.extratrees.craftgui.dictionary.WindowPress; +import binnie.extratrees.craftgui.dictionary.WindowSetSquare; +import binnie.extratrees.craftgui.dictionary.WindowWoodworker; +import binnie.extratrees.craftgui.kitchen.WindowBottleRack; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public enum ExtraTreesGUID implements IBinnieGUID -{ +public enum ExtraTreesGUID implements IBinnieGUID { Database, Woodworker, Lumbermill, @@ -38,52 +33,51 @@ public enum ExtraTreesGUID implements IBinnieGUID SetSquare; @Override - public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { + public Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side) { Window window = null; - final TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); IInventory object = null; if (tileEntity instanceof IInventory) { object = (IInventory) tileEntity; } switch (this) { - case Database: - case DatabaseNEI: { - window = WindowArboristDatabase.create(player, side, this != ExtraTreesGUID.Database); - break; - } - case Woodworker: { - window = WindowWoodworker.create(player, object, side); - break; - } - case Lumbermill: { - window = WindowLumbermill.create(player, object, side); - break; - } - case KitchenBottleRack: { - window = WindowBottleRack.create(player, object, side); - break; - } - case Press: { - window = WindowPress.create(player, object, side); - break; - } - case Brewery: { - window = WindowBrewery.create(player, object, side); - break; - } - case Distillery: { - window = WindowDistillery.create(player, object, side); - break; - } - case MothDatabase: - case MothDatabaseNEI: { - window = WindowLepidopteristDatabase.create(player, side, this != ExtraTreesGUID.MothDatabase); - break; - } - case SetSquare: { - window = WindowSetSquare.create(player, world, x, y, z, side); - break; - } + case Database: + case DatabaseNEI: + window = WindowArboristDatabase.create(player, side, this != ExtraTreesGUID.Database); + break; + + case Woodworker: + window = WindowWoodworker.create(player, object, side); + break; + + case Lumbermill: + window = WindowLumbermill.create(player, object, side); + break; + + case KitchenBottleRack: + window = WindowBottleRack.create(player, object, side); + break; + + case Press: + window = WindowPress.create(player, object, side); + break; + + case Brewery: + window = WindowBrewery.create(player, object, side); + break; + + case Distillery: + window = WindowDistillery.create(player, object, side); + break; + + case MothDatabase: + case MothDatabaseNEI: + window = WindowLepidopteristDatabase.create(player, side, this != ExtraTreesGUID.MothDatabase); + break; + + case SetSquare: + window = WindowSetSquare.create(player, world, x, y, z, side); + break; } return window; } diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index d373c42a..b89e1fa0 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -1,153 +1,150 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.core; -import java.util.Queue; -import java.io.IOException; - -import binnie.extratrees.carpentry.EnumPattern; -import binnie.extratrees.api.CarpentryManager; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.genetics.ExtraTreeFruitGene; -import binnie.extratrees.block.PlankType; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.block.ILogType; -import binnie.extratrees.genetics.ExtraTreeSpecies; -import forestry.api.arboriculture.IAlleleTreeSpecies; - -import java.util.LinkedList; -import java.io.PrintWriter; -import java.io.FileWriter; - import binnie.core.BinnieCore; import binnie.core.IInitializable; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.block.ILogType; +import binnie.extratrees.block.PlankType; +import binnie.extratrees.genetics.ExtraTreeFruitGene; +import binnie.extratrees.genetics.ExtraTreeSpecies; +import forestry.api.arboriculture.IAlleleTreeSpecies; -public class ModuleCore implements IInitializable -{ +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Queue; + +public class ModuleCore implements IInitializable { @Override public void preInit() { + // ignored } @Override public void init() { + // ignored } @Override public void postInit() { - if (BinnieCore.proxy.isDebug()) { - try { - final PrintWriter outputSpecies = new PrintWriter(new FileWriter("data/species.html")); - final PrintWriter outputLogs = new PrintWriter(new FileWriter("data/logs.html")); - final PrintWriter outputPlanks = new PrintWriter(new FileWriter("data/planks.html")); - final PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html")); - final PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html")); - final Queue speciesQueue = new LinkedList(); - for (final IAlleleTreeSpecies s : ExtraTreeSpecies.values()) { - speciesQueue.add(s); + if (!BinnieCore.proxy.isDebug()) { + return; + } + + try { + PrintWriter outputSpecies = new PrintWriter(new FileWriter("data/species.html")); + PrintWriter outputLogs = new PrintWriter(new FileWriter("data/logs.html")); + PrintWriter outputPlanks = new PrintWriter(new FileWriter("data/planks.html")); + PrintWriter outputFruit = new PrintWriter(new FileWriter("data/fruit.html")); + PrintWriter outputDesigns = new PrintWriter(new FileWriter("data/designs.html")); + Queue speciesQueue = new LinkedList<>(); + Collections.addAll(speciesQueue, ExtraTreeSpecies.values()); + + Queue logQueue = new LinkedList<>(); + Collections.addAll(logQueue, ILogType.ExtraTreeLog.values()); + + Queue plankQueue = new LinkedList<>(); + Collections.addAll(plankQueue, PlankType.ExtraTreePlanks.values()); + + Queue fruitQueue = new LinkedList<>(); + Collections.addAll(fruitQueue, ExtraTreeFruitGene.values()); + + Queue designQueue = new LinkedList<>(); + designQueue.addAll(CarpentryManager.carpentryInterface.getSortedDesigns()); + + fruitQueue.remove(ExtraTreeFruitGene.Apple); + outputSpecies.println(""); + while (!speciesQueue.isEmpty()) { + outputSpecies.println(""); + for (int i = 0; i < 4; ++i) { + IAlleleTreeSpecies species = speciesQueue.poll(); + outputSpecies.println(""); } - final Queue logQueue = new LinkedList(); - for (final ILogType wood : ILogType.ExtraTreeLog.values()) { - logQueue.add(wood); - } - final Queue plankQueue = new LinkedList(); - for (final IDesignMaterial wood2 : PlankType.ExtraTreePlanks.values()) { - plankQueue.add(wood2); - } - final Queue fruitQueue = new LinkedList(); - for (final ExtraTreeFruitGene wood3 : ExtraTreeFruitGene.values()) { - fruitQueue.add(wood3); - } - final Queue designQueue = new LinkedList(); - for (final IDesign wood4 : CarpentryManager.carpentryInterface.getSortedDesigns()) { - designQueue.add(wood4); - } - fruitQueue.remove(ExtraTreeFruitGene.Apple); - outputSpecies.println("
" + ((species == null) ? "" : species.getName()) + "
"); - while (!speciesQueue.isEmpty()) { - outputSpecies.println(""); - for (int i = 0; i < 4; ++i) { - final IAlleleTreeSpecies species = speciesQueue.poll(); - outputSpecies.println(""); - } - outputSpecies.println(""); - } - outputSpecies.println("
" + ((species == null) ? "" : species.getName()) + "
"); - outputLogs.println(""); - while (!logQueue.isEmpty()) { - outputLogs.println(""); - for (int i = 0; i < 4; ++i) { - final ILogType.ExtraTreeLog wood5 = (ILogType.ExtraTreeLog) logQueue.poll(); - if (wood5 == null) { - outputLogs.println(""); - } - else { - final String img = "\"""; - outputLogs.println(""); - } - } - outputLogs.println(""); - } - outputLogs.println("
" + img + " " + wood5.getName() + "
"); - outputPlanks.println(""); - while (!plankQueue.isEmpty()) { - outputPlanks.println(""); - for (int i = 0; i < 4; ++i) { - final IDesignMaterial wood2 = plankQueue.poll(); - if (wood2 == null) { - outputPlanks.println(""); - } - else { - final String img = "\"""; - outputPlanks.println(""); - } - } - outputPlanks.println(""); - } - outputPlanks.println("
" + img + " " + wood2.getName() + "
"); - outputFruit.println(""); - while (!fruitQueue.isEmpty()) { - outputFruit.println(""); - for (int i = 0; i < 4; ++i) { - final ExtraTreeFruitGene wood6 = fruitQueue.poll(); - if (wood6 == null) { - outputFruit.println(""); - } - else { - final String fruit = wood6.getNameOfFruit(); - final String img2 = "\"""; - outputFruit.println(""); - } - } - outputFruit.println(""); - } - outputFruit.println("
" + img2 + " " + wood6.getName() + "
"); - outputDesigns.println(""); - while (!designQueue.isEmpty()) { - outputDesigns.println(""); - for (int i = 0; i < 4; ++i) { - final IDesign wood4 = designQueue.poll(); - if (wood4 == null) { - outputDesigns.println(""); - } - else { - final String texture = ((EnumPattern) wood4.getTopPattern().getPattern()).toString().toLowerCase(); - final String img2 = "\"""; - outputDesigns.println(""); - } - } - outputDesigns.println(""); - } - outputDesigns.println("
" + img2 + " " + wood4.getName() + "
"); - outputSpecies.close(); - outputLogs.close(); - outputPlanks.close(); - outputFruit.close(); - outputDesigns.close(); - } catch (IOException e) { - e.printStackTrace(); + outputSpecies.println(""); } + + outputSpecies.println(""); + outputLogs.println(""); + + while (!logQueue.isEmpty()) { + outputLogs.println(""); + for (int i = 0; i < 4; ++i) { + ILogType.ExtraTreeLog wood5 = (ILogType.ExtraTreeLog) logQueue.poll(); + if (wood5 == null) { + outputLogs.println(""); + } else { + String img = "\"""; + outputLogs.println(""); + } + } + outputLogs.println(""); + } + + outputLogs.println("
" + img + " " + wood5.getName() + "
"); + outputPlanks.println(""); + + while (!plankQueue.isEmpty()) { + outputPlanks.println(""); + for (int i = 0; i < 4; ++i) { + IDesignMaterial wood2 = plankQueue.poll(); + if (wood2 == null) { + outputPlanks.println(""); + } else { + String img = "\"""; + outputPlanks.println(""); + } + } + outputPlanks.println(""); + } + + outputPlanks.println("
" + img + " " + wood2.getName() + "
"); + outputFruit.println(""); + + while (!fruitQueue.isEmpty()) { + outputFruit.println(""); + for (int i = 0; i < 4; ++i) { + ExtraTreeFruitGene wood6 = fruitQueue.poll(); + if (wood6 == null) { + outputFruit.println(""); + } else { + String fruit = wood6.getNameOfFruit(); + String img2 = "\"""; + outputFruit.println(""); + } + } + outputFruit.println(""); + } + + outputFruit.println("
" + img2 + " " + wood6.getName() + "
"); + outputDesigns.println(""); + + while (!designQueue.isEmpty()) { + outputDesigns.println(""); + for (int i = 0; i < 4; ++i) { + IDesign wood4 = designQueue.poll(); + if (wood4 == null) { + outputDesigns.println(""); + } else { + String texture = wood4.getTopPattern().getPattern().toString().toLowerCase(); + String img2 = "\"""; + outputDesigns.println(""); + } + } + outputDesigns.println(""); + } + + outputDesigns.println("
" + img2 + " " + wood4.getName() + "
"); + outputSpecies.close(); + outputLogs.close(); + outputPlanks.close(); + outputFruit.close(); + outputDesigns.close(); + } catch (IOException e) { + e.printStackTrace(); } } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBlockIconDisplay.java index e02e38a9..2c01c9f9 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBlockIconDisplay.java @@ -1,26 +1,21 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; -import net.minecraft.util.IIcon; import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.IPoint; +import net.minecraft.util.IIcon; -public class ControlBlockIconDisplay extends Control -{ - IIcon icon; +public class ControlBlockIconDisplay extends Control { + protected IIcon icon; - public ControlBlockIconDisplay(final IWidget parent, final float x, final float y, final IIcon icon) { + public ControlBlockIconDisplay(IWidget parent, float x, float y, IIcon icon) { super(parent, x, y, 18.0f, 18.0f); this.icon = icon; } @Override public void onRenderBackground() { - CraftGUI.Render.iconBlock(IPoint.ZERO, this.icon); + CraftGUI.Render.iconBlock(IPoint.ZERO, icon); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java index c4e31c33..acb3dd20 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java @@ -1,65 +1,67 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.machines.Machine; +import binnie.core.util.ItemStackSet; import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.machines.Brewery; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; -import binnie.core.craftgui.WidgetAttribute; -import net.minecraft.item.ItemStack; -import binnie.core.util.ItemStackSet; import org.lwjgl.opengl.GL11; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.machines.Machine; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.Window; -import binnie.extratrees.machines.Brewery; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.minecraft.control.ControlProgressBase; -public class ControlBreweryProgress extends ControlProgressBase -{ - static Texture Brewery; - static Texture BreweryOverlay; +import java.util.Collections; + +public class ControlBreweryProgress extends ControlProgressBase { + protected static Texture Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui); + protected static Texture BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui); + + protected ControlBreweryProgress(IWidget parent, float x, float y) { + super(parent, x, y, 34.0f, 39.0f); + addAttribute(WidgetAttribute.MouseOver); + } @Override public void onRenderBackground() { CraftGUI.Render.texture(ControlBreweryProgress.Brewery, new IPoint(0.0f, 0.0f)); - final Brewery.ComponentBreweryLogic logic = Machine.getInterface(Brewery.ComponentBreweryLogic.class, Window.get(this).getInventory()); + Brewery.ComponentBreweryLogic logic = Machine.getInterface(Brewery.ComponentBreweryLogic.class, Window.get(this).getInventory()); if (logic.currentCrafting == null) { return; } if (logic.currentCrafting.currentInput == null) { return; } - final int fermentedHeight = (int) (32.0f * logic.getProgress() / 100.0f); - CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 6.0f).add(this.getAbsolutePosition()), new IPoint(32.0f, 32 - fermentedHeight))); + + int fermentedHeight = (int) (32.0f * logic.getProgress() / 100.0f); + CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 6.0f).add(getAbsolutePosition()), new IPoint(32.0f, 32 - fermentedHeight))); GL11.glEnable(3089); - this.renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 6.0f)); - this.renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 6.0f)); - this.renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 22.0f)); - this.renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 22.0f)); + renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 6.0f)); + renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 6.0f)); + renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 22.0f)); + renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 22.0f)); GL11.glDisable(3089); - CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 38 - fermentedHeight).add(this.getAbsolutePosition()), new IPoint(32.0f, fermentedHeight))); + CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 38 - fermentedHeight).add(getAbsolutePosition()), new IPoint(32.0f, fermentedHeight))); GL11.glEnable(3089); - this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 6.0f)); - this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 6.0f)); - this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 22.0f)); - this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 22.0f)); + renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 6.0f)); + renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 6.0f)); + renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 22.0f)); + renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 22.0f)); GL11.glDisable(3089); - final ItemStackSet stacks = new ItemStackSet(); - for (final ItemStack stack : logic.currentCrafting.inputs) { - stacks.add(stack); - } + + ItemStackSet stacks = new ItemStackSet(); + Collections.addAll(stacks, logic.currentCrafting.inputs); stacks.add(logic.currentCrafting.ingr); int x = 1; int y = 6; - for (final ItemStack stack : stacks) { + for (ItemStack stack : stacks) { CraftGUI.Render.item(new IPoint(x, y), stack); x += 16; if (x > 18) { @@ -73,26 +75,16 @@ public class ControlBreweryProgress extends ControlProgressBase public void onRenderForeground() { } - protected ControlBreweryProgress(final IWidget parent, final float x, final float y) { - super(parent, x, y, 34.0f, 39.0f); - this.addAttribute(WidgetAttribute.MouseOver); - } - - public void renderFluid(final FluidStack fluid, final IPoint pos) { - final int hex = fluid.getFluid().getColor(fluid); - final int r = (hex & 0xFF0000) >> 16; - final int g = (hex & 0xFF00) >> 8; - final int b = hex & 0xFF; - final IIcon icon = fluid.getFluid().getIcon(); + public void renderFluid(FluidStack fluid, IPoint pos) { + int hex = fluid.getFluid().getColor(fluid); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; + IIcon icon = fluid.getFluid().getIcon(); GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); GL11.glEnable(3042); GL11.glBlendFunc(770, 771); CraftGUI.Render.iconBlock(pos, fluid.getFluid().getIcon()); GL11.glDisable(3042); } - - static { - ControlBreweryProgress.Brewery = new StandardTexture(0, 69, 34, 39, ExtraTreeTexture.Gui); - ControlBreweryProgress.BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlDistilleryProgress.java index f743780d..c577dba9 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlDistilleryProgress.java @@ -1,98 +1,85 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extratrees.core.ExtraTreeTexture; -import net.minecraft.util.IIcon; -import org.lwjgl.opengl.GL11; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.events.EventMouse; -import net.minecraftforge.fluids.FluidStack; -import binnie.core.machines.Machine; +import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.Window; -import binnie.extratrees.machines.Distillery; -import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.machines.Machine; +import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.machines.Distillery; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; -public class ControlDistilleryProgress extends ControlProgressBase -{ - static Texture DistilleryBase; - static Texture DistilleryOverlay; - static Texture LiquidFlow; - static Texture Output; +public class ControlDistilleryProgress extends ControlProgressBase { + protected static Texture DistilleryBase = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui); + protected static Texture DistilleryOverlay = new StandardTexture(139, 0, 18, 66, ExtraTreeTexture.Gui); + protected static Texture LiquidFlow = new StandardTexture(101, 0, 38, 66, ExtraTreeTexture.Gui); + protected static Texture Output = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui); + + protected ControlDistilleryProgress(IWidget parent, float x, float y) { + super(parent, x, y, 58.0f, 66.0f); + addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(EventMouse.Down event) { + int distillationLevel = -1; + if (new IArea(45.0f, 8.0f, 19.0f, 11.0f).contains(getRelativeMousePosition())) { + distillationLevel = 0; + } else if (new IArea(45.0f, 23.0f, 19.0f, 11.0f).contains(getRelativeMousePosition())) { + distillationLevel = 1; + } else if (new IArea(45.0f, 38.0f, 19.0f, 11.0f).contains(getRelativeMousePosition())) { + distillationLevel = 2; + } + if (distillationLevel >= 0) { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setByte("i", (byte) distillationLevel); + Window.get(getWidget()).sendClientAction("still-level", nbt); + } + } + }); + } @Override public void onRenderBackground() { CraftGUI.Render.texture(ControlDistilleryProgress.DistilleryBase, new IPoint(0.0f, 0.0f)); - CraftGUI.Render.texturePercentage(ControlDistilleryProgress.LiquidFlow, new IArea(18.0f, 0.0f, 38.0f, 66.0f), Position.Left, this.progress); - final Distillery.ComponentDistilleryLogic component = Machine.getInterface(Distillery.ComponentDistilleryLogic.class, Window.get(this).getInventory()); + CraftGUI.Render.texturePercentage(ControlDistilleryProgress.LiquidFlow, new IArea(18.0f, 0.0f, 38.0f, 66.0f), Position.Left, progress); + Distillery.ComponentDistilleryLogic component = Machine.getInterface(Distillery.ComponentDistilleryLogic.class, Window.get(this).getInventory()); FluidStack stack = null; if (component != null) { stack = component.currentFluid; } + if (stack != null) { for (int y = 0; y < 4; ++y) { - this.renderFluid(stack, new IPoint(1.0f, 1 + y * 16)); + renderFluid(stack, new IPoint(1.0f, 1 + y * 16)); } } } @Override public void onRenderForeground() { - final int level = Machine.getInterface(Distillery.ComponentDistilleryLogic.class, Window.get(this).getInventory()).level; + int level = Machine.getInterface(Distillery.ComponentDistilleryLogic.class, Window.get(this).getInventory()).level; CraftGUI.Render.texture(ControlDistilleryProgress.Output, new IPoint(47.0f, 14 + level * 15)); CraftGUI.Render.texture(ControlDistilleryProgress.DistilleryOverlay, new IPoint(0.0f, 0.0f)); } - protected ControlDistilleryProgress(final IWidget parent, final float x, final float y) { - super(parent, x, y, 58.0f, 66.0f); - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - int distillationLevel = -1; - if (new IArea(45.0f, 8.0f, 19.0f, 11.0f).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 0; - } - else if (new IArea(45.0f, 23.0f, 19.0f, 11.0f).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 1; - } - else if (new IArea(45.0f, 38.0f, 19.0f, 11.0f).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { - distillationLevel = 2; - } - if (distillationLevel >= 0) { - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setByte("i", (byte) distillationLevel); - Window.get(ControlDistilleryProgress.this.getWidget()).sendClientAction("still-level", nbt); - } - } - }); - } - - public void renderFluid(final FluidStack fluid, final IPoint pos) { - final int hex = fluid.getFluid().getColor(fluid); - final int r = (hex & 0xFF0000) >> 16; - final int g = (hex & 0xFF00) >> 8; - final int b = hex & 0xFF; - final IIcon icon = fluid.getFluid().getIcon(); + public void renderFluid(FluidStack fluid, IPoint pos) { + int hex = fluid.getFluid().getColor(fluid); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; + IIcon icon = fluid.getFluid().getIcon(); GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); GL11.glEnable(3042); GL11.glBlendFunc(770, 771); CraftGUI.Render.iconBlock(pos, fluid.getFluid().getIcon()); GL11.glDisable(3042); } - - static { - ControlDistilleryProgress.DistilleryBase = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui); - ControlDistilleryProgress.DistilleryOverlay = new StandardTexture(139, 0, 18, 66, ExtraTreeTexture.Gui); - ControlDistilleryProgress.LiquidFlow = new StandardTexture(101, 0, 38, 66, ExtraTreeTexture.Gui); - ControlDistilleryProgress.Output = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java index 311d948b..d99e67bd 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java @@ -1,43 +1,55 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.WidgetAttribute; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.machines.Press; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.WidgetAttribute; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; -import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; -import binnie.extratrees.machines.Press; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.resource.Texture; -import binnie.core.craftgui.minecraft.control.ControlProgressBase; -public class ControlFruitPressProgress extends ControlProgressBase -{ - static Texture PressTexture; - static Texture PressSlot; +public class ControlFruitPressProgress extends ControlProgressBase { + protected static Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); + protected static Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui); + + protected ControlFruitPressProgress(IWidget parent, float x, float y) { + super(parent, x, y, 37.0f, 69.0f); + addAttribute(WidgetAttribute.MouseOver); + addSelfEventHandler(new EventMouse.Down.Handler() { + @Override + public void onEvent(EventMouse.Down event) { + if (event.getButton() == 0) { + NBTTagCompound action = new NBTTagCompound(); + Window.get(getWidget()).sendClientAction("fruitpress-click", action); + } else if (event.getButton() == 1) { + NBTTagCompound action = new NBTTagCompound(); + Window.get(getWidget()).sendClientAction("clear-fruit", action); + } + } + }); + } @Override public void onRenderBackground() { CraftGUI.Render.texture(ControlFruitPressProgress.PressSlot, new IPoint(3.0f, 52.0f)); - final ItemStack input = Window.get(this).getContainer().getSlotFromInventory(Window.get(this).getInventory(), Press.slotCurrent).getStack(); + ItemStack input = Window.get(this).getContainer().getSlotFromInventory(Window.get(this).getInventory(), Press.slotCurrent).getStack(); if (input == null || Press.getOutput(input) == null) { return; } - final Fluid fluid = Press.getOutput(input).getFluid(); - final int hex = fluid.getColor(Press.getOutput(input)); - final int r = (hex & 0xFF0000) >> 16; - final int g = (hex & 0xFF00) >> 8; - final int b = hex & 0xFF; + Fluid fluid = Press.getOutput(input).getFluid(); + int hex = fluid.getColor(Press.getOutput(input)); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; IIcon icon = fluid.getIcon(); GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); GL11.glEnable(3042); @@ -50,29 +62,6 @@ public class ControlFruitPressProgress extends ControlProgressBase @Override public void onRenderForeground() { - CraftGUI.Render.texture(ControlFruitPressProgress.PressTexture, new IPoint(0.0f, 16.0f * this.progress)); - } - - protected ControlFruitPressProgress(final IWidget parent, final float x, final float y) { - super(parent, x, y, 37.0f, 69.0f); - this.addAttribute(WidgetAttribute.MouseOver); - this.addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(final EventMouse.Down event) { - if (event.getButton() == 0) { - final NBTTagCompound action = new NBTTagCompound(); - Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("fruitpress-click", action); - } - else if (event.getButton() == 1) { - final NBTTagCompound action = new NBTTagCompound(); - Window.get(ControlFruitPressProgress.this.getWidget()).sendClientAction("clear-fruit", action); - } - } - }); - } - - static { - ControlFruitPressProgress.PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); - ControlFruitPressProgress.PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui); + CraftGUI.Render.texture(ControlFruitPressProgress.PressTexture, new IPoint(0.0f, 16.0f * progress)); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlLumbermillProgress.java index 68254f44..7a4a1810 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlLumbermillProgress.java @@ -1,52 +1,56 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extratrees.core.ExtraTreeTexture; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.window.Panel; -import net.minecraft.util.IIcon; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import binnie.core.craftgui.geometry.IArea; -import net.minecraft.item.ItemBlock; -import binnie.extratrees.machines.Lumbermill; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.CraftGUI; -import org.lwjgl.opengl.GL11; -import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.minecraft.MinecraftGUI; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlProgressBase; +import binnie.core.craftgui.resource.Texture; +import binnie.core.craftgui.resource.minecraft.StandardTexture; +import binnie.core.craftgui.window.Panel; +import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.machines.Lumbermill; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import org.lwjgl.opengl.GL11; -public class ControlLumbermillProgress extends ControlProgressBase -{ - float oldProgress; - float animation; - static Texture Saw; - static Texture Saw2; +public class ControlLumbermillProgress extends ControlProgressBase { + protected static Texture saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui); + protected static Texture saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui); + + protected float oldProgress; + protected float animation; + + protected ControlLumbermillProgress(IWidget parent, float x, float y) { + super(parent, x, y, 66.0f, 18.0f); + oldProgress = 0.0f; + animation = 0.0f; + new Panel(this, 0.0f, 0.0f, 66.0f, 18.0f, MinecraftGUI.PanelType.Black); + } @Override public void onUpdateClient() { super.onUpdateClient(); - if (this.oldProgress != this.progress) { - this.oldProgress = this.progress; - this.animation += 5.0f; + if (oldProgress != progress) { + oldProgress = progress; + animation += 5.0f; } } @Override public void onRenderForeground() { GL11.glDisable(2896); - final int sawX = (int) (63.0f * this.progress); - CraftGUI.Render.texture(ControlLumbermillProgress.Saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(this.animation))); - final ItemStack item = Window.get(this).getInventory().getStackInSlot(Lumbermill.slotWood); + int sawX = (int) (63.0f * progress); + CraftGUI.Render.texture(ControlLumbermillProgress.saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(animation))); + ItemStack item = Window.get(this).getInventory().getStackInSlot(Lumbermill.slotWood); if (item == null) { return; } + GL11.glDisable(2896); Block block = null; if (item.getItem() instanceof ItemBlock) { @@ -55,14 +59,16 @@ public class ControlLumbermillProgress extends ControlProgressBase if (block == null) { return; } - final IIcon icon = block.getIcon(2, item.getItemDamage()); + + IIcon icon = block.getIcon(2, item.getItemDamage()); for (int i = 0; i < 4; ++i) { CraftGUI.Render.iconBlock(new IPoint(1 + i * 16, 1.0f), icon); } - final ItemStack result = Lumbermill.getPlankProduct(item); + ItemStack result = Lumbermill.getPlankProduct(item); if (result == null) { return; } + Block block2 = null; if (item.getItem() instanceof ItemBlock) { block2 = ((ItemBlock) result.getItem()).field_150939_a; @@ -70,27 +76,16 @@ public class ControlLumbermillProgress extends ControlProgressBase if (block2 == null) { return; } - final IIcon icon2 = block2.getIcon(2, result.getItemDamage()); - final IPoint size = this.getSize(); - final IPoint pos = this.getAbsolutePosition(); - CraftGUI.Render.limitArea(new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(this.progress * 64.0f + 2.0f, 18.0f))); + + IIcon icon2 = block2.getIcon(2, result.getItemDamage()); + IPoint size = getSize(); + IPoint pos = getAbsolutePosition(); + CraftGUI.Render.limitArea(new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(progress * 64.0f + 2.0f, 18.0f))); GL11.glEnable(3089); for (int j = 0; j < 4; ++j) { CraftGUI.Render.iconBlock(new IPoint(1 + j * 16, 1.0f), icon2); } GL11.glDisable(3089); - CraftGUI.Render.texture(ControlLumbermillProgress.Saw2, new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(this.animation))); - } - - protected ControlLumbermillProgress(final IWidget parent, final float x, final float y) { - super(parent, x, y, 66.0f, 18.0f); - this.oldProgress = 0.0f; - this.animation = 0.0f; - new Panel(this, 0.0f, 0.0f, 66.0f, 18.0f, MinecraftGUI.PanelType.Black); - } - - static { - ControlLumbermillProgress.Saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui); - ControlLumbermillProgress.Saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui); + CraftGUI.Render.texture(ControlLumbermillProgress.saw2, new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(animation))); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlRecipeSlot.java index 43e934d8..537ba99f 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlRecipeSlot.java @@ -1,41 +1,37 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IComponentRecipe; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import binnie.core.machines.TileEntityMachine; -import binnie.core.craftgui.minecraft.Window; import net.minecraft.tileentity.TileEntity; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.minecraft.control.ControlSlotBase; -public class ControlRecipeSlot extends ControlSlotBase -{ - public ControlRecipeSlot(final IWidget parent, final int x, final int y) { +public class ControlRecipeSlot extends ControlSlotBase { + public ControlRecipeSlot(IWidget parent, int x, int y) { super(parent, x, y, 50); - this.addSelfEventHandler(new EventMouse.Down.Handler() { + addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { - final TileEntity tile = (TileEntity) Window.get(ControlRecipeSlot.this.getWidget()).getInventory(); + public void onEvent(EventMouse.Down event) { + TileEntity tile = (TileEntity) Window.get(getWidget()).getInventory(); if (tile == null || !(tile instanceof TileEntityMachine)) { return; } - final NBTTagCompound nbt = new NBTTagCompound(); - Window.get(ControlRecipeSlot.this.getWidget()).sendClientAction("recipe", nbt); + + NBTTagCompound nbt = new NBTTagCompound(); + Window.get(getWidget()).sendClientAction("recipe", nbt); } }); - this.setRotating(); + setRotating(); } @Override public ItemStack getItemStack() { - final IComponentRecipe recipe = Machine.getInterface(IComponentRecipe.class, Window.get(this).getInventory()); + IComponentRecipe recipe = Machine.getInterface(IComponentRecipe.class, Window.get(this).getInventory()); return recipe.isRecipe() ? recipe.getProduct() : null; } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java index 32f7ffb2..c9869e23 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java @@ -1,47 +1,43 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import net.minecraft.item.ItemStack; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import binnie.core.craftgui.CraftGUI; -import binnie.core.BinnieCore; import binnie.Binnie; -import binnie.core.craftgui.Tooltip; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.WidgetAttribute; +import binnie.core.BinnieCore; +import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; -import java.util.Map; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.controls.ControlText; -import java.util.ArrayList; -import java.util.List; -import binnie.extratrees.api.IDesignCategory; -import java.util.HashMap; -import binnie.extratrees.machines.Designer; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.machines.TileEntityMachine; -import binnie.extratrees.carpentry.EnumDesign; -import binnie.extratrees.api.CarpentryManager; import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.scroll.IControlScrollable; -import binnie.extratrees.api.IDesign; -import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.WidgetAttribute; +import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.controls.core.IControlValue; +import binnie.core.craftgui.controls.scroll.IControlScrollable; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import binnie.core.machines.TileEntityMachine; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignCategory; +import binnie.extratrees.carpentry.EnumDesign; +import binnie.extratrees.machines.Designer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -public class ControlTileSelect extends Control implements IControlValue, IControlScrollable -{ - IDesign value; - float shownHeight; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; - protected ControlTileSelect(final IWidget parent, final float x, final float y) { +public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { + protected IDesign value; + protected float shownHeight; + + protected ControlTileSelect(IWidget parent, float x, float y) { super(parent, x, y, 102.0f, 20 * (CarpentryManager.carpentryInterface.getSortedDesigns().size() / 4) + 22); - this.value = EnumDesign.Blank; - this.shownHeight = 92.0f; - this.refresh(""); + value = EnumDesign.Blank; + shownHeight = 92.0f; + refresh(""); } @Override @@ -49,6 +45,10 @@ public class ControlTileSelect extends Control implements IControlValue return 0.0f; } + @Override + public void setPercentageIndex(float index) { + } + @Override public float getPercentageShown() { return 0.0f; @@ -56,32 +56,38 @@ public class ControlTileSelect extends Control implements IControlValue @Override public IDesign getValue() { - return this.value; + return value; } @Override - public void movePercentage(final float percentage) { + public void setValue(IDesign value) { + this.value = value; + } + + @Override + public void movePercentage(float percentage) { } @Override public void onUpdateClient() { super.onUpdateClient(); - final TileEntityMachine tile = (TileEntityMachine) Window.get(this).getInventory(); + TileEntityMachine tile = (TileEntityMachine) Window.get(this).getInventory(); if (tile == null) { return; } - final Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); - this.setValue(recipe.getDesign()); + + Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); + setValue(recipe.getDesign()); } - public void refresh(final String filterText) { - this.deleteAllChildren(); - int cx = 2; + public void refresh(String filterText) { + deleteAllChildren(); + int cx; int cy = 2; - final Map> designs = new HashMap>(); - for (final IDesignCategory category : CarpentryManager.carpentryInterface.getAllDesignCategories()) { - designs.put(category, new ArrayList()); - for (final IDesign tile : category.getDesigns()) { + Map> designs = new HashMap>(); + for (IDesignCategory category : CarpentryManager.carpentryInterface.getAllDesignCategories()) { + designs.put(category, new ArrayList<>()); + for (IDesign tile : category.getDesigns()) { if (filterText == "" || tile.getName().toLowerCase().contains(filterText)) { designs.get(category).add(tile); } @@ -90,11 +96,12 @@ public class ControlTileSelect extends Control implements IControlValue designs.remove(category); } } - for (final IDesignCategory category : designs.keySet()) { + + for (IDesignCategory category : designs.keySet()) { cx = 2; new ControlText(this, new IPoint(cx, cy + 3), category.getName()); cy += 16; - for (final IDesign tile : designs.get(category)) { + for (IDesign tile : designs.get(category)) { if (cx > 90) { cx = 2; cy += 20; @@ -104,17 +111,8 @@ public class ControlTileSelect extends Control implements IControlValue } cy += 20; } - final int height = cy; - this.setSize(new IPoint(this.getSize().x(), height)); - } - - @Override - public void setPercentageIndex(final float index) { - } - - @Override - public void setValue(final IDesign value) { - this.value = value; + int height = cy; + setSize(new IPoint(getSize().x(), height)); } @Override @@ -122,37 +120,41 @@ public class ControlTileSelect extends Control implements IControlValue return 0.0f; } - public static class ControlTile extends Control implements IControlValue, ITooltip - { + public static class ControlTile extends Control implements IControlValue, ITooltip { IDesign value; - protected ControlTile(final IWidget parent, final float x, final float y, final IDesign value) { + protected ControlTile(IWidget parent, float x, float y, IDesign value) { super(parent, x, y, 18.0f, 18.0f); - this.setValue(value); - this.addAttribute(WidgetAttribute.MouseOver); - this.addSelfEventHandler(new EventMouse.Down.Handler() { + setValue(value); + addAttribute(WidgetAttribute.MouseOver); + addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { - final TileEntityMachine tile = (TileEntityMachine) Window.get(ControlTile.this.getWidget()).getInventory(); + public void onEvent(EventMouse.Down event) { + TileEntityMachine tile = (TileEntityMachine) Window.get(getWidget()).getInventory(); if (tile == null) { return; } - final Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(ControlTile.this.getValue())); - Window.get(ControlTile.this.getWidget()).sendClientAction("design", nbt); + Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(getValue())); + Window.get(getWidget()).sendClientAction("design", nbt); } }); } @Override - public void getTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.Language.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName())); + public void getTooltip(Tooltip tooltip) { + tooltip.add(Binnie.Language.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName())); } @Override public IDesign getValue() { - return this.value; + return value; + } + + @Override + public void setValue(IDesign value) { + this.value = value; } @Override @@ -162,21 +164,17 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void onRenderForeground() { - final ItemStack image = ((WindowWoodworker) this.getSuperParent()).getDesignerType().getDisplayStack(this.getValue()); + ItemStack image = ((WindowWoodworker) getSuperParent()).getDesignerType().getDisplayStack(getValue()); CraftGUI.Render.item(new IPoint(1.0f, 1.0f), image); - if (((IControlValue) this.getParent()).getValue() != this.getValue()) { - if (Window.get(this).getMousedOverWidget() == this) { - CraftGUI.Render.gradientRect(this.getArea().inset(1), 1157627903, 1157627903); - } - else { - CraftGUI.Render.gradientRect(this.getArea().inset(1), -1433892728, -1433892728); - } + if (((IControlValue) getParent()).getValue() == getValue()) { + return; } - } - @Override - public void setValue(final IDesign value) { - this.value = value; + if (Window.get(this).getMousedOverWidget() == this) { + CraftGUI.Render.gradientRect(getArea().inset(1), 1157627903, 1157627903); + } else { + CraftGUI.Render.gradientRect(getArea().inset(1), -1433892728, -1433892728); + } } } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/craftgui/dictionary/DialogBreweryRecipe.java index 594d1517..2ab35d7a 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/DialogBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/DialogBreweryRecipe.java @@ -1,15 +1,11 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.minecraft.Dialog; -public class DialogBreweryRecipe extends Dialog -{ - public DialogBreweryRecipe(final IWidget parent, final float w, final float h) { +// TODO unused class? +public class DialogBreweryRecipe extends Dialog { + public DialogBreweryRecipe(IWidget parent, float w, float h) { super(parent, w, h); } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java index 0f9091d7..2045b016 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java @@ -1,39 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import binnie.core.craftgui.database.ControlSpeciesBox; -import binnie.core.genetics.TreeBreedingSystem; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.extratrees.ExtraTrees; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.database.WindowAbstractDatabase; -import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.IWidget; -import net.minecraft.item.ItemStack; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.database.ControlSpeciesBox; +import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; +import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.ExtraTrees; +import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.item.ItemStack; -public class PageFruit extends PageAbstract -{ +import java.util.Collection; + +public class PageFruit extends PageAbstract { boolean treesThatBearFruit; - public PageFruit(final IWidget parent, final DatabaseTab tab, final boolean treesThatBearFruit) { + public PageFruit(IWidget parent, DatabaseTab tab, boolean treesThatBearFruit) { super(parent, tab); this.treesThatBearFruit = treesThatBearFruit; } @Override - public void onValueChanged(final ItemStack species) { - this.deleteAllChildren(); - final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, this.size().x(), 24.0f), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); - final Collection trees = this.treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); - new ControlSpeciesBox(this, 4.0f, 24.0f, this.size().x() - 8.0f, this.size().y() - 4.0f - 24.0f).setOptions(trees); + public void onValueChanged(ItemStack species) { + deleteAllChildren(); + WindowAbstractDatabase database = Window.get(this); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); + Collection trees = treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); + new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java index 120f03ed..f334adcc 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java @@ -1,47 +1,42 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.extratrees.block.IPlankType; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.CraftGUI; import binnie.core.BinnieCore; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.extratrees.block.DoorType; -import binnie.extratrees.block.decor.FenceType; -import binnie.extratrees.block.WoodManager; -import binnie.extratrees.ExtraTrees; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.database.WindowAbstractDatabase; -import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; -import net.minecraft.item.ItemStack; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; +import binnie.core.craftgui.database.WindowAbstractDatabase; +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; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.DoorType; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; +import binnie.extratrees.block.decor.FenceType; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -public class PagePlanksOverview extends PageAbstract -{ - public PagePlanksOverview(final IWidget parent, final DatabaseTab tab) { +public class PagePlanksOverview extends PageAbstract { + public PagePlanksOverview(IWidget parent, DatabaseTab tab) { super(parent, tab); } @Override - public void onValueChanged(final ItemStack species) { - this.deleteAllChildren(); - final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, this.size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); - new ControlText(this, new IArea(12.0f, 24.0f, this.size().x() - 24.0f, 24.0f), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MiddleLeft); - final IPlankType type = WoodManager.get(species); + public void onValueChanged(ItemStack species) { + deleteAllChildren(); + WindowAbstractDatabase database = Window.get(this); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); + new ControlText(this, new IArea(12.0f, 24.0f, size().x() - 24.0f, 24.0f), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MiddleLeft); + IPlankType type = WoodManager.get(species); int x = 12; if (type != null) { - final ItemStack fence = WoodManager.getFence(type, new FenceType(0), 1); - final ItemStack gate = WoodManager.getGate(type); - final ItemStack door = WoodManager.getDoor(type, DoorType.Standard); + ItemStack fence = WoodManager.getFence(type, new FenceType(0), 1); + ItemStack gate = WoodManager.getGate(type); + ItemStack door = WoodManager.getDoor(type, DoorType.Standard); if (fence != null) { new ControlItemDisplay(this, x, 48.0f).setItemStack(fence); x += 22; @@ -55,19 +50,20 @@ public class PagePlanksOverview extends PageAbstract x += 22; } } - final ControlText controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, this.getSize().x() - 16.0f, 0.0f), "", TextJustification.MiddleCenter); - final ControlText controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, this.getSize().x() - 16.0f, 0.0f), "", TextJustification.BottomRight); + + ControlText controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MiddleCenter); + ControlText controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BottomRight); String desc = ""; if (type != null) { desc = type.getDescription(); } + String descBody = EnumChatFormatting.ITALIC.toString(); String descSig = ""; if (desc == null || desc.length() == 0) { descBody += BinnieCore.proxy.localise("gui.database.nodescription"); - } - else { - final String[] descStrings = desc.split("\\|"); + } else { + String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; for (int i = 1; i < descStrings.length - 1; ++i) { descBody = descBody + " " + descStrings[i]; @@ -76,9 +72,10 @@ public class PagePlanksOverview extends PageAbstract descSig += descStrings[descStrings.length - 1]; } } + controlDescription.setValue(descBody + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET); - final float descHeight = CraftGUI.Render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); + float descHeight = CraftGUI.Render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); controlSignature.setPosition(new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f)); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java index dcb6111b..60964826 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java @@ -1,35 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import binnie.core.craftgui.database.ControlSpeciesBox; -import binnie.core.genetics.TreeBreedingSystem; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.database.WindowAbstractDatabase; -import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.IWidget; -import net.minecraft.item.ItemStack; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.database.ControlSpeciesBox; +import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; +import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.genetics.TreeBreedingSystem; +import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.item.ItemStack; -public class PagePlanksTrees extends PageAbstract -{ - public PagePlanksTrees(final IWidget parent, final DatabaseTab tab) { +import java.util.Collection; + +public class PagePlanksTrees extends PageAbstract { + public PagePlanksTrees(IWidget parent, DatabaseTab tab) { super(parent, tab); } @Override - public void onValueChanged(final ItemStack species) { - this.deleteAllChildren(); - final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, this.size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); - final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); - new ControlSpeciesBox(this, 4.0f, 24.0f, this.size().x() - 8.0f, this.size().y() - 4.0f - 24.0f).setOptions(trees); + public void onValueChanged(ItemStack species) { + deleteAllChildren(); + WindowAbstractDatabase database = Window.get(this); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); + Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); + new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java index b9897f39..559ec43a 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java @@ -1,33 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.database.EnumDiscoveryState; -import forestry.api.genetics.IAlleleSpecies; +import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.database.ControlDatabaseIndividualDisplay; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.EnumDiscoveryState; +import binnie.core.craftgui.database.PageSpecies; import binnie.core.craftgui.minecraft.MinecraftGUI; import binnie.core.craftgui.window.Panel; -import binnie.core.craftgui.database.DatabaseTab; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.database.ControlDatabaseIndividualDisplay; -import binnie.core.craftgui.database.PageSpecies; +import forestry.api.genetics.IAlleleSpecies; -public class PageSpeciesImage extends PageSpecies -{ - ControlDatabaseIndividualDisplay display; +public class PageSpeciesImage extends PageSpecies { + protected ControlDatabaseIndividualDisplay display; - public PageSpeciesImage(final IWidget parent, final DatabaseTab tab) { + public PageSpeciesImage(IWidget parent, DatabaseTab tab) { super(parent, tab); new Panel(this, 7.0f, 25.0f, 130.0f, 120.0f, MinecraftGUI.PanelType.Gray); - this.display = new ControlDatabaseIndividualDisplay(this, 12.0f, 25.0f, 120.0f); - this.display.hastooltip = false; - new ControlTextCentered(this, 8.0f, this.getValue().toString()); + display = new ControlDatabaseIndividualDisplay(this, 12.0f, 25.0f, 120.0f); + display.hastooltip = false; + new ControlTextCentered(this, 8.0f, getValue().toString()); } @Override - public void onValueChanged(final IAlleleSpecies species) { - this.display.setSpecies(species, EnumDiscoveryState.Show); + public void onValueChanged(IAlleleSpecies species) { + display.setSpecies(species, EnumDiscoveryState.Show); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java index 0800e7b9..d157fc33 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java @@ -1,59 +1,55 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import java.util.List; - -import net.minecraft.util.IIcon; - -import binnie.core.genetics.BreedingSystem; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.IAllele; -import binnie.core.craftgui.geometry.IPoint; - -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; - -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.FakeWorld; - -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import forestry.api.core.ForestryAPI; +import binnie.Binnie; import binnie.core.BinnieCore; -import forestry.api.arboriculture.EnumTreeChromosome; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.scroll.ControlScrollableContent; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.controls.ControlText; -import binnie.Binnie; -import forestry.api.genetics.IAlleleSpecies; import binnie.core.craftgui.database.DatabaseTab; -import binnie.core.craftgui.IWidget; import binnie.core.craftgui.database.PageSpecies; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.genetics.BreedingSystem; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.FakeWorld; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.ForestryAPI; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; -public class PageSpeciesTreeGenome extends PageSpecies -{ - public PageSpeciesTreeGenome(final IWidget parent, final DatabaseTab tab) { +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class PageSpeciesTreeGenome extends PageSpecies { + public PageSpeciesTreeGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); } + public static String tolerated(boolean t) { + if (t) { + return BinnieCore.proxy.localise("gui.tolerated"); + } + return BinnieCore.proxy.localise("gui.nottolerated"); + } + @Override - public void onValueChanged(final IAlleleSpecies species) { - this.deleteAllChildren(); - final IAllele[] template = Binnie.Genetics.getTreeRoot().getTemplate(species.getUID()); + public void onValueChanged(IAlleleSpecies species) { + deleteAllChildren(); + IAllele[] template = Binnie.Genetics.getTreeRoot().getTemplate(species.getUID()); if (template == null) { return; } - final ITree tree = Binnie.Genetics.getTreeRoot().templateAsIndividual(template); + ITree tree = Binnie.Genetics.getTreeRoot().templateAsIndividual(template); if (tree == null) { return; } @@ -68,35 +64,37 @@ public class PageSpeciesTreeGenome extends PageSpecies e.printStackTrace(); } - final ITreeGenome genome = tree.getGenome(); - final IAlleleTreeSpecies treeSpecies = genome.getPrimary(); - final int w = 144; - final int h = 176; - new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), this.getValue().toString(), TextJustification.MiddleCenter); - final ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); - final Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); - final int tw = w - 8 - 12; - final int w2 = 65; - final int w3 = tw - 50; + ITreeGenome genome = tree.getGenome(); + IAlleleTreeSpecies treeSpecies = genome.getPrimary(); + int w = 144; + int h = 176; + new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), getValue().toString(), TextJustification.MiddleCenter); + ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); + Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); + int tw = w - 8 - 12; + int w2 = 65; + int w3 = tw - 50; int y = 0; - final int th = 14; - final int th2 = 18; - final BreedingSystem syst = Binnie.Genetics.treeBreedingSystem; + int th = 14; + int th2 = 18; + BreedingSystem syst = Binnie.Genetics.treeBreedingSystem; new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MiddleLeft); y += th; new ControlText(contents, new IArea(0.0f, y, w2, th), BinnieCore.proxy.localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); y += th; - final IIcon leaf = treeSpecies.getLeafIcon(false, false); + IIcon leaf = treeSpecies.getLeafIcon(false, false); IIcon fruit = null; - int fruitColour = 16777215; + int fruitColour = 0xffffff; + try { - fruit = ForestryAPI.textureManager.getIcon(genome.getFruitProvider().getIconIndex(genome, (IBlockAccess) null, 0, 0, 0, 100, false)); - fruitColour = genome.getFruitProvider().getColour(genome, (IBlockAccess) null, 0, 0, 0, 100); + fruit = ForestryAPI.textureManager.getIcon(genome.getFruitProvider().getIconIndex(genome, null, 0, 0, 0, 100, false)); + fruitColour = genome.getFruitProvider().getColour(genome, null, 0, 0, 0, 100); } catch (Exception ex) { ex.printStackTrace(); } + if (leaf != null) { new ControlText(contents, new IArea(0.0f, y, w2, th2), ExtraTrees.proxy.localise("gui.database.leaves") + " : ", TextJustification.MiddleRight); new ControlBlockIconDisplay(contents, w2, y, leaf).setColor(treeSpecies.getLeafColour(false)); @@ -105,15 +103,17 @@ public class PageSpeciesTreeGenome extends PageSpecies } y += th2; } - // final ItemStack log = (genome.getFruitProvider().getProducts().length + + // ItemStack log = (genome.getFruitProvider().getProducts().length // > 0) ? genome.getFruitProvider().getProducts()[0] : null; if (log != null) { new ControlText(contents, new IArea(0.0f, y, w2, th2), ExtraTrees.proxy.localise("gui.database.log") + " : ", TextJustification.MiddleRight); - final ControlItemDisplay display = new ControlItemDisplay(contents, w2, y); + ControlItemDisplay display = new ControlItemDisplay(contents, w2, y); display.setItemStack(log); display.setTooltip(); y += th2; } + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GROWTH) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getGrowthProvider().getDescription(), TextJustification.MiddleLeft); y += th; @@ -123,19 +123,19 @@ public class PageSpeciesTreeGenome extends PageSpecies new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); y += th; - final List fruits = new ArrayList(); - for (final ItemStack stack : genome.getFruitProvider().getProducts()) { - fruits.add(stack); - } + List fruits = new ArrayList(); + Collections.addAll(fruits, genome.getFruitProvider().getProducts()); + if (!fruits.isEmpty()) { new ControlText(contents, new IArea(0.0f, y, w2, th2), syst.getChromosomeShortName(EnumTreeChromosome.FRUITS) + " : ", TextJustification.MiddleRight); - for (final ItemStack fruitw : fruits) { - final ControlItemDisplay display2 = new ControlItemDisplay(contents, w2, y); + for (ItemStack fruitw : fruits) { + ControlItemDisplay display2 = new ControlItemDisplay(contents, w2, y); display2.setItemStack(fruitw); display2.setTooltip(); y += th2; } } + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.YIELD) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getYield() + "x", TextJustification.MiddleLeft); y += th; @@ -151,11 +151,4 @@ public class PageSpeciesTreeGenome extends PageSpecies contents.setSize(new IPoint(contents.size().x(), y)); scrollable.setScrollableContent(contents); } - - public static String tolerated(final boolean t) { - if (t) { - return BinnieCore.proxy.localise("gui.tolerated"); - } - return BinnieCore.proxy.localise("gui.nottolerated"); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java index b48bef69..8d125c05 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java @@ -1,35 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import binnie.core.craftgui.database.ControlSpeciesBox; -import binnie.core.genetics.TreeBreedingSystem; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.database.WindowAbstractDatabase; -import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.IWidget; -import net.minecraft.item.ItemStack; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.database.ControlSpeciesBox; +import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; +import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.genetics.TreeBreedingSystem; +import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.item.ItemStack; -public class PageWood extends PageAbstract -{ - public PageWood(final IWidget parent, final DatabaseTab tab) { +import java.util.Collection; + +public class PageWood extends PageAbstract { + public PageWood(IWidget parent, DatabaseTab tab) { super(parent, tab); } @Override - public void onValueChanged(final ItemStack species) { - this.deleteAllChildren(); - final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, this.size().x(), 24.0f), this.getValue().toString(), TextJustification.MiddleCenter); - final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); - new ControlSpeciesBox(this, 4.0f, 24.0f, this.size().x() - 8.0f, this.size().y() - 4.0f - 24.0f).setOptions(trees); + public void onValueChanged(ItemStack species) { + deleteAllChildren(); + WindowAbstractDatabase database = Window.get(this); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), getValue().toString(), TextJustification.MiddleCenter); + Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); + new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java index 7227e077..19fdceab 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java @@ -1,96 +1,89 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.controls.scroll.ControlScrollableContent; -import binnie.core.genetics.TreeBreedingSystem; -import binnie.core.craftgui.database.ControlItemStackOption; -import binnie.core.craftgui.controls.listbox.ControlList; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.database.PageBreeder; -import binnie.core.craftgui.database.PageBranchSpecies; -import binnie.core.craftgui.database.PageBranchOverview; -import binnie.core.craftgui.database.PageSpeciesMutations; -import binnie.core.craftgui.database.PageSpeciesResultant; -import binnie.core.craftgui.database.PageSpeciesClassification; -import binnie.core.craftgui.IWidget; -import binnie.core.AbstractMod; -import binnie.core.craftgui.database.DatabaseTab; -import binnie.extratrees.ExtraTrees; -import binnie.core.craftgui.database.IDatabaseMode; -import binnie.core.craftgui.database.PageSpeciesOverview; -import binnie.core.craftgui.minecraft.Window; import binnie.Binnie; +import binnie.core.AbstractMod; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.database.ControlItemStackOption; +import binnie.core.craftgui.database.DatabaseTab; +import binnie.core.craftgui.database.IDatabaseMode; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; +import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.minecraft.Window; +import binnie.core.genetics.TreeBreedingSystem; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.database.WindowAbstractDatabase; -public class WindowArboristDatabase extends WindowAbstractDatabase -{ - ControlListBox selectionBoxFruit; - ControlListBox selectionBoxWood; - ControlListBox selectionBoxPlanks; +public class WindowArboristDatabase extends WindowAbstractDatabase { + protected ControlListBox selectionBoxFruit; + protected ControlListBox selectionBoxWood; + protected ControlListBox selectionBoxPlanks; - public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) { + public WindowArboristDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.treeBreedingSystem, 120.0f); } - public static Window create(final EntityPlayer player, final Side side, final boolean nei) { + public static Window create(EntityPlayer player, Side side, boolean nei) { return new WindowArboristDatabase(player, side, nei); } @Override protected void addTabs() { - new PageSpeciesOverview(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.overview", 0)); - new PageSpeciesTreeGenome(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.genome", 0)); - new PageSpeciesClassification(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.classification", 0)); - new PageSpeciesResultant(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.resultant", 0)); - new PageSpeciesMutations(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.further", 0)); - new PageBranchOverview(this.getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.overview", 0)); - new PageBranchSpecies(this.getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.species", 0)); - new PageBreeder(this.getInfoPages(Mode.Breeder), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder", 0)); - this.createMode(TreeMode.Fruit, new ModeWidgets(TreeMode.Fruit, this) { + new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.overview", 0)); + new PageSpeciesTreeGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.genome", 0)); + new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.classification", 0)); + new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.resultant", 0)); + new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.further", 0)); + new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.overview", 0)); + new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.species", 0)); + new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder", 0)); + createMode(TreeMode.Fruit, new ModeWidgets(TreeMode.Fruit, this) { @Override - public void createListBox(final IArea area) { - (this.listBox = new ControlListBox(this.modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + public void createListBox(IArea area) { + (listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { @Override - public IWidget createOption(final ItemStack value, final int y) { - return new ControlItemStackOption(((ControlScrollableContent>) this).getContent(), value, y); + public IWidget createOption(ItemStack value, int y) { + return new ControlItemStackOption(getContent(), value, y); } - }).setOptions(((TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem()).allFruits); + }).setOptions(((TreeBreedingSystem) getBreedingSystem()).allFruits); } }); - this.createMode(TreeMode.Wood, new ModeWidgets(TreeMode.Wood, this) { + createMode(TreeMode.Wood, new ModeWidgets(TreeMode.Wood, this) { @Override - public void createListBox(final IArea area) { - (this.listBox = new ControlListBox(this.modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + public void createListBox(IArea area) { + (listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { @Override - public IWidget createOption(final ItemStack value, final int y) { - return new ControlItemStackOption(((ControlScrollableContent>) this).getContent(), value, y); + public IWidget createOption(ItemStack value, int y) { + return new ControlItemStackOption(getContent(), value, y); } - }).setOptions(((TreeBreedingSystem) WindowArboristDatabase.this.getBreedingSystem()).allWoods); + }).setOptions(((TreeBreedingSystem) getBreedingSystem()).allWoods); } }); - this.createMode(TreeMode.Planks, new ModeWidgets(TreeMode.Planks, this) { + createMode(TreeMode.Planks, new ModeWidgets(TreeMode.Planks, this) { @Override - public void createListBox(final IArea area) { - this.listBox = new ControlListBox(this.modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + public void createListBox(IArea area) { + listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { @Override - public IWidget createOption(final ItemStack value, final int y) { - return new ControlItemStackOption(((ControlScrollableContent>) this).getContent(), value, y); + public IWidget createOption(ItemStack value, int y) { + return new ControlItemStackOption(getContent(), value, y); } }; } }); - new PageFruit(this.getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.natural", 0), true); - new PageFruit(this.getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.potential", 0), false); - new PageWood(this.getInfoPages(TreeMode.Wood), new DatabaseTab(ExtraTrees.instance, "wood.natural", 0)); - new PagePlanksOverview(this.getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.overview", 0)); - new PagePlanksTrees(this.getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.natural", 1)); + new PageFruit(getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.natural", 0), true); + new PageFruit(getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.potential", 0), false); + new PageWood(getInfoPages(TreeMode.Wood), new DatabaseTab(ExtraTrees.instance, "wood.natural", 0)); + new PagePlanksOverview(getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.overview", 0)); + new PagePlanksTrees(getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.natural", 1)); } @Override @@ -103,15 +96,14 @@ public class WindowArboristDatabase extends WindowAbstractDatabase return "TreeDatabase"; } - enum TreeMode implements IDatabaseMode - { + enum TreeMode implements IDatabaseMode { Fruit, Wood, Planks; @Override public String getName() { - return ExtraTrees.proxy.localise("gui.database.mode." + this.name().toLowerCase()); + return ExtraTrees.proxy.localise("gui.database.mode." + name().toLowerCase()); } } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowBrewery.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowBrewery.java index b41abd24..f0b2bdbe 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowBrewery.java @@ -1,31 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extratrees.machines.Brewery; import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; -import binnie.core.AbstractMod; +import binnie.extratrees.machines.Brewery; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.minecraft.Window; +import net.minecraft.inventory.IInventory; -public class WindowBrewery extends Window -{ - public WindowBrewery(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowBrewery extends Window { + public WindowBrewery(EntityPlayer player, IInventory inventory, Side side) { super(228.0f, 218.0f, player, inventory, side); } + public static Window create(EntityPlayer player, IInventory inventory, Side side) { + return new WindowBrewery(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -38,7 +37,7 @@ public class WindowBrewery extends Window @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); new ControlSlotArray(this, 42, 32, 1, 3).create(Brewery.slotRecipeGrains); new ControlSlot(this, 16.0f, 41.0f).assign(Brewery.slotRecipeInput); new ControlSlot(this, 105.0f, 77.0f).assign(Brewery.slotRecipeYeast); @@ -46,12 +45,8 @@ public class WindowBrewery extends Window new ControlLiquidTank(this, 162, 32).setTankID(Brewery.tankOutput); new ControlEnergyBar(this, 196, 32, 16, 60, Position.Bottom); new ControlBreweryProgress(this, 110.0f, 32.0f); - new ControlSlotArray(this, (int) (this.getSize().x() / 2.0f - 81.0f), 104, 9, 1).create(Brewery.slotInventory); + new ControlSlotArray(this, (int) (getSize().x() / 2.0f - 81.0f), 104, 9, 1).create(Brewery.slotInventory); new ControlPlayerInventory(this); new ControlErrorState(this, 133.0f, 79.0f); } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowBrewery(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowDistillery.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowDistillery.java index 204a6400..f12309e5 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowDistillery.java @@ -1,29 +1,28 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.extratrees.machines.Distillery; +import binnie.core.craftgui.minecraft.control.ControlErrorState; import binnie.core.craftgui.minecraft.control.ControlLiquidTank; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; -import binnie.core.AbstractMod; +import binnie.extratrees.machines.Distillery; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.minecraft.Window; +import net.minecraft.inventory.IInventory; -public class WindowDistillery extends Window -{ - public WindowDistillery(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowDistillery extends Window { + public WindowDistillery(EntityPlayer player, IInventory inventory, Side side) { super(224.0f, 192.0f, player, inventory, side); } + public static Window create(EntityPlayer player, IInventory inventory, Side side) { + return new WindowDistillery(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -36,7 +35,7 @@ public class WindowDistillery extends Window @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); int x = 16; new ControlLiquidTank(this, x, 35).setTankID(Distillery.tankInput); x += 34; @@ -48,8 +47,4 @@ public class WindowDistillery extends Window new ControlPlayerInventory(this); new ControlErrorState(this, x + 21, 62.0f); } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowDistillery(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java index 4522515b..b370cba1 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java @@ -1,45 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.database.PageBreeder; -import binnie.core.craftgui.database.PageBranchSpecies; -import binnie.core.craftgui.database.PageBranchOverview; -import binnie.core.craftgui.database.PageSpeciesMutations; -import binnie.core.craftgui.database.PageSpeciesResultant; -import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.DatabaseTab; -import binnie.extratrees.ExtraTrees; +import binnie.core.craftgui.database.PageBranchOverview; +import binnie.core.craftgui.database.PageBranchSpecies; +import binnie.core.craftgui.database.PageBreeder; +import binnie.core.craftgui.database.PageSpeciesClassification; +import binnie.core.craftgui.database.PageSpeciesMutations; import binnie.core.craftgui.database.PageSpeciesOverview; +import binnie.core.craftgui.database.PageSpeciesResultant; +import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; -import binnie.Binnie; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.database.WindowAbstractDatabase; -public class WindowLepidopteristDatabase extends WindowAbstractDatabase -{ - public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { +public class WindowLepidopteristDatabase extends WindowAbstractDatabase { + public WindowLepidopteristDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.mothBreedingSystem, 160.0f); } - public static Window create(final EntityPlayer player, final Side side, final boolean nei) { + public static Window create(EntityPlayer player, Side side, boolean nei) { return new WindowLepidopteristDatabase(player, side, nei); } @Override protected void addTabs() { - new PageSpeciesOverview(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview", 0)); - new PageSpeciesClassification(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification", 0)); - new PageSpeciesImage(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen", 0)); - new PageSpeciesResultant(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant", 0)); - new PageSpeciesMutations(this.getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further", 0)); - new PageBranchOverview(this.getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview", 0)); - new PageBranchSpecies(this.getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species", 0)); - new PageBreeder(this.getInfoPages(Mode.Breeder), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder", 0)); + new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview", 0)); + new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification", 0)); + new PageSpeciesImage(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen", 0)); + new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant", 0)); + new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further", 0)); + new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview", 0)); + new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species", 0)); + new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder", 0)); } @Override diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLumbermill.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLumbermill.java index a8024fe5..db7495d8 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLumbermill.java @@ -1,30 +1,29 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.extratrees.machines.Lumbermill; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; -import binnie.core.AbstractMod; +import binnie.extratrees.machines.Lumbermill; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.minecraft.Window; +import net.minecraft.inventory.IInventory; -public class WindowLumbermill extends Window -{ - public WindowLumbermill(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowLumbermill extends Window { + public WindowLumbermill(EntityPlayer player, IInventory inventory, Side side) { super(220.0f, 192.0f, player, inventory, side); } + public static Window create(EntityPlayer player, IInventory inventory, Side side) { + return new WindowLumbermill(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -37,7 +36,7 @@ public class WindowLumbermill extends Window @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); new ControlSlot(this, 42.0f, 43.0f).assign(Lumbermill.slotWood); new ControlSlot(this, 148.0f, 43.0f).assign(Lumbermill.slotPlanks); new ControlSlot(this, 172.0f, 28.0f).assign(Lumbermill.slotBark); @@ -48,8 +47,4 @@ public class WindowLumbermill extends Window new ControlPlayerInventory(this); new ControlErrorState(this, 95.0f, 73.0f); } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowLumbermill(player, inventory, side); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowPress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowPress.java index b25a9a3c..a8a09fc4 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowPress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowPress.java @@ -1,34 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import net.minecraft.item.ItemStack; -import binnie.core.machines.power.ErrorState; -import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.minecraft.InventoryType; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; +import binnie.core.craftgui.minecraft.InventoryType; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; +import binnie.core.craftgui.minecraft.control.ControlErrorState; import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.extratrees.machines.Press; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; +import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; -import binnie.core.AbstractMod; +import binnie.extratrees.machines.Press; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.minecraft.Window; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; -public class WindowPress extends Window -{ - public WindowPress(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowPress extends Window { + public WindowPress(EntityPlayer player, IInventory inventory, Side side) { super(194.0f, 192.0f, player, inventory, side); } + public static Window create(EntityPlayer player, IInventory inventory, Side side) { + return new WindowPress(player, inventory, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -41,32 +39,29 @@ public class WindowPress extends Window @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); new ControlSlot(this, 24.0f, 52.0f).assign(Press.slotFruit); new ControlLiquidTank(this, 99, 32).setTankID(Press.tankWater); new ControlEnergyBar(this, 154, 32, 16, 60, Position.Bottom); new ControlPlayerInventory(this); new ControlErrorState(this, 128.0f, 54.0f); new ControlFruitPressProgress(this, 62.0f, 24.0f); - ((Window) this.getSuperParent()).getContainer().getOrCreateSlot(InventoryType.Machine, Press.slotCurrent); - } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowPress(player, inventory, side); + ((Window) getSuperParent()).getContainer().getOrCreateSlot(InventoryType.Machine, Press.slotCurrent); } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { - final Press.ComponentFruitPressLogic logic = Machine.getInterface(Press.ComponentFruitPressLogic.class, this.getInventory()); + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { + Press.ComponentFruitPressLogic logic = Machine.getInterface(Press.ComponentFruitPressLogic.class, getInventory()); super.recieveGuiNBT(side, player, name, nbt); - if (side == Side.SERVER && name.equals("fruitpress-click")) { - if (logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { - logic.alterProgress(2.0f); - } - else if (side == Side.SERVER && name.equals("clear-fruit")) { - logic.setProgress(0.0f); - this.getInventory().setInventorySlotContents(Press.slotCurrent, (ItemStack) null); - } + if (side != Side.SERVER || !name.equals("fruitpress-click")) { + return; + } + + if (logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { + logic.alterProgress(2.0f); + } else if (side == Side.SERVER && name.equals("clear-fruit")) { + logic.setProgress(0.0f); + getInventory().setInventorySlotContents(Press.slotCurrent, null); } } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowSetSquare.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowSetSquare.java index 833d6c69..b647acd4 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowSetSquare.java @@ -1,23 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import net.minecraft.world.World; -import binnie.extratrees.ExtraTrees; import binnie.core.AbstractMod; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; -import net.minecraft.entity.player.EntityPlayer; import binnie.core.craftgui.minecraft.Window; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.world.World; -public class WindowSetSquare extends Window -{ - public WindowSetSquare(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowSetSquare extends Window { + public WindowSetSquare(EntityPlayer player, IInventory inventory, Side side) { super(150.0f, 150.0f, player, inventory, side); } + public static Window create(EntityPlayer player, World world, int x, int y, int z, Side side) { + return new WindowSetSquare(player, null, side); + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -31,8 +30,4 @@ public class WindowSetSquare extends Window @Override public void initialiseClient() { } - - public static Window create(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { - return new WindowSetSquare(player, null, side); - } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java index 6675fa75..3cc02020 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java @@ -1,73 +1,69 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.dictionary; -import binnie.extratrees.machines.DesignerType; -import binnie.extratrees.ExtraTrees; import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.craftgui.controls.ControlText; +import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.controls.scroll.ControlScrollableContent; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventTextEdit; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; -import net.minecraft.entity.player.EntityPlayer; -import binnie.extratrees.machines.Designer; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.controls.scroll.ControlScrollableContent; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.window.Panel; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.BinnieCore; import binnie.core.craftgui.geometry.IArea; -import binnie.core.machines.Machine; -import binnie.core.craftgui.controls.ControlTextEdit; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.minecraft.MinecraftGUI; import binnie.core.craftgui.minecraft.Window; +import binnie.core.craftgui.minecraft.control.ControlErrorState; +import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; +import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.window.Panel; +import binnie.core.machines.Machine; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.machines.Designer; +import binnie.extratrees.machines.DesignerType; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; -public class WindowWoodworker extends Window -{ - ControlTextEdit textEdit; - ControlTileSelect tileSelect; +public class WindowWoodworker extends Window { + protected ControlTextEdit textEdit; + protected ControlTileSelect tileSelect; - @Override - public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlText(this, new IArea(190.0f, 36.0f, 114.0f, 10.0f), BinnieCore.proxy.localise("gui.design"), TextJustification.TopCenter).setColor(4473924); - new Panel(this, 188.0f, 48.0f, 118.0f, 126.0f, MinecraftGUI.PanelType.Gray); - this.textEdit = new ControlTextEdit(this, 188.0f, 178.0f, 118.0f, 12.0f); - final ControlScrollableContent scroll = new ControlScrollableContent(this, 190.0f, 50.0f, 114.0f, 122.0f, 12.0f); - scroll.setScrollableContent(this.tileSelect = new ControlTileSelect(scroll, 0.0f, 0.0f)); - new ControlPlayerInventory(this).setPosition(new IPoint(14.0f, 96.0f)); - new ControlErrorState(this, 76.0f, 65.0f); - if (this.getInventory() != null) { - final ControlSlot slotWood1 = new ControlSlot(this, 22.0f, 34.0f); - slotWood1.assign(Designer.design1Slot); - final ControlSlot slotWood2 = new ControlSlot(this, 62.0f, 34.0f); - slotWood2.assign(Designer.design2Slot); - final ControlSlot slotBeeswax = new ControlSlot(this, 42.0f, 64.0f); - slotBeeswax.assign(Designer.beeswaxSlot); - final ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34); - } - } - - public WindowWoodworker(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowWoodworker(EntityPlayer player, IInventory inventory, Side side) { super(320.0f, 216.0f, player, inventory, side); - this.addEventHandler(new EventTextEdit.Handler() { + addEventHandler(new EventTextEdit.Handler() { @Override - public void onEvent(final EventTextEdit event) { - WindowWoodworker.this.tileSelect.refresh(event.getValue()); + public void onEvent(EventTextEdit event) { + tileSelect.refresh(event.getValue()); } }.setOrigin(EventHandler.Origin.DirectChild, this)); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + public static Window create(EntityPlayer player, IInventory inventory, Side side) { return new WindowWoodworker(player, inventory, side); } + @Override + public void initialiseClient() { + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); + new ControlText(this, new IArea(190.0f, 36.0f, 114.0f, 10.0f), BinnieCore.proxy.localise("gui.design"), TextJustification.TopCenter).setColor(4473924); + new Panel(this, 188.0f, 48.0f, 118.0f, 126.0f, MinecraftGUI.PanelType.Gray); + textEdit = new ControlTextEdit(this, 188.0f, 178.0f, 118.0f, 12.0f); + ControlScrollableContent scroll = new ControlScrollableContent(this, 190.0f, 50.0f, 114.0f, 122.0f, 12.0f); + scroll.setScrollableContent(tileSelect = new ControlTileSelect(scroll, 0.0f, 0.0f)); + new ControlPlayerInventory(this).setPosition(new IPoint(14.0f, 96.0f)); + new ControlErrorState(this, 76.0f, 65.0f); + + if (getInventory() != null) { + ControlSlot slotWood1 = new ControlSlot(this, 22.0f, 34.0f); + slotWood1.assign(Designer.design1Slot); + ControlSlot slotWood2 = new ControlSlot(this, 62.0f, 34.0f); + slotWood2.assign(Designer.design2Slot); + ControlSlot slotBeeswax = new ControlSlot(this, 42.0f, 64.0f); + slotBeeswax.assign(Designer.beeswaxSlot); + ControlRecipeSlot slotFinished = new ControlRecipeSlot(this, 112, 34); + } + } + @Override protected AbstractMod getMod() { return ExtraTrees.instance; @@ -79,6 +75,6 @@ public class WindowWoodworker extends Window } public DesignerType getDesignerType() { - return Machine.getInterface(Designer.ComponentWoodworkerRecipe.class, this.getInventory()).getDesignerType(); + return Machine.getInterface(Designer.ComponentWoodworkerRecipe.class, getInventory()).getDesignerType(); } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java index 5a52bc67..db3692cb 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java @@ -1,21 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; +import binnie.core.craftgui.IWidget; import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.IWidget; import binnie.core.craftgui.window.Panel; -public class ControlDropDownMenu extends Panel -{ +public class ControlDropDownMenu extends Panel { public boolean stayOpenOnChildClick; - public ControlDropDownMenu(final IWidget parent, final float x, final float y, final float width, final float height) { + public ControlDropDownMenu(IWidget parent, float x, float y, float width, float height) { super(parent, x, y, width, 2.0f, MinecraftGUI.PanelType.Gray); - this.stayOpenOnChildClick = false; - this.addAttribute(WidgetAttribute.CanFocus); + stayOpenOnChildClick = false; + addAttribute(WidgetAttribute.CanFocus); } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropdownButton.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropdownButton.java index 1b0abbd1..f5d3d642 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropdownButton.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropdownButton.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.button.ControlButton; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.minecraft.Window; -public abstract class ControlDropdownButton extends ControlButton -{ - public ControlDropdownButton(final IWidget parent, final float x, final float y, final float width, final float height, final String text) { +// TODO unused class? +public abstract class ControlDropdownButton extends ControlButton { + public ControlDropdownButton(IWidget parent, float x, float y, float width, float height, String text) { super(parent, x, y, width, height, text); - this.addSelfEventHandler(new EventMouse.Down.Handler() { + addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { - ControlDropDownMenu menu = ControlDropdownButton.this.getWidget(ControlDropDownMenu.class); - ControlDropdownButton.this.deleteChild(ControlDropdownButton.this.getWidget(ControlDropDownMenu.class)); - if (ControlDropdownButton.this.getWidget(ControlDropDownMenu.class) == null) { - menu = ControlDropdownButton.this.createDropDownMenu(); - Window.get(ControlDropdownButton.this.getWidget()).setFocusedWidget(menu); - } - else { - ControlDropdownButton.this.deleteChild(ControlDropdownButton.this.getWidget(ControlDropDownMenu.class)); + public void onEvent(EventMouse.Down event) { + ControlDropDownMenu menu = getWidget(ControlDropDownMenu.class); + deleteChild(getWidget(ControlDropDownMenu.class)); + if (getWidget(ControlDropDownMenu.class) == null) { + menu = createDropDownMenu(); + Window.get(getWidget()).setFocusedWidget(menu); + } else { + deleteChild(getWidget(ControlDropDownMenu.class)); } } }); diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java index 88f09ba1..0a35a022 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java @@ -1,91 +1,89 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.WidgetAttribute; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.minecraft.Window; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.CraftGUI; -import org.lwjgl.opengl.GL11; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.WidgetAttribute; import net.minecraftforge.fluids.FluidStack; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.controls.core.Control; +import org.lwjgl.opengl.GL11; -public class ControlFluidDisplay extends Control implements ITooltip -{ - FluidStack itemStack; +public class ControlFluidDisplay extends Control implements ITooltip { public boolean hastooltip; - public void setTooltip() { - this.hastooltip = true; - this.addAttribute(WidgetAttribute.MouseOver); - } + protected FluidStack itemStack; - public ControlFluidDisplay(final IWidget parent, final float f, final float y) { + public ControlFluidDisplay(IWidget parent, float f, float y) { this(parent, f, y, 16.0f); } - public ControlFluidDisplay(final IWidget parent, final float f, final float y, final FluidStack stack, final boolean tooltip) { + public ControlFluidDisplay(IWidget parent, float f, float y, FluidStack stack, boolean tooltip) { this(parent, f, y, 16.0f); - this.setItemStack(stack); + setItemStack(stack); if (tooltip) { - this.setTooltip(); + setTooltip(); } } - public ControlFluidDisplay(final IWidget parent, final float x, final float y, final float size) { + public ControlFluidDisplay(IWidget parent, float x, float y, float size) { super(parent, x, y, size, size); - this.itemStack = null; - this.hastooltip = false; + itemStack = null; + hastooltip = false; + } + + public void setTooltip() { + hastooltip = true; + addAttribute(WidgetAttribute.MouseOver); } @Override public void onRenderForeground() { - if (this.itemStack == null) { + if (itemStack == null) { return; } - final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition()); - if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { + + IPoint relativeToWindow = getAbsolutePosition().sub(getSuperParent().getPosition()); + if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f + || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f + || itemStack == null) { return; } - if (this.itemStack != null) { - final Fluid fluid = this.itemStack.getFluid(); - final int hex = fluid.getColor(this.itemStack); - final int r = (hex & 0xFF0000) >> 16; - final int g = (hex & 0xFF00) >> 8; - final int b = hex & 0xFF; - final IIcon icon = this.itemStack.getFluid().getIcon(this.itemStack); - GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); - GL11.glEnable(3042); - GL11.glBlendFunc(770, 771); - if (this.getSize().x() != 16.0f) { - GL11.glPushMatrix(); - final float scale = this.getSize().x() / 16.0f; - GL11.glScalef(scale, scale, 1.0f); - CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack)); - GL11.glPopMatrix(); - } - else { - CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack)); - } - GL11.glDisable(3042); + + Fluid fluid = itemStack.getFluid(); + int hex = fluid.getColor(itemStack); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; + IIcon icon = itemStack.getFluid().getIcon(itemStack); + GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f); + GL11.glEnable(3042); + GL11.glBlendFunc(770, 771); + + if (getSize().x() != 16.0f) { + GL11.glPushMatrix(); + float scale = getSize().x() / 16.0f; + GL11.glScalef(scale, scale, 1.0f); + CraftGUI.Render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack)); + GL11.glPopMatrix(); + } else { + CraftGUI.Render.iconBlock(IPoint.ZERO, itemStack.getFluid().getIcon(itemStack)); } + GL11.glDisable(3042); } - public void setItemStack(final FluidStack itemStack) { + public void setItemStack(FluidStack itemStack) { this.itemStack = itemStack; } @Override - public void getTooltip(final Tooltip tooltip) { - if (this.hastooltip && this.itemStack != null) { - tooltip.add(this.itemStack.getLocalizedName()); + public void getTooltip(Tooltip tooltip) { + if (hastooltip && itemStack != null) { + tooltip.add(itemStack.getLocalizedName()); } } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java index 639ec4b7..1ab76319 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java @@ -1,40 +1,35 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.geometry.IPoint; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.WidgetAttribute; -import binnie.core.craftgui.IWidget; -import net.minecraftforge.fluids.FluidStack; import binnie.core.craftgui.ITooltip; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IPoint; +import binnie.core.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fluids.FluidStack; -public class ControlSlotFluid extends Control implements ITooltip -{ - ControlFluidDisplay itemDisplay; - FluidStack fluidStack; +public class ControlSlotFluid extends Control implements ITooltip { + protected ControlFluidDisplay itemDisplay; + protected FluidStack fluidStack; - public ControlSlotFluid(final IWidget parent, final int x, final int y, final FluidStack fluid) { + public ControlSlotFluid(IWidget parent, int x, int y, FluidStack fluid) { this(parent, x, y, 18, fluid); } - public ControlSlotFluid(final IWidget parent, final int x, final int y, final int size, final FluidStack fluid) { + public ControlSlotFluid(IWidget parent, int x, int y, int size, FluidStack fluid) { super(parent, x, y, size, size); - this.addAttribute(WidgetAttribute.MouseOver); - this.itemDisplay = new ControlFluidDisplay(this, 1.0f, 1.0f, size - 2); - this.fluidStack = fluid; - this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + addAttribute(WidgetAttribute.MouseOver); + itemDisplay = new ControlFluidDisplay(this, 1.0f, 1.0f, size - 2); + fluidStack = fluid; + addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override - public void onEvent(final EventWidget.ChangeSize event) { - if (ControlSlotFluid.this.itemDisplay != null) { - ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new IPoint(2.0f, 2.0f))); + public void onEvent(EventWidget.ChangeSize event) { + if (itemDisplay != null) { + itemDisplay.setSize(getSize().sub(new IPoint(2.0f, 2.0f))); } } }); @@ -42,22 +37,22 @@ public class ControlSlotFluid extends Control implements ITooltip @Override public void onRenderBackground() { - final int size = (int) this.getSize().x(); - CraftGUI.Render.texture(CraftGUITexture.Slot, this.getArea()); - if (this.getSuperParent().getMousedOverWidget() == this) { - CraftGUI.Render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), this.getArea().size().sub(new IPoint(2.0f, 2.0f))), -2130706433, -2130706433); + int size = (int) getSize().x(); + CraftGUI.Render.texture(CraftGUITexture.Slot, getArea()); + if (getSuperParent().getMousedOverWidget() == this) { + CraftGUI.Render.gradientRect(new IArea(new IPoint(1.0f, 1.0f), getArea().size().sub(new IPoint(2.0f, 2.0f))), 0x80ffffff, 0x80ffffff); } } @Override public void onUpdateClient() { super.onUpdateClient(); - this.itemDisplay.setItemStack(this.getFluidStack()); + itemDisplay.setItemStack(getFluidStack()); } @Override - public void getTooltip(final Tooltip tooltip) { - final FluidStack item = this.getFluidStack(); + public void getTooltip(Tooltip tooltip) { + FluidStack item = getFluidStack(); if (item == null) { return; } @@ -65,6 +60,6 @@ public class ControlSlotFluid extends Control implements ITooltip } public FluidStack getFluidStack() { - return this.fluidStack; + return fluidStack; } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotGlassware.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotGlassware.java index 8c39db70..20a8ef0c 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotGlassware.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotGlassware.java @@ -1,36 +1,32 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; -import net.minecraft.item.ItemStack; import binnie.core.craftgui.IWidget; -import binnie.extratrees.alcohol.Glassware; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.minecraft.control.ControlSlotBase; +import binnie.extratrees.alcohol.Glassware; +import net.minecraft.item.ItemStack; -public class ControlSlotGlassware extends ControlSlotBase implements IControlValue -{ +// TODO unused class? +public class ControlSlotGlassware extends ControlSlotBase implements IControlValue { Glassware glassware; - public ControlSlotGlassware(final IWidget parent, final int x, final int y, final Glassware glassware) { + public ControlSlotGlassware(IWidget parent, int x, int y, Glassware glassware) { super(parent, x, y); this.glassware = glassware; } @Override public Glassware getValue() { - return this.glassware; + return glassware; } @Override - public void setValue(final Glassware value) { - this.glassware = value; + public void setValue(Glassware value) { + glassware = value; } @Override public ItemStack getItemStack() { - return this.glassware.get(1); + return glassware.get(1); } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlTankSlot.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlTankSlot.java index 9fe20b01..84805d9c 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlTankSlot.java @@ -1,30 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.minecraft.Window; import net.minecraft.nbt.NBTTagCompound; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.IWidget; -public class ControlTankSlot extends ControlSlotFluid -{ - int tankID; +public class ControlTankSlot extends ControlSlotFluid { + protected int tankID; - public ControlTankSlot(final IWidget parent, final int x, final int y, final int i) { + public ControlTankSlot(IWidget parent, int x, int y, int i) { super(parent, x, y, null); - this.tankID = 0; - this.tankID = i; - this.addSelfEventHandler(new EventMouse.Down.Handler() { + tankID = 0; + tankID = i; + addSelfEventHandler(new EventMouse.Down.Handler() { @Override - public void onEvent(final EventMouse.Down event) { + public void onEvent(EventMouse.Down event) { if (event.getButton() == 0) { - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setByte("id", (byte) ControlTankSlot.this.tankID); - Window.get(ControlTankSlot.this.getWidget()).sendClientAction("tank-click", nbt); + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setByte("id", (byte) tankID); + Window.get(getWidget()).sendClientAction("tank-click", nbt); } } }); @@ -32,9 +27,9 @@ public class ControlTankSlot extends ControlSlotFluid @Override public void onUpdateClient() { - this.fluidStack = Window.get(this).getContainer().getTankInfo(this.tankID).liquid; - final int height = (int) (16.0f * (((this.fluidStack == null) ? 0 : this.fluidStack.amount) / 1000.0f)); - this.itemDisplay.setCroppedZone(this.itemDisplay, new IArea(0.0f, 16 - height, 16.0f, 16.0f)); + fluidStack = Window.get(this).getContainer().getTankInfo(tankID).liquid; + int height = (int) (16.0f * (((fluidStack == null) ? 0 : fluidStack.amount) / 1000.0f)); + itemDisplay.setCroppedZone(itemDisplay, new IArea(0.0f, 16 - height, 16.0f, 16.0f)); super.onUpdateClient(); } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/WindowBottleRack.java b/src/main/java/binnie/extratrees/craftgui/kitchen/WindowBottleRack.java index d3dcd494..bac35d29 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/WindowBottleRack.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/WindowBottleRack.java @@ -1,25 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.craftgui.kitchen; +import binnie.core.AbstractMod; +import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; -import binnie.core.AbstractMod; import cpw.mods.fml.relauncher.Side; -import net.minecraft.inventory.IInventory; import net.minecraft.entity.player.EntityPlayer; -import binnie.core.craftgui.minecraft.Window; +import net.minecraft.inventory.IInventory; -public class WindowBottleRack extends Window -{ - public WindowBottleRack(final EntityPlayer player, final IInventory inventory, final Side side) { +public class WindowBottleRack extends Window { + public WindowBottleRack(EntityPlayer player, IInventory inventory, Side side) { super(248.0f, 180.0f, player, inventory, side); } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { + public static Window create(EntityPlayer player, IInventory inventory, Side side) { return new WindowBottleRack(player, inventory, side); } @@ -35,10 +30,10 @@ public class WindowBottleRack extends Window @Override public void initialiseClient() { - this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); + setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); for (int i = 0; i < 36; ++i) { - final int x = i % 12; - final int y = i / 12; + int x = i % 12; + int y = i / 12; new ControlTankSlot(this, 16 + x * 18, 32 + y * 18, i); } new ControlPlayerInventory(this); diff --git a/src/main/java/binnie/extratrees/gen/TreeGenBase.java b/src/main/java/binnie/extratrees/gen/TreeGenBase.java index 25828304..2fab6771 100644 --- a/src/main/java/binnie/extratrees/gen/TreeGenBase.java +++ b/src/main/java/binnie/extratrees/gen/TreeGenBase.java @@ -1,17 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; -import java.util.Random; -import net.minecraft.world.World; -import forestry.api.world.ITreeGenData; import forestry.api.arboriculture.ITree; +import forestry.api.world.ITreeGenData; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -public class TreeGenBase extends WorldGenerator -{ +import java.util.Random; + +// TODO unused class? +public class TreeGenBase extends WorldGenerator { protected ITree tree; protected ITreeGenData treeGen; protected World world; @@ -27,30 +24,31 @@ public class TreeGenBase extends WorldGenerator protected int minPodHeight; public TreeGenBase() { - this.minHeight = 4; - this.maxHeight = 80; - this.spawnPods = false; - this.minPodHeight = 3; + minHeight = 4; + maxHeight = 80; + spawnPods = false; + minPodHeight = 3; } - protected final int randBetween(final int a, final int b) { - return a + this.rand.nextInt(b - a); + protected int randBetween(int a, int b) { + return a + rand.nextInt(b - a); } - protected final float randBetween(final float a, final float b) { - return a + this.rand.nextFloat() * (b - a); + protected float randBetween(float a, float b) { + return a + rand.nextFloat() * (b - a); } @Override - public boolean generate(final World world, final Random random, final int x, final int y, final int z) { + public boolean generate(World world, Random random, int x, int y, int z) { this.world = world; - this.startX = x; - this.startY = y; - this.startZ = z; - this.girth = this.tree.getGirth(world, x, y, z); - this.height = (int) (this.randBetween(this.getHeight()[0], this.getHeight()[1]) * this.tree.getGenome().getHeight()); - if (this.tree.canGrow(world, x, y, z, this.girth, this.height)) { - this.generate(); + startX = x; + startY = y; + startZ = z; + girth = tree.getGirth(world, x, y, z); + height = (int) (randBetween(getHeight()[0], getHeight()[1]) * tree.getGenome().getHeight()); + + if (tree.canGrow(world, x, y, z, girth, height)) { + generate(); return true; } return false; @@ -60,16 +58,15 @@ public class TreeGenBase extends WorldGenerator } protected int[] getHeight() { - return new int[] { 5, 2 }; + return new int[]{5, 2}; } - private static class Vector - { + private static class Vector { int x; int y; int z; - public Vector(final int x, final int y, final int z) { + public Vector(int x, int y, int z) { this.x = x; this.y = y; this.z = z; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index 78176cfb..61f8edf9 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -1,53 +1,47 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenAlder -{ - public static class CommonAlder extends WorldGenTree - { - public CommonAlder(final ITreeGenData tree) { +public class WorldGenAlder { + public static class CommonAlder extends WorldGenTree { + public CommonAlder(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(1, 2); - final float width = this.height * this.randBetween(0.4f, 0.45f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.4f, 0.45f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index 59fa2fb7..b75a2625 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -1,112 +1,103 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenApple -{ - public static class OrchardApple extends WorldGenTree - { - public OrchardApple(final ITreeGenData tree) { +public class WorldGenApple { + public static class OrchardApple extends WorldGenTree { + public OrchardApple(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); while (leafSpawn > 2) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(3, 6); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(3, 6); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class SweetCrabapple extends WorldGenTree - { - public SweetCrabapple(final ITree tree) { + public static class SweetCrabapple extends WorldGenTree { + public SweetCrabapple(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, leaf, false); while (leafSpawn > 3) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 4); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 4); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class FloweringCrabapple extends WorldGenTree - { - public FloweringCrabapple(final ITree tree) { + public static class FloweringCrabapple extends WorldGenTree { + public FloweringCrabapple(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, leaf, false); while (leafSpawn > 3) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(3, 6); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(3, 6); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class PrairieCrabapple extends WorldGenTree - { - public PrairieCrabapple(final ITree tree) { + public static class PrairieCrabapple extends WorldGenTree { + public PrairieCrabapple(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.5f, 1, leaf, false); while (leafSpawn > 3) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 4); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 4); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index 13bdbe2d..e6451aff 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -1,45 +1,39 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenAsh -{ - public static class CommonAsh extends WorldGenTree - { - public CommonAsh(final ITreeGenData tree) { +public class WorldGenAsh { + public static class CommonAsh extends WorldGenTree { + public CommonAsh(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.35f, 0.45f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.35f, 0.45f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index 5a7a18cf..b908abc2 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -1,32 +1,27 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenBanana extends WorldGenTree -{ - public WorldGenBanana(final ITreeGenData tree) { +public class WorldGenBanana extends WorldGenTree { + public WorldGenBanana(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.bushiness = 0.9f; - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - final float width = this.height / this.randBetween(1.8f, 2.0f); - final int bottom = this.randBetween(3, 4); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.9f * width, 1, this.leaf, false); + bushiness = 0.9f; + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + float width = height / randBetween(1.8f, 2.0f); + int bottom = randBetween(3, 4); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.9f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index eefc6b5e..fcf6595e 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -1,53 +1,46 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; -public class WorldGenBeech -{ - public static class CommonBeech extends WorldGenTree - { - public CommonBeech(final ITree tree) { +public class WorldGenBeech { + public static class CommonBeech extends WorldGenTree { + public CommonBeech(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.47f, 0.5f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.47f, 0.5f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 1.0f, 1, leaf, false); } } - public static class CopperBeech extends CommonBeech - { - public CopperBeech(final ITree tree) { + public static class CopperBeech extends CommonBeech { + public CopperBeech(ITree tree) { super(tree); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java b/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java index d8a94c91..81cc4f35 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenCitrus.java @@ -1,35 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenCitrus extends WorldGenTree -{ - public WorldGenCitrus(final ITreeGenData tree) { +public class WorldGenCitrus extends WorldGenTree { + public WorldGenCitrus(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - final float width = this.height / this.randBetween(1.1f, 1.5f); - final int bottom = this.randBetween(1, 2); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + float width = height / randBetween(1.1f, 1.5f); + int bottom = randBetween(1, 2); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, leaf, false); while (leafSpawn > bottom) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.minHeight = this.randBetween(2, 3); - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + minHeight = randBetween(2, 3); + height = determineHeight(6, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index fe00bb7b..c6020137 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -1,162 +1,153 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenConifer -{ - public static class WesternHemlock extends WorldGenTree - { - public WesternHemlock(final ITreeGenData tree) { +public class WorldGenConifer { + public static class WesternHemlock extends WorldGenTree { + public WesternHemlock(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 6; - final float bottom = this.randBetween(2, 3); - float width = this.height / this.randBetween(2.0f, 2.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 6; + float bottom = randBetween(2, 3); + float width = height / randBetween(2.0f, 2.5f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Cypress extends WorldGenTree - { - public Cypress(final ITree tree) { + public static class Cypress extends WorldGenTree { + public Cypress(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = 1.0f; - float width = this.height * this.randBetween(0.15f, 0.2f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = 1.0f; + float width = height * randBetween(0.15f, 0.2f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= width - 1.0f; ++radius; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Yew extends WorldGenTree - { - public Yew(final ITree tree) { + public static class Yew extends WorldGenTree { + public Yew(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.7f, 0.75f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.7f, 0.75f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= 2.0f - radius; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Cedar extends WorldGenTree - { - public Cedar(final ITree tree) { + public static class Cedar extends WorldGenTree { + public Cedar(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 3; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.7f, 0.75f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 3; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.7f, 0.75f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), this.girth, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), girth, 1, leaf, false); } - for (leafSpawn = this.height + 3; leafSpawn > bottom; leafSpawn += 1 + this.rand.nextInt(2)) { + for (leafSpawn = height + 3; leafSpawn > bottom; leafSpawn += 1 + rand.nextInt(2)) { float cone = 1.0f - (leafSpawn - bottom) / coneHeight; - float radius = (0.7f + this.rand.nextFloat() * 0.3f) * width; - float xOffset = (-width + this.rand.nextFloat() * 2.0f * width) / 2.0f; - float yOffset = (-width + this.rand.nextFloat() * 2.0f * width) / 2.0f; + float radius = (0.7f + rand.nextFloat() * 0.3f) * width; + float xOffset = (-width + rand.nextFloat() * 2.0f * width) / 2.0f; + float yOffset = (-width + rand.nextFloat() * 2.0f * width) / 2.0f; cone *= 2.0f - cone; xOffset *= cone; yOffset *= cone; @@ -170,115 +161,113 @@ public class WorldGenConifer if (yOffset > radius / 2.0f) { yOffset = radius / 2.0f; } - final float f2 = xOffset; - final float h2 = leafSpawn; + float f2 = xOffset; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, yOffset), 0.7f * radius, 1, this.leaf, false); - final float f3 = xOffset; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, yOffset), 0.7f * radius, 1, leaf, false); + float f3 = xOffset; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, yOffset), radius, 1, this.leaf, false); - final float f4 = xOffset; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, yOffset), radius, 1, leaf, false); + float f4 = xOffset; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, yOffset), 0.5f * radius, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, yOffset), 0.5f * radius, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class LoblollyPine extends WorldGenTree - { - public LoblollyPine(final ITree tree) { + public static class LoblollyPine extends WorldGenTree { + public LoblollyPine(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.height * this.randBetween(0.65f, 0.7f); - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = height * randBetween(0.65f, 0.7f); + float width = height * randBetween(0.25f, 0.3f); if (width > 7.0f) { width = 7.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.6f * width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), 0.6f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class MonkeyPuzzle extends WorldGenTree - { - public MonkeyPuzzle(final ITree tree) { + public static class MonkeyPuzzle extends WorldGenTree { + public MonkeyPuzzle(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.4f, 0.45f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.4f, 0.45f); if (width > 7.0f) { width = 7.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.35f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.35f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.55f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.55f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.75f * width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), 0.75f * width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 1.0f * width, 1, this.leaf, false); - final float f6 = 0.0f; - final float h6 = leafSpawn; + generateCylinder(new Vector(f5, h5, 0.0f), 1.0f * width, 1, leaf, false); + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), 0.5f * width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), 0.5f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(9, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(9, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java index a13e3b71..ebb97c01 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenDefault.java @@ -1,35 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; -import binnie.extratrees.worldgen.BlockTypeLog; import binnie.extratrees.genetics.ExtraTreeSpecies; -import binnie.extratrees.worldgen.BlockTypeLeaf; import binnie.extratrees.worldgen.BlockType; +import binnie.extratrees.worldgen.BlockTypeLeaf; +import binnie.extratrees.worldgen.BlockTypeLog; import forestry.api.world.ITreeGenData; -public class WorldGenDefault extends WorldGenTree -{ - public WorldGenDefault(final ITreeGenData tree) { +public class WorldGenDefault extends WorldGenTree { + public WorldGenDefault(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } @Override @@ -39,6 +34,6 @@ public class WorldGenDefault extends WorldGenTree @Override public BlockType getWood() { - return new BlockTypeLog(((ExtraTreeSpecies) this.treeGen.getGenome().getPrimary()).getLog()); + return new BlockTypeLog(((ExtraTreeSpecies) treeGen.getGenome().getPrimary()).getLog()); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java index 4fbe9900..fc1dcbc2 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenEucalyptus.java @@ -1,160 +1,152 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; -import binnie.extratrees.worldgen.BlockTypeLog; import binnie.extratrees.block.ILogType; +import binnie.extratrees.worldgen.BlockTypeLog; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenEucalyptus -{ - public static class SwampGum extends WorldGenTree - { - public SwampGum(final ITreeGenData tree) { +public class WorldGenEucalyptus { + public static class SwampGum extends WorldGenTree { + public SwampGum(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float weakerBottm = this.randBetween(0.5f, 0.6f) * this.height; - final float bottom = this.randBetween(0.4f, 0.5f) * this.height; - float width = this.height * this.randBetween(0.15f, 0.2f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float weakerBottm = randBetween(0.5f, 0.6f) * height; + float bottom = randBetween(0.4f, 0.5f) * height; + float width = height * randBetween(0.15f, 0.2f); if (width > 7.0f) { width = 7.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - this.bushiness = 0.3f; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + bushiness = 0.3f; while (leafSpawn > weakerBottm) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.9f, 1.0f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.9f, 1.0f) * width, 1, leaf, false); } - this.bushiness = 0.6f; + bushiness = 0.6f; while (leafSpawn > bottom) { - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), this.randBetween(0.8f, 0.9f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), randBetween(0.8f, 0.9f) * width, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.5f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.5f * width, 1, leaf, false); for (int i = 0; i < 5; ++i) { - final float f6 = this.randBetween(-1, 1); - final float h6 = leafSpawn; + float f6 = randBetween(-1, 1); + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateSphere(new Vector(f6, h6, this.randBetween(-1, 1)), this.randBetween(1, 2), this.leaf, false); + generateSphere(new Vector(f6, h6, randBetween(-1, 1)), randBetween(1, 2), leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(14, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(14, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class RoseGum extends WorldGenTree - { - public RoseGum(final ITree tree) { + public static class RoseGum extends WorldGenTree { + public RoseGum(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - final int offset = (this.girth - 1) / 2; - for (int x = 0; x < this.girth; ++x) { - for (int y = 0; y < this.girth; ++y) { + generateTreeTrunk(height, girth); + int offset = (girth - 1) / 2; + for (int x = 0; x < girth; ++x) { + for (int y = 0; y < girth; ++y) { for (int i = 0; i < 2; ++i) { - this.addBlock(x - offset, i, y - offset, new BlockTypeLog(ILogType.ExtraTreeLog.Eucalyptus2), true); + addBlock(x - offset, i, y - offset, new BlockTypeLog(ILogType.ExtraTreeLog.Eucalyptus2), true); } } } - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(0.4f, 0.5f) * this.height; - float width = this.height * this.randBetween(0.05f, 0.1f); + float leafSpawn = height + 2; + float bottom = randBetween(0.4f, 0.5f) * height; + float width = height * randBetween(0.05f, 0.1f); if (width < 1.5f) { width = 1.5f; } - this.bushiness = 0.5f; - final float f = 0.0f; - final float h = leafSpawn; + bushiness = 0.5f; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); while (leafSpawn > bottom) { - this.bushiness = 0.1f; - final float f3 = 0.0f; - final float h3 = leafSpawn; + bushiness = 0.1f; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.9f, 1.1f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.9f, 1.1f) * width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(9, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(9, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class RainbowGum extends WorldGenTree - { - public RainbowGum(final ITree tree) { + public static class RainbowGum extends WorldGenTree { + public RainbowGum(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(0.5f, 0.6f) * this.height; - float width = this.height * this.randBetween(0.15f, 0.2f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(0.5f, 0.6f) * height; + float width = height * randBetween(0.15f, 0.2f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(7, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenFir.java b/src/main/java/binnie/extratrees/gen/WorldGenFir.java index 7e2182fa..16fa1c72 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenFir.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenFir.java @@ -1,145 +1,137 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenFir -{ - public static class DouglasFir extends WorldGenTree - { - public DouglasFir(final ITreeGenData tree) { +public class WorldGenFir { + public static class DouglasFir extends WorldGenTree { + public DouglasFir(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float patchyBottom = this.height / 2; - final float bottom = this.randBetween(3, 4); - final float width = this.height * this.randBetween(0.35f, 0.4f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float patchyBottom = height / 2; + float bottom = randBetween(3, 4); + float width = height * randBetween(0.35f, 0.4f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); - this.bushiness = 0.1f; + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); + bushiness = 0.1f; while (leafSpawn > patchyBottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.9f, 1.1f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.9f, 1.1f) * width, 1, leaf, false); } - this.bushiness = 0.5f; + bushiness = 0.5f; while (leafSpawn > bottom) { - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), this.randBetween(0.7f, 1.0f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), randBetween(0.7f, 1.0f) * width, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f6 = 0.0f; - final float h6 = leafSpawn; + generateCylinder(new Vector(f5, h5, 0.0f), 0.7f * width, 1, leaf, false); + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), 0.3f * width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), 0.3f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class SilverFir extends WorldGenTree - { - public SilverFir(final ITree tree) { + public static class SilverFir extends WorldGenTree { + public SilverFir(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(2, 3); - float width = this.height / this.randBetween(2.5f, 3.0f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(2, 3); + float width = height / randBetween(2.5f, 3.0f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class BalsamFir extends WorldGenTree - { - public BalsamFir(final ITree tree) { + public static class BalsamFir extends WorldGenTree { + public BalsamFir(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = 1.0f; - float width = this.height / this.randBetween(2.0f, 2.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = 1.0f; + float width = height / randBetween(2.0f, 2.5f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java index 44326ebf..f552a96f 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenHolly.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenHolly.java @@ -1,52 +1,46 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenHolly -{ - public static class Holly extends WorldGenTree - { - public Holly(final ITreeGenData tree) { +public class WorldGenHolly { + public static class Holly extends WorldGenTree { + public Holly(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 1.0f; - float width = this.height * this.randBetween(0.4f, 0.45f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 1.0f; + float width = height * randBetween(0.4f, 0.45f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width = 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width = 1.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java index d27af1dc..27af9123 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenJungle.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenJungle.java @@ -1,355 +1,341 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenJungle -{ - public static class Brazilwood extends WorldGenTree - { - public Brazilwood(final ITreeGenData tree) { +public class WorldGenJungle { + public static class Brazilwood extends WorldGenTree { + public Brazilwood(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = 1.0f; - float width = this.height * this.randBetween(0.15f, 0.2f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = 1.0f; + float width = height * randBetween(0.15f, 0.2f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 0.8f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 0.8f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(4, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Logwood extends WorldGenTree - { - public Logwood(final ITree tree) { + public static class Logwood extends WorldGenTree { + public Logwood(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.7f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(4, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Rosewood extends WorldGenTree - { - public Rosewood(final ITree tree) { + public static class Rosewood extends WorldGenTree { + public Rosewood(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.2f, 0.25f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.2f, 0.25f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.7f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Purpleheart extends WorldGenTree - { - public Purpleheart(final ITree tree) { + public static class Purpleheart extends WorldGenTree { + public Purpleheart(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.height - 3; - float width = this.height * this.randBetween(0.2f, 0.25f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = height - 3; + float width = height * randBetween(0.2f, 0.25f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.7f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class OsangeOsange extends WorldGenTree - { - public OsangeOsange(final ITree tree) { + public static class OsangeOsange extends WorldGenTree { + public OsangeOsange(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.2f, 0.25f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.2f, 0.25f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class OldFustic extends WorldGenTree - { - public OldFustic(final ITree tree) { + public static class OldFustic extends WorldGenTree { + public OldFustic(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 0.7f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Coffee extends WorldGenTree - { - public Coffee(final ITree tree) { + public static class Coffee extends WorldGenTree { + public Coffee(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = 1.0f; - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = 1.0f; + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 0.5f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.3f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.3f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(3, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(3, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class BrazilNut extends WorldGenTree - { - public BrazilNut(final ITree tree) { + public static class BrazilNut extends WorldGenTree { + public BrazilNut(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.height - 3; - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = height - 3; + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Shrub15 extends WorldGenTree - { - public Shrub15(final ITree tree) { + public static class Shrub15 extends WorldGenTree { + public Shrub15(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = 1.0f; - float width = this.height * this.randBetween(0.15f, 0.2f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = 1.0f; + float width = height * randBetween(0.15f, 0.2f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 0.8f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 0.8f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java index aeb0ac45..df5dd51a 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenLazy.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenLazy.java @@ -1,46 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenLazy -{ - public static class Tree extends WorldGenTree - { - public Tree(final ITreeGenData tree) { +public class WorldGenLazy { + public static class Tree extends WorldGenTree { + public Tree(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.height / 2 - 1; - float width = this.height * this.randBetween(0.35f, 0.4f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = height / 2 - 1; + float width = height * randBetween(0.35f, 0.4f); if (width < 1.2) { width = 1.55f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java index 84557017..b6c553de 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenMaple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenMaple.java @@ -1,63 +1,57 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenMaple -{ - public static class RedMaple extends WorldGenTree - { - public RedMaple(final ITreeGenData tree) { +public class WorldGenMaple { + public static class RedMaple extends WorldGenTree { + public RedMaple(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(1, 2); - final float bottom2 = (this.height + bottom) / 2.0f; + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(1, 2); + float bottom2 = (height + bottom) / 2.0f; float width = 2.0f; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); while (leafSpawn > bottom2) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.4f, 1, leaf, false); } width += 0.6; while (leafSpawn > bottom) { - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 0.4f, 1, leaf, false); } if (leafSpawn == bottom) { - final float f6 = 0.0f; - final float h6 = leafSpawn; + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), width - 0.6f, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), width - 0.6f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index d7ff492c..ca723bba 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -1,45 +1,40 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenPalm -{ - public static class Coconut extends WorldGenTree - { - public Coconut(final ITreeGenData tree) { +public class WorldGenPalm { + public static class Coconut extends WorldGenTree { + public Coconut(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - float width = this.height * this.randBetween(0.35f, 0.4f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float width = height * randBetween(0.35f, 0.4f); if (width < 1.2) { width = 1.55f; } - final float f = 0.0f; - final float h = leafSpawn; + + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.6f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.6f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java index f0803004..1fd880bb 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPoplar.java @@ -1,52 +1,46 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenPoplar -{ - public static class Aspen extends WorldGenTree - { - public Aspen(final ITreeGenData tree) { +public class WorldGenPoplar { + public static class Aspen extends WorldGenTree { + public Aspen(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(this.height / 2, this.height / 2 + 1) + 1; - float width = this.height * this.randBetween(0.25f, 0.35f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(height / 2, height / 2 + 1) + 1; + float width = height * randBetween(0.25f, 0.35f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.5f * width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), 0.5f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), this.randBetween(0.9f, 1.1f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), randBetween(0.9f, 1.1f) * width, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPrune.java b/src/main/java/binnie/extratrees/gen/WorldGenPrune.java index 43abadc3..d5b70227 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPrune.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPrune.java @@ -1,35 +1,30 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenPrune extends WorldGenTree -{ - public WorldGenPrune(final ITreeGenData tree) { +public class WorldGenPrune extends WorldGenTree { + public WorldGenPrune(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height; - final float width = this.height / this.randBetween(1.7f, 2.1f); - final int bottom = this.randBetween(2, 3); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height; + float width = height / randBetween(1.7f, 2.1f); + int bottom = randBetween(2, 3); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, leaf, false); while (leafSpawn > bottom) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), width, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.6f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.3f * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.6f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.3f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index 0fe42b99..905b05b3 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -1,47 +1,41 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; -public class WorldGenShrub -{ - public static class Shrub extends WorldGenTree - { - public Shrub(final ITree tree) { +public class WorldGenShrub { + public static class Shrub extends WorldGenTree { + public Shrub(ITree tree) { super(tree); } @Override public void generate() { - float leafSpawn = this.height; - float width = this.height * this.randBetween(0.7f, 0.9f); + float leafSpawn = height; + float width = height * randBetween(0.7f, 0.9f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.4f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn >= 0.0f) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.minHeight = 1; - this.height = this.determineHeight(1, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + minHeight = 1; + height = determineHeight(1, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java index ba8fe8a8..57e8336b 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenSorbus.java @@ -1,78 +1,70 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenSorbus -{ - public static class Whitebeam extends WorldGenTree - { - public Whitebeam(final ITreeGenData tree) { +public class WorldGenSorbus { + public static class Whitebeam extends WorldGenTree { + public Whitebeam(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.5f, 0.6f); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.6f * width, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.8f * width, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.5f, 0.6f); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.4f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.6f * width, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, leaf, false); } } - public static class Rowan extends WorldGenTree - { - public Rowan(final ITree tree) { + public static class Rowan extends WorldGenTree { + public Rowan(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.5f, 0.6f); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.5f * width, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.5f, 0.6f); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.5f * width, 1, leaf, false); while (leafSpawn > bottom) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.7f * width, 1, leaf, false); } } - public static class ServiceTree extends WorldGenTree - { - public ServiceTree(final ITree tree) { + public static class ServiceTree extends WorldGenTree { + public ServiceTree(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); while (leafSpawn > 2) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.4f + this.rand.nextFloat() * 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.4f + rand.nextFloat() * 0.7f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(8, 6); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(8, 6); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java b/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java index 0e8c8423..455f8ca1 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenSpruce.java @@ -1,160 +1,151 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenSpruce -{ - public static class GiantSpruce extends WorldGenTree - { - public GiantSpruce(final ITreeGenData tree) { +public class WorldGenSpruce { + public static class GiantSpruce extends WorldGenTree { + public GiantSpruce(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 3; - final float bottom = this.randBetween(3, 4); - final float width = this.height / this.randBetween(2.5f, 3.0f); - final float coneHeight = leafSpawn - bottom; + generateTreeTrunk(height, girth); + float leafSpawn = height + 3; + float bottom = randBetween(3, 4); + float width = height / randBetween(2.5f, 3.0f); + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius = 0.15f + 0.85f * radius; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(15, 4); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(15, 4); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class AlpineSpruce extends WorldGenTree - { - public AlpineSpruce(final ITree tree) { + public static class AlpineSpruce extends WorldGenTree { + public AlpineSpruce(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 5; - final float bottom = this.randBetween(2, 3); - final float width = this.height / this.randBetween(2.0f, 2.5f); - final float coneHeight = leafSpawn - bottom; + generateTreeTrunk(height, girth); + float leafSpawn = height + 5; + float bottom = randBetween(2, 3); + float width = height / randBetween(2.0f, 2.5f); + float coneHeight = leafSpawn - bottom; leafSpawn -= 2.0f; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= radius; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class WhiteSpruce extends WorldGenTree - { - public WhiteSpruce(final ITree tree) { + public static class WhiteSpruce extends WorldGenTree { + public WhiteSpruce(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(2, 3); - final float width = this.height / this.randBetween(2.2f, 2.5f); - final float coneHeight = leafSpawn - bottom; + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(2, 3); + float width = height / randBetween(2.2f, 2.5f); + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius = (float) Math.sqrt(radius); radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class BlackSpruce extends WorldGenTree - { - public BlackSpruce(final ITree tree) { + public static class BlackSpruce extends WorldGenTree { + public BlackSpruce(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = this.randBetween(2, 3); - final float width = this.height / this.randBetween(2.2f, 2.5f); - final float coneHeight = leafSpawn - bottom; + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = randBetween(2, 3); + float width = height / randBetween(2.2f, 2.5f); + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius = (float) Math.sqrt(radius); radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTilia.java b/src/main/java/binnie/extratrees/gen/WorldGenTilia.java index fa0dbcc8..8ce4f74c 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTilia.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTilia.java @@ -1,140 +1,132 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenTilia -{ - public static class Basswood extends WorldGenTree - { - public Basswood(final ITreeGenData tree) { +public class WorldGenTilia { + public static class Basswood extends WorldGenTree { + public Basswood(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.4f, 0.5f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.4f, 0.5f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class WhiteBasswood extends WorldGenTree - { - public WhiteBasswood(final ITree tree) { + public static class WhiteBasswood extends WorldGenTree { + public WhiteBasswood(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.4f, 0.5f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.4f, 0.5f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class CommonLime extends WorldGenTree - { - public CommonLime(final ITree tree) { + public static class CommonLime extends WorldGenTree { + public CommonLime(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - final float width = this.height * this.randBetween(0.45f, 0.55f); - final float f = 0.0f; - final float h = leafSpawn; + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.45f, 0.55f); + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), this.randBetween(0.95f, 1.05f) * width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), randBetween(0.95f, 1.05f) * width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), 0.4f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(7, 4); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(7, 4); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree.java b/src/main/java/binnie/extratrees/gen/WorldGenTree.java index cd9bacd2..0371265d 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree.java @@ -1,22 +1,18 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; -import binnie.extratrees.worldgen.BlockTypeVoid; -import net.minecraft.init.Blocks; -import binnie.extratrees.worldgen.BlockTypeLog; import binnie.extratrees.genetics.ExtraTreeSpecies; -import binnie.extratrees.worldgen.BlockTypeLeaf; import binnie.extratrees.worldgen.BlockType; -import java.util.Random; -import net.minecraft.world.World; +import binnie.extratrees.worldgen.BlockTypeLeaf; +import binnie.extratrees.worldgen.BlockTypeLog; +import binnie.extratrees.worldgen.BlockTypeVoid; import forestry.api.world.ITreeGenData; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -public abstract class WorldGenTree extends WorldGenerator -{ +import java.util.Random; + +public abstract class WorldGenTree extends WorldGenerator { protected ITreeGenData treeGen; protected World world; protected Random rand; @@ -35,44 +31,58 @@ public abstract class WorldGenTree extends WorldGenerator BlockType air; float bushiness; - protected int randBetween(final int a, final int b) { - return a + this.rand.nextInt(b - a); + public WorldGenTree(ITreeGenData tree) { + minHeight = 3; + maxHeight = 80; + spawnPods = false; + minPodHeight = 3; + vine = new BlockType(Blocks.vine, 0); + air = new BlockTypeVoid(); + bushiness = 0.0f; + spawnPods = tree.allowsFruitBlocks(); + if (tree instanceof ITreeGenData) { + treeGen = tree; + } } - protected float randBetween(final float a, final float b) { - return a + this.rand.nextFloat() * (b - a); + protected int randBetween(int a, int b) { + return a + rand.nextInt(b - a); + } + + protected float randBetween(float a, float b) { + return a + rand.nextFloat() * (b - a); } public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.9f, 1, leaf, false); } public boolean canGrow() { - return this.treeGen.canGrow(this.world, this.startX, this.startY, this.startZ, this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ), this.height); + return treeGen.canGrow(world, startX, startY, startZ, treeGen.getGirth(world, startX, startY, startZ), height); } public void preGenerate() { - this.height = this.determineHeight(5, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } - protected int determineGirth(final int base) { + protected int determineGirth(int base) { return base; } - protected int modifyByHeight(final int val, final int min, final int max) { - final int determined = Math.round(val * this.treeGen.getHeightModifier()); + protected int modifyByHeight(int val, int min, int max) { + int determined = Math.round(val * treeGen.getHeightModifier()); return (determined < min) ? min : ((determined > max) ? max : determined); } - protected int determineHeight(final int required, final int variation) { - final int determined = Math.round((required + this.rand.nextInt(variation)) * this.treeGen.getHeightModifier()); - return (determined < this.minHeight) ? this.minHeight : ((determined > this.maxHeight) ? this.maxHeight : determined); + protected int determineHeight(int required, int variation) { + int determined = Math.round((required + rand.nextInt(variation)) * treeGen.getHeightModifier()); + return (determined < minHeight) ? minHeight : ((determined > maxHeight) ? maxHeight : determined); } public BlockType getLeaf() { @@ -80,107 +90,93 @@ public abstract class WorldGenTree extends WorldGenerator } public BlockType getWood() { - return new BlockTypeLog(((ExtraTreeSpecies) this.treeGen.getGenome().getPrimary()).getLog()); - } - - public WorldGenTree(final ITreeGenData tree) { - this.minHeight = 3; - this.maxHeight = 80; - this.spawnPods = false; - this.minPodHeight = 3; - this.vine = new BlockType(Blocks.vine, 0); - this.air = new BlockTypeVoid(); - this.bushiness = 0.0f; - this.spawnPods = tree.allowsFruitBlocks(); - if (tree instanceof ITreeGenData) { - this.treeGen = tree; - } + return new BlockTypeLog(((ExtraTreeSpecies) treeGen.getGenome().getPrimary()).getLog()); } @Override - public final boolean generate(final World world, final Random random, final int x, final int y, final int z) { - return this.generate(world, random, x, y, z, false); + public boolean generate(World world, Random random, int x, int y, int z) { + return generate(world, random, x, y, z, false); } - public final boolean generate(final World world, final Random random, final int x, final int y, final int z, final boolean force) { + public boolean generate(World world, Random random, int x, int y, int z, boolean force) { this.world = world; - this.rand = random; - this.startX = x; - this.startY = y; - this.startZ = z; - this.leaf = this.getLeaf(); - this.wood = this.getWood(); - this.preGenerate(); - if (!force && !this.canGrow()) { + rand = random; + startX = x; + startY = y; + startZ = z; + leaf = getLeaf(); + wood = getWood(); + preGenerate(); + if (!force && !canGrow()) { return false; } - final int offset = (this.girth - 1) / 2; - for (int x2 = 0; x2 < this.girth; ++x2) { - for (int y2 = 0; y2 < this.girth; ++y2) { - this.addBlock(x2, 0, y2, new BlockTypeVoid(), true); + int offset = (girth - 1) / 2; + for (int x2 = 0; x2 < girth; ++x2) { + for (int y2 = 0; y2 < girth; ++y2) { + addBlock(x2, 0, y2, new BlockTypeVoid(), true); } } - this.generate(); + generate(); return true; } - public final Vector getStartVector() { - return new Vector(this.startX, this.startY, this.startZ); + public Vector getStartVector() { + return new Vector(startX, startY, startZ); } - protected void generateTreeTrunk(final int height, final int width) { - this.generateTreeTrunk(height, width, 0.0f); + protected void generateTreeTrunk(int height, int width) { + generateTreeTrunk(height, width, 0.0f); } - protected void generateTreeTrunk(final int height, final int width, final float vines) { - final int offset = (width - 1) / 2; + protected void generateTreeTrunk(int height, int width, float vines) { + int offset = (width - 1) / 2; for (int x = 0; x < width; ++x) { for (int y = 0; y < width; ++y) { for (int i = 0; i < height; ++i) { - this.addWood(x - offset, i, y - offset, true); - if (this.rand.nextFloat() < vines) { - this.addVine(x - offset - 1, i, y - offset); + addWood(x - offset, i, y - offset, true); + if (rand.nextFloat() < vines) { + addVine(x - offset - 1, i, y - offset); } - if (this.rand.nextFloat() < vines) { - this.addVine(x - offset + 1, i, y - offset); + if (rand.nextFloat() < vines) { + addVine(x - offset + 1, i, y - offset); } - if (this.rand.nextFloat() < vines) { - this.addVine(x - offset, i, y - offset - 1); + if (rand.nextFloat() < vines) { + addVine(x - offset, i, y - offset - 1); } - if (this.rand.nextFloat() < vines) { - this.addVine(x - offset, i, y - offset + 1); + if (rand.nextFloat() < vines) { + addVine(x - offset, i, y - offset + 1); } } } } - if (!this.spawnPods) { + if (!spawnPods) { return; } - for (int y2 = this.minPodHeight; y2 < height; ++y2) { - for (int x2 = 0; x2 < this.girth; ++x2) { - for (int z = 0; z < this.girth; ++z) { - if (x2 <= 0 || x2 >= this.girth || z <= 0 || z >= this.girth) { - this.treeGen.trySpawnFruitBlock(this.world, this.startX + x2 + 1, this.startY + y2, this.startZ + z); - this.treeGen.trySpawnFruitBlock(this.world, this.startX + x2 - 1, this.startY + y2, this.startZ + z); - this.treeGen.trySpawnFruitBlock(this.world, this.startX + x2, this.startY + y2, this.startZ + z + 1); - this.treeGen.trySpawnFruitBlock(this.world, this.startX + x2, this.startY + y2, this.startZ + z - 1); + for (int y2 = minPodHeight; y2 < height; ++y2) { + for (int x2 = 0; x2 < girth; ++x2) { + for (int z = 0; z < girth; ++z) { + if (x2 <= 0 || x2 >= girth || z <= 0 || z >= girth) { + treeGen.trySpawnFruitBlock(world, startX + x2 + 1, startY + y2, startZ + z); + treeGen.trySpawnFruitBlock(world, startX + x2 - 1, startY + y2, startZ + z); + treeGen.trySpawnFruitBlock(world, startX + x2, startY + y2, startZ + z + 1); + treeGen.trySpawnFruitBlock(world, startX + x2, startY + y2, startZ + z - 1); } } } } } - protected void generateSupportStems(final int height, final int girth, final float chance, final float maxHeight) { + protected void generateSupportStems(int height, int girth, float chance, float maxHeight) { for (int offset = 1, x = -offset; x < girth + offset; ++x) { for (int z = -offset; z < girth + offset; ++z) { if (x != -offset || z != -offset) { if (x != girth + offset || z != girth + offset) { if (x != -offset || z != girth + offset) { if (x != girth + offset || z != -offset) { - final int stemHeight = this.rand.nextInt(Math.round(height * maxHeight)); - if (this.rand.nextFloat() < chance) { + int stemHeight = rand.nextInt(Math.round(height * maxHeight)); + if (rand.nextFloat() < chance) { for (int i = 0; i < stemHeight; ++i) { - this.addWood(x, i, z, true); + addWood(x, i, z, true); } } } @@ -191,49 +187,49 @@ public abstract class WorldGenTree extends WorldGenerator } } - protected final void clearBlock(final int x, final int y, final int z) { - this.air.setBlock(this.world, this.treeGen, this.startX + x, this.startY + y, this.startZ + z); + protected void clearBlock(int x, int y, int z) { + air.setBlock(world, treeGen, startX + x, startY + y, startZ + z); } - protected final void addBlock(final int x, final int y, final int z, final BlockType type, final boolean doReplace) { - if (doReplace || this.world.isAirBlock(this.startX + x, this.startY + y, this.startZ + z)) { - type.setBlock(this.world, this.treeGen, this.startX + x, this.startY + y, this.startZ + z); + protected void addBlock(int x, int y, int z, BlockType type, boolean doReplace) { + if (doReplace || world.isAirBlock(startX + x, startY + y, startZ + z)) { + type.setBlock(world, treeGen, startX + x, startY + y, startZ + z); } } - protected final void addWood(final int x, final int y, final int z, final boolean doReplace) { - this.addBlock(x, y, z, this.wood, doReplace); + protected void addWood(int x, int y, int z, boolean doReplace) { + addBlock(x, y, z, wood, doReplace); } - protected final void addLeaf(final int x, final int y, final int z, final boolean doReplace) { - this.addBlock(x, y, z, this.leaf, doReplace); + protected void addLeaf(int x, int y, int z, boolean doReplace) { + addBlock(x, y, z, leaf, doReplace); } - protected final void addVine(final int x, final int y, final int z) { - this.addBlock(x, y, z, this.vine, false); + protected void addVine(int x, int y, int z) { + addBlock(x, y, z, vine, false); } - protected final void generateCuboid(final Vector start, final Vector area, final BlockType block, final boolean doReplace) { + protected void generateCuboid(Vector start, Vector area, BlockType block, boolean doReplace) { for (int x = (int) start.x; x < (int) start.x + area.x; ++x) { for (int y = (int) start.y; y < (int) start.y + area.y; ++y) { for (int z = (int) start.z; z < (int) start.z + area.z; ++z) { - this.addBlock(x, y, z, block, doReplace); + addBlock(x, y, z, block, doReplace); } } } } - protected final void generateCylinder(final Vector center2, final float radius, final int height, final BlockType block, final boolean doReplace) { - final float centerOffset = (this.girth - 1) / 2.0f; - final Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); - final Vector start = new Vector(center3.x - radius, center3.y, center3.z - radius); - final Vector area = new Vector(radius * 2.0f + 1.0f, height, radius * 2.0f + 1.0f); + protected void generateCylinder(Vector center2, float radius, int height, BlockType block, boolean doReplace) { + float centerOffset = (girth - 1) / 2.0f; + Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); + Vector start = new Vector(center3.x - radius, center3.y, center3.z - radius); + Vector area = new Vector(radius * 2.0f + 1.0f, height, radius * 2.0f + 1.0f); for (int x = (int) start.x; x < (int) start.x + area.x; ++x) { for (int y = (int) start.y; y < (int) start.y + area.y; ++y) { for (int z = (int) start.z; z < (int) start.z + area.z; ++z) { if (Vector.distance(new Vector(x, y, z), new Vector(center3.x, y, center3.z)) <= radius + 0.01) { - if (Vector.distance(new Vector(x, y, z), new Vector(center3.x, y, center3.z)) < radius - 0.5f || this.rand.nextFloat() >= this.bushiness) { - this.addBlock(x, y, z, block, doReplace); + if (Vector.distance(new Vector(x, y, z), new Vector(center3.x, y, center3.z)) < radius - 0.5f || rand.nextFloat() >= bushiness) { + addBlock(x, y, z, block, doReplace); } } } @@ -241,22 +237,22 @@ public abstract class WorldGenTree extends WorldGenerator } } - protected final void generateCircle(final Vector center, final float radius, final int width, final int height, final BlockType block, final boolean doReplace) { - this.generateCircle(center, radius, width, height, block, 1.0f, doReplace); + protected void generateCircle(Vector center, float radius, int width, int height, BlockType block, boolean doReplace) { + generateCircle(center, radius, width, height, block, 1.0f, doReplace); } - protected final void generateCircle(final Vector center2, final float radius, final int width, final int height, final BlockType block, final float chance, final boolean doReplace) { - final float centerOffset = (this.girth % 2 == 0) ? 0.5f : 0.0f; - final Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); - final Vector start = new Vector(center3.x - radius, center3.y, center3.z - radius); - final Vector area = new Vector(radius * 2.0f + 1.0f, height, radius * 2.0f + 1.0f); + protected void generateCircle(Vector center2, float radius, int width, int height, BlockType block, float chance, boolean doReplace) { + float centerOffset = (girth % 2 == 0) ? 0.5f : 0.0f; + Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); + Vector start = new Vector(center3.x - radius, center3.y, center3.z - radius); + Vector area = new Vector(radius * 2.0f + 1.0f, height, radius * 2.0f + 1.0f); for (int x = (int) start.x; x < (int) start.x + area.x; ++x) { for (int y = (int) start.y; y < (int) start.y + area.y; ++y) { for (int z = (int) start.z; z < (int) start.z + area.z; ++z) { - if (this.rand.nextFloat() <= chance) { - final double distance = Vector.distance(new Vector(x, y, z), new Vector(center3.x, y, center3.z)); + if (rand.nextFloat() <= chance) { + double distance = Vector.distance(new Vector(x, y, z), new Vector(center3.x, y, center3.z)); if (radius - width - 0.01 < distance && distance <= radius + 0.01) { - this.addBlock(x, y, z, block, doReplace); + addBlock(x, y, z, block, doReplace); } } } @@ -264,35 +260,34 @@ public abstract class WorldGenTree extends WorldGenerator } } - protected final void generateSphere(final Vector center2, final int radius, final BlockType block, final boolean doReplace) { - final float centerOffset = (this.girth - 1) / 2.0f; - final Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); - final Vector start = new Vector(center3.x - radius, center3.y - radius, center3.z - radius); - final Vector area = new Vector(radius * 2 + 1, radius * 2 + 1, radius * 2 + 1); + protected void generateSphere(Vector center2, int radius, BlockType block, boolean doReplace) { + float centerOffset = (girth - 1) / 2.0f; + Vector center3 = new Vector(center2.x + centerOffset, center2.y, center2.z + centerOffset); + Vector start = new Vector(center3.x - radius, center3.y - radius, center3.z - radius); + Vector area = new Vector(radius * 2 + 1, radius * 2 + 1, radius * 2 + 1); for (int x = (int) start.x; x < (int) start.x + area.x; ++x) { for (int y = (int) start.y; y < (int) start.y + area.y; ++y) { for (int z = (int) start.z; z < (int) start.z + area.z; ++z) { if (Vector.distance(new Vector(x, y, z), new Vector(center3.x, center3.y, center3.z)) <= radius + 0.01) { - this.addBlock(x, y, z, block, doReplace); + addBlock(x, y, z, block, doReplace); } } } } } - static class Vector - { + static class Vector { float x; float y; float z; - public Vector(final float f, final float h, final float g) { - this.x = f; - this.y = h; - this.z = g; + public Vector(float f, float h, float g) { + x = f; + y = h; + z = g; } - public static double distance(final Vector a, final Vector b) { + public static double distance(Vector a, Vector b) { return Math.sqrt(Math.pow(a.x - b.x, 2.0) + Math.pow(a.y - b.y, 2.0) + Math.pow(a.z - b.z, 2.0)); } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree2.java b/src/main/java/binnie/extratrees/gen/WorldGenTree2.java index 63c314af..9fd6ceca 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree2.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree2.java @@ -1,334 +1,321 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenTree2 -{ - public static class Olive extends WorldGenTree - { - public Olive(final ITreeGenData tree) { +public class WorldGenTree2 { + public static class Olive extends WorldGenTree { + public Olive(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.35f, 0.4f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.35f, 0.4f); if (width < 1.2) { width = 1.55f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Sweetgum extends WorldGenTree - { - public Sweetgum(final ITree tree) { + public static class Sweetgum extends WorldGenTree { + public Sweetgum(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.7f, 0.75f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.7f, 0.75f); if (width > 7.0f) { width = 7.0f; } - final float coneHeight = leafSpawn - bottom; + float coneHeight = leafSpawn - bottom; while (leafSpawn > bottom) { float radius = 1.0f - (leafSpawn - bottom) / coneHeight; radius *= 2.0f - radius; radius *= width; - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), radius, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), radius, 1, leaf, false); } - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Locust extends WorldGenTree - { - public Locust(final ITree tree) { + public static class Locust extends WorldGenTree { + public Locust(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.35f, 0.4f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 2.0f; + float width = height * randBetween(0.35f, 0.4f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom + 1.0f) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.3f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.3f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.7f, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 0.4f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Pear extends WorldGenTree - { - public Pear(final ITree tree) { + public static class Pear extends WorldGenTree { + public Pear(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(3, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(3, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Iroko extends WorldGenTree - { - public Iroko(final ITree tree) { + public static class Iroko extends WorldGenTree { + public Iroko(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.45f, 0.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.45f, 0.5f); if (width < 2.5f) { width = 2.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width * 0.25f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width * 0.25f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width * 0.5f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width * 0.5f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width * 0.7f, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width * 0.7f, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 2.0f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 2.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Gingko extends WorldGenTree - { - public Gingko(final ITree tree) { + public static class Gingko extends WorldGenTree { + public Gingko(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 2; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.55f, 0.6f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 2; + float bottom = 2.0f; + float width = height * randBetween(0.55f, 0.6f); if (width > 7.0f) { width = 7.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 2.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 2.0f, 1, leaf, false); while (leafSpawn > bottom * 2.0f + 1.0f) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 1.5f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width - 1.5f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.9f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.9f, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width, 1, leaf, false); while (leafSpawn > bottom) { - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 0.9f, 1, this.leaf, false); - final float f6 = 0.0f; - final float h6 = leafSpawn; + generateCylinder(new Vector(f5, h5, 0.0f), width - 0.9f, 1, leaf, false); + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), width, 1, leaf, false); } - final float f7 = 0.0f; - final float h7 = leafSpawn; + float f7 = 0.0f; + float h7 = leafSpawn; leafSpawn = h7 - 1.0f; - this.generateCylinder(new Vector(f7, h7, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f7, h7, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Box extends WorldGenTree - { - public Box(final ITree tree) { + public static class Box extends WorldGenTree { + public Box(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = 0.0f; - final float width = 1.5f; + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = 0.0f; + float width = 1.5f; while (leafSpawn > bottom) { - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(3, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(3, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Clove extends WorldGenTree - { - public Clove(final ITree tree) { + public static class Clove extends WorldGenTree { + public Clove(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.25f, 0.3f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = 2.0f; + float width = height * randBetween(0.25f, 0.3f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTree3.java b/src/main/java/binnie/extratrees/gen/WorldGenTree3.java index d1d63667..bf5427de 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTree3.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTree3.java @@ -1,413 +1,399 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; import forestry.api.world.ITreeGenData; -public class WorldGenTree3 -{ - public static class Hazel extends WorldGenTree - { - public Hazel(final ITreeGenData tree) { +public class WorldGenTree3 { + public static class Hazel extends WorldGenTree { + public Hazel(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 3.0f; - float width = this.height * this.randBetween(0.45f, 0.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 3.0f; + float width = height * randBetween(0.45f, 0.5f); if (width < 2.5f) { width = 2.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); } - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.3f, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.3f, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.6f, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.6f, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 1.2f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 1.2f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Sycamore extends WorldGenTree - { - public Sycamore(final ITree tree) { + public static class Sycamore extends WorldGenTree { + public Sycamore(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.35f, 0.4f); + generateTreeTrunk(height, girth); + float leafSpawn = height; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.35f, 0.4f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.3f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.3f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.6f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.8f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.8f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Hawthorn extends WorldGenTree - { - public Hawthorn(final ITree tree) { + public static class Hawthorn extends WorldGenTree { + public Hawthorn(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(1, 2); - float width = this.height * this.randBetween(0.4f, 0.45f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(1, 2); + float width = height * randBetween(0.4f, 0.45f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.8f * width, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), 0.8f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.5f, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), 0.7f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Pecan extends WorldGenTree - { - public Pecan(final ITree tree) { + public static class Pecan extends WorldGenTree { + public Pecan(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.6f, 0.65f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 2.0f; + float width = height * randBetween(0.6f, 0.65f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.6f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.6f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width, 1, leaf, false); } - final float f6 = 0.0f; - final float h6 = leafSpawn; + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), 0.6f * width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), 0.6f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Elm extends WorldGenTree - { - public Elm(final ITree tree) { + public static class Elm extends WorldGenTree { + public Elm(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = this.randBetween(2, 3); - float width = this.height * this.randBetween(0.45f, 0.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = randBetween(2, 3); + float width = height * randBetween(0.45f, 0.5f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); while (leafSpawn > bottom) { - final float f2 = 0.0f; - final float h2 = leafSpawn; + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.5f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Elder extends WorldGenTree - { - public Elder(final ITree tree) { + public static class Elder extends WorldGenTree { + public Elder(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 3.0f; - float width = this.height * this.randBetween(0.55f, 0.6f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 3.0f; + float width = height * randBetween(0.55f, 0.6f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width - 1.0f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width - 0.4f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width - 0.4f, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } - final float f4 = 0.0f; - final float h4 = leafSpawn; + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width - 0.4f, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 1.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Hornbeam extends WorldGenTree - { - public Hornbeam(final ITree tree) { + public static class Hornbeam extends WorldGenTree { + public Hornbeam(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.55f, 0.6f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 2.0f; + float width = height * randBetween(0.55f, 0.6f); if (width < 1.5f) { width = 1.5f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), 0.7f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f3, h3, 0.0f), width, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(5, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Sallow extends WorldGenTree - { - public Sallow(final ITree tree) { + public static class Sallow extends WorldGenTree { + public Sallow(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 2.0f; - float width = this.height * this.randBetween(0.6f, 0.65f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 2.0f; + float width = height * randBetween(0.6f, 0.65f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), 0.3f * width, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), 0.6f * width, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), 0.6f * width, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), 0.8f * width, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), 0.9f * width, 1, leaf, false); while (leafSpawn > bottom) { - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width, 1, leaf, false); } - final float f6 = 0.0f; - final float h6 = leafSpawn; + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), 0.6f * width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), 0.6f * width, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(4, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(4, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class AcornOak extends WorldGenTree - { - public AcornOak(final ITree tree) { + public static class AcornOak extends WorldGenTree { + public AcornOak(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height + 1; - final float bottom = 3.0f; - float width = this.height * this.randBetween(0.45f, 0.5f); + generateTreeTrunk(height, girth); + float leafSpawn = height + 1; + float bottom = 3.0f; + float width = height * randBetween(0.45f, 0.5f); if (width < 2.0f) { width = 2.0f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width * 0.4f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width * 0.4f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width * 0.7f, 1, this.leaf, false); + generateCylinder(new Vector(f2, h2, 0.0f), width * 0.7f, 1, leaf, false); while (leafSpawn > bottom) { - final float f3 = 0.0f; - final float h3 = leafSpawn; + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width - 0.2f, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width - 0.2f, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f4, h4, 0.0f), width, 1, leaf, false); } - final float f5 = 0.0f; - final float h5 = leafSpawn; + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width - 0.5f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width - 0.5f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(6, 2); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 2); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenTropical.java b/src/main/java/binnie/extratrees/gen/WorldGenTropical.java index d133da26..819c4481 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenTropical.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenTropical.java @@ -1,64 +1,58 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; -public class WorldGenTropical -{ - public static class Mango extends WorldGenTree - { - public Mango(final ITreeGenData tree) { +public class WorldGenTropical { + public static class Mango extends WorldGenTree { + public Mango(ITreeGenData tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - float leafSpawn = this.height; - float width = this.height * this.randBetween(0.7f, 0.75f); - final float bottom = 2.0f; + generateTreeTrunk(height, girth); + float leafSpawn = height; + float width = height * randBetween(0.7f, 0.75f); + float bottom = 2.0f; if (width < 1.2) { width = 1.55f; } - final float f = 0.0f; - final float h = leafSpawn; + float f = 0.0f; + float h = leafSpawn; leafSpawn = h - 1.0f; - this.generateCylinder(new Vector(f, h, 0.0f), width * 0.3f, 1, this.leaf, false); - final float f2 = 0.0f; - final float h2 = leafSpawn; + generateCylinder(new Vector(f, h, 0.0f), width * 0.3f, 1, leaf, false); + float f2 = 0.0f; + float h2 = leafSpawn; leafSpawn = h2 - 1.0f; - this.generateCylinder(new Vector(f2, h2, 0.0f), width * 0.5f, 1, this.leaf, false); - final float f3 = 0.0f; - final float h3 = leafSpawn; + generateCylinder(new Vector(f2, h2, 0.0f), width * 0.5f, 1, leaf, false); + float f3 = 0.0f; + float h3 = leafSpawn; leafSpawn = h3 - 1.0f; - this.generateCylinder(new Vector(f3, h3, 0.0f), width * 0.7f, 1, this.leaf, false); - final float f4 = 0.0f; - final float h4 = leafSpawn; + generateCylinder(new Vector(f3, h3, 0.0f), width * 0.7f, 1, leaf, false); + float f4 = 0.0f; + float h4 = leafSpawn; leafSpawn = h4 - 1.0f; - this.generateCylinder(new Vector(f4, h4, 0.0f), width * 0.8f, 1, this.leaf, false); - final float f5 = 0.0f; - final float h5 = leafSpawn; + generateCylinder(new Vector(f4, h4, 0.0f), width * 0.8f, 1, leaf, false); + float f5 = 0.0f; + float h5 = leafSpawn; leafSpawn = h5 - 1.0f; - this.generateCylinder(new Vector(f5, h5, 0.0f), width * 0.9f, 1, this.leaf, false); + generateCylinder(new Vector(f5, h5, 0.0f), width * 0.9f, 1, leaf, false); while (leafSpawn > bottom) { - final float f6 = 0.0f; - final float h6 = leafSpawn; + float f6 = 0.0f; + float h6 = leafSpawn; leafSpawn = h6 - 1.0f; - this.generateCylinder(new Vector(f6, h6, 0.0f), width, 1, this.leaf, false); + generateCylinder(new Vector(f6, h6, 0.0f), width, 1, leaf, false); } - final float f7 = 0.0f; - final float h7 = leafSpawn; + float f7 = 0.0f; + float h7 = leafSpawn; leafSpawn = h7 - 1.0f; - this.generateCylinder(new Vector(f7, h7, 0.0f), width - 1.0f, 1, this.leaf, false); + generateCylinder(new Vector(f7, h7, 0.0f), width - 1.0f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(5, 1); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(5, 1); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 2a8e7062..c0477970 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -1,65 +1,58 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.gen; import forestry.api.arboriculture.ITree; -public class WorldGenWalnut -{ - public static class BlackWalnut extends WorldGenTree - { - public BlackWalnut(final ITree tree) { +public class WorldGenWalnut { + public static class BlackWalnut extends WorldGenTree { + public BlackWalnut(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.6f, 1, this.leaf, false); - while (leafSpawn > this.randBetween(3, 4)) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.8f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.6f, 1, leaf, false); + while (leafSpawn > randBetween(3, 4)) { + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.8f, 1, leaf, false); } - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.7f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.8f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.7f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 1.8f, 1, leaf, false); } @Override public void preGenerate() { - this.height = this.determineHeight(9, 6); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(9, 6); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } - public static class Butternut extends WorldGenTree - { - public Butternut(final ITree tree) { + public static class Butternut extends WorldGenTree { + public Butternut(ITree tree) { super(tree); } @Override public void generate() { - this.generateTreeTrunk(this.height, this.girth); - int leafSpawn = this.height + 1; - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.5f, 1, this.leaf, false); - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, this.leaf, false); + generateTreeTrunk(height, girth); + int leafSpawn = height + 1; + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 2.0f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 3.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.5f, 1, leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, leaf, false); while (leafSpawn > 3) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, this.leaf, false); + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 5.0f, 1, leaf, false); } - if (this.rand.nextBoolean()) { - this.generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, this.leaf, false); + if (rand.nextBoolean()) { + generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 4.0f, 1, leaf, false); } } @Override public void preGenerate() { - this.height = this.determineHeight(6, 3); - this.girth = this.determineGirth(this.treeGen.getGirth(this.world, this.startX, this.startY, this.startZ)); + height = determineHeight(6, 3); + girth = determineGirth(treeGen.getGirth(world, startX, startY, startZ)); } } } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 1e06a518..a82bb0ee 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -1,37 +1,33 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; -import net.minecraftforge.common.BiomeDictionary; -import java.util.EnumSet; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.genetics.IIndividual; -import com.mojang.authlib.GameProfile; -import net.minecraft.world.World; -import forestry.api.genetics.AlleleManager; +import binnie.Binnie; import binnie.core.Mods; -import net.minecraft.init.Items; -import forestry.api.lepidopterology.IButterflyRoot; -import forestry.api.genetics.IAllele; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.IIconProvider; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; +import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; -import binnie.Binnie; -import java.util.HashMap; -import net.minecraft.item.ItemStack; -import java.util.Map; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IIconProvider; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import binnie.core.resource.BinnieResource; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterflyRoot; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.BiomeDictionary; -public enum ButterflySpecies implements IAlleleButterflySpecies -{ +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; + +public enum ButterflySpecies implements IAlleleButterflySpecies { WhiteAdmiral("White Admiral", "Limenitis camilla", 16448250), PurpleEmperor("Purple Emperor", "Apatura iris", 4338374), RedAdmiral("Red Admiral", "Vanessa atalanta", 15101764), @@ -55,28 +51,30 @@ public enum ButterflySpecies implements IAlleleButterflySpecies Monarch("Monarch", "Danaus plexippus", 16757254), MarbledWhite("Marbled White", "Melanargia galathea", 15527148); - String name; - String branchName; - String scientific; - BinnieResource texture; public IClassification branch; - int colour; + + protected String name; + protected String branchName; + protected String scientific; + protected BinnieResource texture; + protected int color; + private Map butterflyLoot; private Map caterpillarLoot; - private ButterflySpecies(final String name, final String scientific, final int colour) { - this.butterflyLoot = new HashMap(); - this.caterpillarLoot = new HashMap(); + ButterflySpecies(String name, String scientific, int color) { this.name = name; - this.branchName = scientific.split(" ")[0].toLowerCase(); this.scientific = scientific.split(" ")[1]; - this.texture = Binnie.Resource.getPNG(ExtraTrees.instance, ResourceType.Entity, this.toString()); - this.colour = colour; + this.color = color; + butterflyLoot = new HashMap<>(); + caterpillarLoot = new HashMap<>(); + branchName = scientific.split(" ")[0].toLowerCase(); + texture = Binnie.Resource.getPNG(ExtraTrees.instance, ResourceType.Entity, toString()); } @Override public String getName() { - return this.name; + return name; } @Override @@ -111,7 +109,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies @Override public String getBinomial() { - return this.scientific; + return scientific; } @Override @@ -121,7 +119,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies @Override public IClassification getBranch() { - return this.branch; + return branch; } @Override @@ -132,7 +130,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies @Override public String getUID() { - return "extrabutterflies.species." + this.toString().toLowerCase(); + return "extrabutterflies.species." + toString().toLowerCase(); } @Override @@ -142,11 +140,11 @@ public enum ButterflySpecies implements IAlleleButterflySpecies @Override public String getEntityTexture() { - return this.texture.getResourceLocation().toString(); + return texture.getResourceLocation().toString(); } public IAllele[] getTemplate() { - final IAllele[] def = this.getRoot().getDefaultTemplate().clone(); + IAllele[] def = getRoot().getDefaultTemplate().clone(); def[0] = this; return def; } @@ -167,18 +165,18 @@ public enum ButterflySpecies implements IAlleleButterflySpecies } @Override - public int getIconColour(final int renderPass) { - return (renderPass > 0) ? 16777215 : this.colour; + public int getIconColour(int renderPass) { + return (renderPass > 0) ? 16777215 : color; } @Override public Map getButterflyLoot() { - return new HashMap(); + return new HashMap<>(); } @Override public Map getCaterpillarLoot() { - return new HashMap(); + return new HashMap<>(); } @Override @@ -187,23 +185,26 @@ public enum ButterflySpecies implements IAlleleButterflySpecies } @Override - public float getResearchSuitability(final ItemStack itemstack) { + public float getResearchSuitability(ItemStack itemstack) { if (itemstack == null) { return 0.0f; } if (itemstack.getItem() == Items.glass_bottle) { return 0.9f; } - for (final ItemStack stack : this.butterflyLoot.keySet()) { + + for (ItemStack stack : butterflyLoot.keySet()) { if (stack.isItemEqual(itemstack)) { return 1.0f; } } - for (final ItemStack stack : this.caterpillarLoot.keySet()) { + + for (ItemStack stack : caterpillarLoot.keySet()) { if (stack.isItemEqual(itemstack)) { return 1.0f; } } + if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) { return 0.5f; } @@ -216,7 +217,8 @@ public enum ButterflySpecies implements IAlleleButterflySpecies if (AlleleManager.alleleRegistry.isIndividual(itemstack)) { return 1.0f; } - for (final Map.Entry entry : this.getRoot().getResearchCatalysts().entrySet()) { + + for (Map.Entry entry : getRoot().getResearchCatalysts().entrySet()) { if (entry.getKey().isItemEqual(itemstack)) { return entry.getValue(); } @@ -225,8 +227,8 @@ public enum ButterflySpecies implements IAlleleButterflySpecies } @Override - public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - return new ItemStack[] { this.getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal()) }; + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + return new ItemStack[]{getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal())}; } @Override @@ -246,6 +248,6 @@ public enum ButterflySpecies implements IAlleleButterflySpecies @Override public String getUnlocalizedName() { - return this.getUID(); + return getUID(); } } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java index 49cf3e8d..da083b83 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java @@ -1,21 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; import forestry.api.genetics.IFruitFamily; -public enum ExtraTreeFruitFamily implements IFruitFamily -{ +public enum ExtraTreeFruitFamily implements IFruitFamily { Berry("Berries", "berry", "berri"), Citrus("Citrus", "citrus", "citrus"); - String name; - String uid; - String scientific; + protected String name; + protected String uid; + protected String scientific; - private ExtraTreeFruitFamily(final String name, final String uid, final String scientific) { + ExtraTreeFruitFamily(String name, String uid, String scientific) { this.name = name; this.uid = uid; this.scientific = scientific; @@ -23,21 +18,21 @@ public enum ExtraTreeFruitFamily implements IFruitFamily @Override public String getUID() { - return "binnie.family." + this.uid; + return "binnie.family." + uid; } @Override public String getName() { - return this.name; + return name; } @Override public String getScientific() { - return this.scientific; + return scientific; } @Override public String getDescription() { - return this.name; + return name; } } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 140fbb24..9237fcc8 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -1,137 +1,140 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; -import net.minecraft.init.Blocks; -import net.minecraft.util.Direction; - -import forestry.api.genetics.IChromosomeType; -import forestry.api.arboriculture.EnumTreeChromosome; - -import java.util.List; -import java.util.Map; -import java.util.ArrayList; - -import net.minecraft.world.World; -import net.minecraft.world.IBlockAccess; - -import forestry.api.arboriculture.ITreeGenome; -import binnie.extratrees.ExtraTrees; - -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.genetics.IAlleleSpecies; import binnie.Binnie; - -import java.lang.reflect.Field; - -import forestry.arboriculture.FruitProviderNone; -import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; - -import net.minecraft.init.Items; - -import forestry.api.genetics.AlleleManager; - -import net.minecraft.item.ItemStack; - -import java.util.HashMap; - -import binnie.extratrees.block.FruitPod; -import forestry.api.genetics.IFruitFamily; -import forestry.api.arboriculture.IFruitProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IFruitFamily; +import forestry.arboriculture.FruitProviderNone; +import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLog; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider -{ - Blackthorn(10, 7180062, 14561129, FruitSprite.Small), - CherryPlum(10, 7180062, 15211595, FruitSprite.Small), - Peach(10, 7180062, 16424995, FruitSprite.Average), - Nectarine(10, 7180062, 16405795, FruitSprite.Average), - Apricot(10, 7180062, 16437027, FruitSprite.Average), - Almond(10, 7180062, 9364342, FruitSprite.Small), - WildCherry(10, 7180062, 16711680, FruitSprite.Tiny), - SourCherry(10, 7180062, 10225963, FruitSprite.Tiny), - BlackCherry(10, 7180062, 4852249, FruitSprite.Tiny), - Orange(10, 3665987, 16749578, FruitSprite.Average), - Manderin(10, 3665987, 16749578, FruitSprite.Average), - Tangerine(10, 3665987, 16749578, FruitSprite.Average), - Satsuma(10, 3665987, 16749578, FruitSprite.Average), - KeyLime(10, 3665987, 10223428, FruitSprite.Small), - Lime(10, 3665987, 10223428, FruitSprite.Average), - FingerLime(10, 3665987, 11156280, FruitSprite.Small), - Pomelo(10, 3665987, 6083402, FruitSprite.Larger), - Grapefruit(10, 3665987, 16749578, FruitSprite.Large), - Kumquat(10, 3665987, 16749578, FruitSprite.Small), - Citron(10, 3665987, 16772192, FruitSprite.Large), - BuddhaHand(10, 3665987, 16772192, FruitSprite.Large), - Apple(10, 7915859, 16193046, FruitSprite.Average), - Crabapple(10, 7915859, 16760140, FruitSprite.Average), +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { + Blackthorn(10, 0x6d8f1e, 0xde2f69, FruitSprite.Small), + CherryPlum(10, 0x6d8f1e, 0xe81c4b, FruitSprite.Small), + Peach(10, 0x6d8f1e, 0xfaa023, FruitSprite.Average), + Nectarine(10, 0x6d8f1e, 0xfa5523, FruitSprite.Average), + Apricot(10, 0x6d8f1e, 0xfacf23, FruitSprite.Average), + Almond(10, 0x6d8f1e, 0x8ee376, FruitSprite.Small), + WildCherry(10, 0x6d8f1e, 0xff0000, FruitSprite.Tiny), + SourCherry(10, 0x6d8f1e, 0x9c092b, FruitSprite.Tiny), + BlackCherry(10, 0x6d8f1e, 0x4a0a19, FruitSprite.Tiny), + Orange(10, 0x37f043, 0xff940a, FruitSprite.Average), + Manderin(10, 0x37f043, 0xff940a, FruitSprite.Average), + Tangerine(10, 0x37f043, 0xff940a, FruitSprite.Average), + Satsuma(10, 0x37f043, 0xff940a, FruitSprite.Average), + KeyLime(10, 0x37f043, 0x9bff44, FruitSprite.Small), + Lime(10, 0x37f043, 0x9bff44, FruitSprite.Average), + FingerLime(10, 0x37f043, 0xaa3b38, FruitSprite.Small), + Pomelo(10, 0x37f043, 0x5cd34a, FruitSprite.Larger), + Grapefruit(10, 0x37f043, 0xff940a, FruitSprite.Large), + Kumquat(10, 0x37f043, 0xff940a, FruitSprite.Small), + Citron(10, 0x37f043, 0xffec60, FruitSprite.Large), + BuddhaHand(10, 0x37f043, 0xffec60, FruitSprite.Large), + Apple(10, 0x78c953, 0xf71616, FruitSprite.Average), + Crabapple(10, 0x78c953, 0xffbd4c, FruitSprite.Average), Banana("Banana", FruitPod.Banana), RedBanana("Red Banana", FruitPod.RedBanana), Plantain("Platain", FruitPod.Plantain), - Hazelnut(7, 8223006, 14463606, FruitSprite.Small), - Butternut(7, 11712336, 16102498, FruitSprite.Small), - Beechnut(8, 14401148, 6241845, FruitSprite.Tiny), - Pecan(8, 10660940, 15781769, FruitSprite.Small), - BrazilNut(10, 5875561, 9852208, FruitSprite.Large), - Fig(9, 14201186, 7094086, FruitSprite.Small), - Acorn(6, 7516710, 11364893, FruitSprite.Tiny), - Elderberry(9, 7444317, 5331779, FruitSprite.Tiny), - Olive(9, 8887861, 6444842, FruitSprite.Small), - GingkoNut(7, 9213787, 15063725, FruitSprite.Tiny), - Coffee(8, 7433501, 16273254, FruitSprite.Tiny), - Pear(10, 10456913, 10474833, FruitSprite.Pear), - OsangeOsange(10, 9934674, 10665767, FruitSprite.Larger), - Clove(9, 6847532, 11224133, FruitSprite.Tiny), + Hazelnut(7, 0x7d791e, 0xdcb276, FruitSprite.Small), + Butternut(7, 0xb2b750, 0xf5b462, FruitSprite.Small), + Beechnut(8, 0xdbbe7c, 0x5f3e35, FruitSprite.Tiny), + Pecan(8, 0xa2ac4c, 0xf0cf89, FruitSprite.Small), + BrazilNut(10, 0x59a769, 0x965530, FruitSprite.Large), + Fig(9, 0xd8b162, 0x6c3f46, FruitSprite.Small), + Acorn(6, 0x72b226, 0xad6a1d, FruitSprite.Tiny), + Elderberry(9, 0x71975d, 0x515b43, FruitSprite.Tiny), + Olive(9, 0x879e35, 0x62572a, FruitSprite.Small), + GingkoNut(7, 0x8c975b, 0xe5daad, FruitSprite.Tiny), + Coffee(8, 0x716d1d, 0xf84f66, FruitSprite.Tiny), + Pear(10, 0x9f8f51, 0x9fd551, FruitSprite.Pear), + OsangeOsange(10, 0x979752, 0xa2bf27, FruitSprite.Larger), + Clove(9, 0x687c2c, 0xab4445, FruitSprite.Tiny), Coconut("Coconut", FruitPod.Coconut), - Cashew(8, 12879132, 15289111, FruitSprite.Average), - Avacado(10, 10272370, 2170640, FruitSprite.Pear), - Nutmeg(9, 14861101, 11305813, FruitSprite.Tiny), - Allspice(9, 15180922, 7423542, FruitSprite.Tiny), - Chilli(10, 7430757, 15145010, FruitSprite.Small), - StarAnise(8, 8733742, 13917189, FruitSprite.Tiny), - Mango(10, 6654997, 15902262, FruitSprite.Average), - Starfruit(10, 9814541, 15061550, FruitSprite.Average), - Candlenut(8, 8235123, 14600882, FruitSprite.Small), + Cashew(8, 0xc4851c, 0xe94b17, FruitSprite.Average), + Avacado(10, 0x9cbe72, 0x211f10, FruitSprite.Pear), + Nutmeg(9, 0xe2c32d, 0xac8355, FruitSprite.Tiny), + Allspice(9, 0xe7a47a, 0x714636, FruitSprite.Tiny), + Chilli(10, 0x716265, 0xe71832, FruitSprite.Small), + StarAnise(8, 0x85442e, 0xd45c05, FruitSprite.Tiny), + Mango(10, 0x658c15, 0xf2a636, FruitSprite.Average), + Starfruit(10, 0x95c20d, 0xe5d22e, FruitSprite.Average), + Candlenut(8, 0x7da873, 0xdecab2, FruitSprite.Small), Papayimar("Papayimar", FruitPod.Papayimar), - Blackcurrant(8, 9407571, 4935251, FruitSprite.Tiny), - Redcurrant(8, 13008910, 15080974, FruitSprite.Tiny), - Blackberry(8, 9399665, 4801393, FruitSprite.Tiny), - Raspberry(8, 15520197, 14510449, FruitSprite.Tiny), - Blueberry(8, 10203799, 6329278, FruitSprite.Tiny), - Cranberry(8, 12232496, 14555696, FruitSprite.Tiny), - Juniper(8, 10194034, 6316914, FruitSprite.Tiny), - Gooseberry(8, 12164944, 12177232, FruitSprite.Tiny), - GoldenRaspberry(8, 12496955, 15970363, FruitSprite.Tiny); + Blackcurrant(8, 0x8f8c53, 0x4b4e53, FruitSprite.Tiny), + Redcurrant(8, 0xc6800e, 0xe61e0e, FruitSprite.Tiny), + Blackberry(8, 0x8f6d71, 0x494371, FruitSprite.Tiny), + Raspberry(8, 0xecd1c5, 0xdd6971, FruitSprite.Tiny), + Blueberry(8, 0x9bb297, 0x6093be, FruitSprite.Tiny), + Cranberry(8, 0xbaa730, 0xde1a30, FruitSprite.Tiny), + Juniper(8, 0x9b8c72, 0x606372, FruitSprite.Tiny), + Gooseberry(8, 0xb99f50, 0xb9cf50, FruitSprite.Tiny), + GoldenRaspberry(8, 0xbeb03b, 0xf3b03b, FruitSprite.Tiny); - IFruitFamily family; - boolean isRipening; - int diffR; - int diffG; - int diffB; - FruitPod pod; - int ripeningPeriod; - int colourUnripe; - int colour; - FruitSprite index; - HashMap products; + protected IFruitFamily family; + protected boolean isRipening; + protected int diffR; + protected int diffG; + protected int diffB; + protected FruitPod pod; + protected int ripeningPeriod; + protected int colourUnripe; + protected int colour; + protected FruitSprite index; + protected HashMap products; + + ExtraTreeFruitGene(int time, int unripe, int colour, FruitSprite index) { + isRipening = false; + diffB = 0; + pod = null; + ripeningPeriod = 0; + products = new HashMap<>(); + this.colour = colour; + this.index = index; + setRipening(time, unripe); + } + + ExtraTreeFruitGene(String name, FruitPod pod) { + isRipening = false; + diffB = 0; + this.pod = null; + ripeningPeriod = 0; + products = new HashMap(); + this.pod = pod; + ripeningPeriod = 2; + } public static void init() { - final IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); - final IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); - final IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); - final IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); - final IFruitFamily familyBerry = ExtraTreeFruitFamily.Berry; - final IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus; + IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); + IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); + IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); + IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); + IFruitFamily familyBerry = ExtraTreeFruitFamily.Berry; + IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus; AlleleManager.alleleRegistry.registerFruitFamily(familyBerry); AlleleManager.alleleRegistry.registerFruitFamily(familyCitrus); ExtraTreeFruitGene.Apple.addProduct(new ItemStack(Items.apple), 1.0f); @@ -252,12 +255,13 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider ExtraTreeFruitGene.Starfruit.setFamily(familyJungle); ExtraTreeFruitGene.Candlenut.addProduct(Food.Candlenut.get(1), 1.0f); ExtraTreeFruitGene.Candlenut.setFamily(familyJungle); + if (ConfigurationMain.alterLemon) { try { - final IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon"); - final FruitProviderNone prov = (FruitProviderNone) lemon.getProvider(); - final Field f = FruitProviderNone.class.getDeclaredField("family"); - final Field modifiersField = Field.class.getDeclaredField("modifiers"); + IAlleleFruit lemon = (IAlleleFruit) AlleleManager.alleleRegistry.getAllele("forestry.fruitLemon"); + FruitProviderNone prov = (FruitProviderNone) lemon.getProvider(); + Field f = FruitProviderNone.class.getDeclaredField("family"); + Field modifiersField = Field.class.getDeclaredField("modifiers"); f.setAccessible(true); modifiersField.setAccessible(true); modifiersField.setInt(f, f.getModifiers() & 0xFFFFFFEF); @@ -266,54 +270,49 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider e.printStackTrace(); } } - for (final IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) { + + for (IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) { if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); } } } - private void setFamily(final IFruitFamily family) { - this.family = family; + public static int getDirectionalMetadata(World world, int x, int y, int z) { + for (int i = 0; i < 4; ++i) { + if (isValidPot(world, x, y, z, i)) { + return i; + } + } + return -1; } - private ExtraTreeFruitGene(final int time, final int unripe, final int colour, final FruitSprite index) { - this.isRipening = false; - this.diffB = 0; - this.pod = null; - this.ripeningPeriod = 0; - this.products = new HashMap(); - this.colour = colour; - this.index = index; - this.setRipening(time, unripe); + public static boolean isValidPot(World world, int x, int y, int z, int notchDirection) { + x += Direction.offsetX[notchDirection]; + z += Direction.offsetZ[notchDirection]; + Block block = world.getBlock(x, y, z); + if (block == Blocks.log || block == Blocks.log2) { + return BlockLog.func_150165_c(world.getBlockMetadata(x, y, z)) == 3; + } + return block != null && block.isWood(world, x, y, z); } - private ExtraTreeFruitGene(final String name, final FruitPod pod) { - this.isRipening = false; - this.diffB = 0; - this.pod = null; - this.ripeningPeriod = 0; - this.products = new HashMap(); - this.pod = pod; - this.ripeningPeriod = 2; + public void setRipening(int time, int unripe) { + ripeningPeriod = time; + colourUnripe = unripe; + isRipening = true; + diffR = (colour >> 16 & 0xFF) - (unripe >> 16 & 0xFF); + diffG = (colour >> 8 & 0xFF) - (unripe >> 8 & 0xFF); + diffB = (colour & 0xFF) - (unripe & 0xFF); } - public void setRipening(final int time, final int unripe) { - this.ripeningPeriod = time; - this.colourUnripe = unripe; - this.isRipening = true; - this.diffR = (this.colour >> 16 & 0xFF) - (unripe >> 16 & 0xFF); - this.diffG = (this.colour >> 8 & 0xFF) - (unripe >> 8 & 0xFF); - this.diffB = (this.colour & 0xFF) - (unripe & 0xFF); - } - - public void addProduct(final ItemStack product, final float chance) { - this.products.put(product, chance); + public void addProduct(ItemStack product, float chance) { + products.put(product, chance); } @Override public String getUID() { - return "extratrees.fruit." + this.toString().toLowerCase(); + return "extratrees.fruit." + toString().toLowerCase(); } @Override @@ -328,7 +327,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider @Override public ItemStack[] getProducts() { - return this.products.keySet().toArray(new ItemStack[0]); + return products.keySet().toArray(new ItemStack[0]); } @Override @@ -338,43 +337,48 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider @Override public String getDescription() { - return ExtraTrees.proxy.localise("item.food." + this.name().toLowerCase()); + return ExtraTrees.proxy.localise("item.food." + name().toLowerCase()); } @Override public IFruitFamily getFamily() { - return this.family; + return family; + } + + private void setFamily(IFruitFamily family) { + this.family = family; } @Override - public int getColour(final ITreeGenome genome, final IBlockAccess world, final int x, final int y, final int z, final int ripeningTime) { - if (!this.isRipening) { - return this.colour; + public int getColour(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime) { + if (!isRipening) { + return colour; } - final float stage = this.getRipeningStage(ripeningTime); - final int r = (this.colourUnripe >> 16 & 0xFF) + (int) (this.diffR * stage); - final int g = (this.colourUnripe >> 8 & 0xFF) + (int) (this.diffG * stage); - final int b = (this.colourUnripe & 0xFF) + (int) (this.diffB * stage); + + float stage = getRipeningStage(ripeningTime); + int r = (colourUnripe >> 16 & 0xFF) + (int) (diffR * stage); + int g = (colourUnripe >> 8 & 0xFF) + (int) (diffG * stage); + int b = (colourUnripe & 0xFF) + (int) (diffB * stage); return (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF); } @Override - public boolean markAsFruitLeaf(final ITreeGenome genome, final World world, final int x, final int y, final int z) { - return this.pod == null; + public boolean markAsFruitLeaf(ITreeGenome genome, World world, int x, int y, int z) { + return pod == null; } @Override public int getRipeningPeriod() { - return this.ripeningPeriod; + return ripeningPeriod; } @Override - public ItemStack[] getFruits(final ITreeGenome genome, final World world, final int x, final int y, final int z, final int ripeningTime) { - if (this.pod != null) { + public ItemStack[] getFruits(ITreeGenome genome, World world, int x, int y, int z, int ripeningTime) { + if (pod != null) { if (ripeningTime >= 2) { - final List product = new ArrayList(); - for (final Map.Entry entry : this.products.entrySet()) { - final ItemStack single = entry.getKey().copy(); + List product = new ArrayList(); + for (Map.Entry entry : products.entrySet()) { + ItemStack single = entry.getKey().copy(); single.stackSize = 1; for (int i = 0; i < entry.getKey().stackSize; ++i) { if (world.rand.nextFloat() <= entry.getValue()) { @@ -386,72 +390,55 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider } return new ItemStack[0]; } - else { - final ArrayList product2 = new ArrayList(); - final float stage = this.getRipeningStage(ripeningTime); - if (stage < 0.5f) { - return new ItemStack[0]; - } - final float modeYieldMod = 1.0f; - for (final Map.Entry entry2 : this.products.entrySet()) { - if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) { - product2.add(entry2.getKey().copy()); - } - } - return product2.toArray(new ItemStack[0]); + + ArrayList product2 = new ArrayList(); + float stage = getRipeningStage(ripeningTime); + if (stage < 0.5f) { + return new ItemStack[0]; } + + float modeYieldMod = 1.0f; + for (Map.Entry entry2 : products.entrySet()) { + if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) { + product2.add(entry2.getKey().copy()); + } + } + return product2.toArray(new ItemStack[0]); } - private float getRipeningStage(final int ripeningTime) { - if (ripeningTime >= this.ripeningPeriod) { + private float getRipeningStage(int ripeningTime) { + if (ripeningTime >= ripeningPeriod) { return 1.0f; } - return ripeningTime / this.ripeningPeriod; + return ripeningTime / ripeningPeriod; } @Override public boolean requiresFruitBlocks() { - return this.pod != null; + return pod != null; } @Override - public boolean trySpawnFruitBlock(final ITreeGenome genome, final World world, final int x, final int y, final int z) { - return this.pod != null && world.rand.nextFloat() <= genome.getSappiness() && Binnie.Genetics.getTreeRoot().setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), genome.getSappiness(), this.pod.getTextures(), x, y, z); + public boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z) { + return pod != null + && world.rand.nextFloat() <= genome.getSappiness() + && Binnie.Genetics.getTreeRoot().setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), genome.getSappiness(), pod.getTextures(), x, y, z); } - public boolean setFruitBlock(final World world, final IAlleleFruit allele, final float sappiness, final int x, final int y, final int z) { + public boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, int x, int y, int z) { return true; } - public static int getDirectionalMetadata(final World world, final int x, final int y, final int z) { - for (int i = 0; i < 4; ++i) { - if (isValidPot(world, x, y, z, i)) { - return i; - } - } - return -1; - } - - public static boolean isValidPot(final World world, int x, final int y, int z, final int notchDirection) { - x += Direction.offsetX[notchDirection]; - z += Direction.offsetZ[notchDirection]; - final Block block = world.getBlock(x, y, z); - if (block == Blocks.log || block == Blocks.log2) { - return BlockLog.func_150165_c(world.getBlockMetadata(x, y, z)) == 3; - } - return block != null && block.isWood(world, x, y, z); - } - @Override - public short getIconIndex(final ITreeGenome genome, final IBlockAccess world, final int x, final int y, final int z, final int ripeningTime, final boolean fancy) { - return this.index.getIndex(); + public short getIconIndex(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, boolean fancy) { + return index.getIndex(); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - if (this.ordinal() == 0) { - for (final FruitSprite sprite : FruitSprite.values()) { + public void registerIcons(IIconRegister register) { + if (ordinal() == 0) { + for (FruitSprite sprite : FruitSprite.values()) { sprite.registerIcons(register); } } @@ -459,14 +446,15 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider @Override public String getName() { - return this.getDescription(); + return getDescription(); } public String getNameOfFruit() { if (this == ExtraTreeFruitGene.Apple) { return "Apple"; } - for (final ItemStack stack : this.products.keySet()) { + + for (ItemStack stack : products.keySet()) { if (stack.getItem() == ExtraTrees.itemFood) { return Food.values()[stack.getItemDamage()].toString(); } @@ -476,6 +464,6 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider @Override public String getUnlocalizedName() { - return this.getUID(); + return getUID(); } } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java index 0546e418..d7aba693 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeGrowthProvider.java @@ -1,20 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; import forestry.api.arboriculture.EnumGrowthConditions; -import net.minecraft.world.World; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.IAlleleGrowth; +import forestry.api.arboriculture.IGrowthProvider; +import forestry.api.arboriculture.ITreeGenome; +import net.minecraft.world.World; -public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider -{ +// TODO unused class? +public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider { @Override public String getUID() { - return "extratrees.fruit." + this.toString().toLowerCase(); + return "extratrees.fruit." + toString().toLowerCase(); } @Override @@ -28,12 +24,12 @@ public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider } @Override - public boolean canGrow(final ITreeGenome genome, final World world, final int xPos, final int yPos, final int zPos, final int expectedGirth, final int expectedHeight) { + public boolean canGrow(ITreeGenome genome, World world, int xPos, int yPos, int zPos, int expectedGirth, int expectedHeight) { return false; } @Override - public EnumGrowthConditions getGrowthConditions(final ITreeGenome genome, final World world, final int xPos, final int yPos, final int zPos) { + public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos) { return null; } @@ -49,11 +45,11 @@ public class ExtraTreeGrowthProvider implements IAlleleGrowth, IGrowthProvider @Override public String getName() { - return this.getProvider().getDescription(); + return getProvider().getDescription(); } @Override public String getUnlocalizedName() { - return this.getUID(); + return getUID(); } } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 64d51f9b..f91dc569 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -1,42 +1,52 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; +import binnie.Binnie; +import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; - -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; - +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; -import forestry.api.genetics.IMutation; -import binnie.Binnie; -import forestry.api.genetics.AlleleManager; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.genetics.IAllele; -import forestry.api.arboriculture.ITreeMutation; +public class ExtraTreeMutation implements ITreeMutation { + protected int chance; + protected boolean isSecret; + protected IAlleleTreeSpecies allele0; + protected IAlleleTreeSpecies allele1; + protected IAllele[] template; -public class ExtraTreeMutation implements ITreeMutation -{ - int chance; - boolean isSecret; - IAlleleTreeSpecies allele0; - IAlleleTreeSpecies allele1; - IAllele[] template; private float minTemperature; private float maxTemperature; private float minRainfall; private float maxRainfall; private float height; + public ExtraTreeMutation(IAllele allele0, IAllele allele1, IAllele result, int chance) { + this(allele0, allele1, Binnie.Genetics.getTreeRoot().getTemplate(result.getUID()), chance); + } + + public ExtraTreeMutation(IAllele allele0, IAllele allele1, IAllele[] template, int chance) { + isSecret = false; + minTemperature = 0.0f; + maxTemperature = 2.0f; + minRainfall = 0.0f; + maxRainfall = 2.0f; + height = -1.0f; + this.allele0 = (IAlleleTreeSpecies) allele0; + this.allele1 = (IAlleleTreeSpecies) allele1; + this.template = template; + this.chance = chance; + Binnie.Genetics.getTreeRoot().registerMutation(this); + } + public static void init() { - final IAlleleTreeSpecies lemon = (IAlleleTreeSpecies) getVanilla("Lemon"); + IAlleleTreeSpecies lemon = (IAlleleTreeSpecies) getVanilla("Lemon"); new ExtraTreeMutation(getVanilla("Cherry"), lemon, ExtraTreeSpecies.KeyLime, 10); new ExtraTreeMutation(ExtraTreeSpecies.KeyLime, lemon, ExtraTreeSpecies.FingerLime, 10); new ExtraTreeMutation(getVanilla("Cherry"), lemon, ExtraTreeSpecies.Pomelo, 10); @@ -136,50 +146,32 @@ public class ExtraTreeMutation implements ITreeMutation new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Alder, ExtraTreeSpecies.DwarfHazel, 10); } - public static IAllele getVanilla(final String uid) { - final IAllele allele = AlleleManager.alleleRegistry.getAllele("forestry.tree" + uid); + public static IAllele getVanilla(String uid) { + IAllele allele = AlleleManager.alleleRegistry.getAllele("forestry.tree" + uid); if (allele == null) { throw new RuntimeException("No forestry species with id " + uid); } return allele; } - public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele result, final int chance) { - this(allele0, allele1, Binnie.Genetics.getTreeRoot().getTemplate(result.getUID()), chance); - } - - public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { - this.isSecret = false; - this.minTemperature = 0.0f; - this.maxTemperature = 2.0f; - this.minRainfall = 0.0f; - this.maxRainfall = 2.0f; - this.height = -1.0f; - this.allele0 = (IAlleleTreeSpecies) allele0; - this.allele1 = (IAlleleTreeSpecies) allele1; - this.template = template; - this.chance = chance; - Binnie.Genetics.getTreeRoot().registerMutation(this); - } - public ExtraTreeMutation setIsSecret() { - this.isSecret = true; + isSecret = true; return this; } - public ExtraTreeMutation setTemperature(final float minTemperature, final float maxTemperature) { + public ExtraTreeMutation setTemperature(float minTemperature, float maxTemperature) { this.minTemperature = minTemperature; this.maxTemperature = maxTemperature; return this; } - public ExtraTreeMutation setRainfall(final float minRainfall, final float maxRainfall) { + public ExtraTreeMutation setRainfall(float minRainfall, float maxRainfall) { this.minRainfall = minRainfall; this.maxRainfall = maxRainfall; return this; } - public ExtraTreeMutation setTemperatureRainfall(final float minTemperature, final float maxTemperature, final float minRainfall, final float maxRainfall) { + public ExtraTreeMutation setTemperatureRainfall(float minTemperature, float maxTemperature, float minRainfall, float maxRainfall) { this.minTemperature = minTemperature; this.maxTemperature = maxTemperature; this.minRainfall = minRainfall; @@ -187,60 +179,60 @@ public class ExtraTreeMutation implements ITreeMutation return this; } - public ExtraTreeMutation setHeight(final int minHeight) { - this.height = minHeight; + public ExtraTreeMutation setHeight(int minHeight) { + height = minHeight; return this; } @Override public IAlleleTreeSpecies getAllele0() { - return this.allele0; + return allele0; } @Override public IAlleleTreeSpecies getAllele1() { - return this.allele1; + return allele1; } @Override public float getBaseChance() { - return this.chance; + return chance; } @Override public IAllele[] getTemplate() { - return this.template; + return template; } @Override - public boolean isPartner(final IAllele allele) { - return this.allele0.getUID().equals(allele.getUID()) || this.allele1.getUID().equals(allele.getUID()); + public boolean isPartner(IAllele allele) { + return allele0.getUID().equals(allele.getUID()) || allele1.getUID().equals(allele.getUID()); } @Override - public IAllele getPartner(final IAllele allele) { - if (this.allele0.getUID().equals(allele.getUID())) { - return this.allele1; + public IAllele getPartner(IAllele allele) { + if (allele0.getUID().equals(allele.getUID())) { + return allele1; } - return this.allele0; + return allele0; } @Override public boolean isSecret() { - return this.isSecret; + return isSecret; } @Override - public float getChance(final World world, final int x, final int y, final int z, final IAlleleTreeSpecies allele0, final IAlleleTreeSpecies allele1, final ITreeGenome genome0, final ITreeGenome genome1) { - final int processedChance = this.chance; - final BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); - if (biome.temperature < this.minTemperature || biome.temperature > this.maxTemperature) { + public float getChance(World world, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) { + int processedChance = chance; + BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); + if (biome.temperature < minTemperature || biome.temperature > maxTemperature) { return 0.0f; } - if (biome.rainfall < this.minRainfall || biome.rainfall > this.maxRainfall) { + if (biome.rainfall < minRainfall || biome.rainfall > maxRainfall) { return 0.0f; } - if (this.height > 0.0f && y < this.height) { + if (height > 0.0f && y < height) { return 0.0f; } if (this.allele0.getUID().equals(allele0.getUID()) && this.allele1.getUID().equals(allele1.getUID())) { @@ -254,9 +246,9 @@ public class ExtraTreeMutation implements ITreeMutation @Override public Collection getSpecialConditions() { - final List conditions = new ArrayList(); - if (this.height > 0.0f) { - conditions.add("Minimum height from bedrock of " + this.height); + List conditions = new ArrayList(); + if (height > 0.0f) { + conditions.add("Minimum height from bedrock of " + height); } return conditions; } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index a98d1138..2f4b79b4 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -1,60 +1,5 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; -import java.awt.Color; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import com.mojang.authlib.GameProfile; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.util.ForgeDirection; - -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumLeafType; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IGermlingIconProvider; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenerator; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeRoot; -import forestry.api.arboriculture.TreeManager; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IIconProvider; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.IFruitFamily; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.world.ITreeGenData; -import forestry.arboriculture.blocks.BlockForestryLeaves; -import forestry.arboriculture.genetics.Tree; -import forestry.arboriculture.render.TextureLeaves; -import forestry.arboriculture.tiles.TileLeaves; -import forestry.core.config.Constants; -import forestry.core.render.TextureManager; -import forestry.plugins.PluginArboriculture; import binnie.Binnie; import binnie.core.Mods; import binnie.core.genetics.ForestryAllele; @@ -82,109 +27,152 @@ import binnie.extratrees.gen.WorldGenTree2; import binnie.extratrees.gen.WorldGenTree3; import binnie.extratrees.gen.WorldGenTropical; import binnie.extratrees.gen.WorldGenWalnut; +import com.mojang.authlib.GameProfile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IGermlingIconProvider; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenerator; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.ITreeRoot; +import forestry.api.arboriculture.TreeManager; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IIconProvider; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IClassification; +import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.world.ITreeGenData; +import forestry.arboriculture.blocks.BlockForestryLeaves; +import forestry.arboriculture.genetics.Tree; +import forestry.arboriculture.render.TextureLeaves; +import forestry.arboriculture.tiles.TileLeaves; +import forestry.core.config.Constants; +import forestry.core.render.TextureManager; +import forestry.plugins.PluginArboriculture; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.util.ForgeDirection; -public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider -{ - OrchardApple("malus", "domestica", 6588464, 16751859, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Apple, WorldGenApple.OrchardApple.class), - SweetCrabapple("malus", "coronaria", 8034643, 16528799, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.SweetCrabapple.class), - FloweringCrabapple("malus", "hopa", 8034643, 16528799, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.FloweringCrabapple.class), - PrairieCrabapple("malus", "ioensis", 8034643, 16528799, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.PrairieCrabapple.class), - Blackthorn("prunus", "spinosa ", 7180062, 16746439, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Blackthorn, (Class) null), - CherryPlum("prunus", "cerasifera", 7180062, 16746439, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.CherryPlum, (Class) null), - Peach("prunus", "persica", 7180062, 16721562, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Peach, (Class) null), - Nectarine("prunus", "nectarina", 7180062, 16721562, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Nectarine, (Class) null), - Apricot("prunus", "armeniaca", 7180062, 16103640, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Apricot, (Class) null), - Almond("prunus", "amygdalus", 7180062, 16090304, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Almond, (Class) null), - WildCherry("prunus", "avium", 7180062, 16247798, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.WildCherry, (Class) null), - SourCherry("prunus", "cerasus", 7180062, 16247798, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.SourCherry, (Class) null), - BlackCherry("prunus", "serotina", 7180062, 16441848, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.BlackCherry, (Class) null), - Orange("citrus", "sinensis", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Orange, (Class) null), - Manderin("citrus", "reticulata", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Manderin, (Class) null), - Satsuma("citrus", "unshiu", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Satsuma, (Class) null), - Tangerine("citrus", "tangerina", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Tangerine, (Class) null), - Lime("citrus", "latifolia", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Lime, (Class) null), - KeyLime("citrus", "aurantifolia", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.KeyLime, (Class) null), - FingerLime("citrus", "australasica", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.FingerLime, (Class) null), - Pomelo("citrus", "maxima", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Pomelo, (Class) null), - Grapefruit("citrus", "paradisi", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Grapefruit, (Class) null), - Kumquat("citrus", "margarita", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Kumquat, (Class) null), - Citron("citrus", "medica", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Citron, (Class) null), - BuddhaHand("citrus", "sarcodactylus", 8957780, 10729552, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.BuddhaHand, (Class) null), - Banana("musa", "sinensis", 10603918, 4515072, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Banana, WorldGenBanana.class), - RedBanana("musa", "rubra", 10603918, 4515072, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.RedBanana, WorldGenBanana.class), - Plantain("musa", "paradisiaca", 10603918, 4515072, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Plantain, WorldGenBanana.class), - Butternut("juglans", "cinerea", 8566156, 8576396, ILogType.ExtraTreeLog.Butternut, ExtraTreeFruitGene.Butternut, WorldGenWalnut.Butternut.class), - Rowan("sorbus", "aucuparia", 10405787, 10414258, ILogType.ExtraTreeLog.Rowan, (IAlleleFruit) null, WorldGenSorbus.Rowan.class), - Hemlock("tsuga", "heterophylla", 6073458, 6082930, ILogType.ExtraTreeLog.Hemlock, (IAlleleFruit) null, WorldGenConifer.WesternHemlock.class), - Ash("fraxinus", "excelsior", 4754987, 4777003, ILogType.ExtraTreeLog.Ash, (IAlleleFruit) null, WorldGenAsh.CommonAsh.class), - Alder("alnus", "glutinosa", 6916659, 6925875, ILogType.ExtraTreeLog.Alder, (IAlleleFruit) null, WorldGenAlder.CommonAlder.class), - Beech("fagus", "sylvatica", 8626252, 8635980, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CommonBeech.class), - CopperBeech("fagus", "purpurea", 8393496, 13720397, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CopperBeech.class), - Aspen("populus", "tremula", 9096247, 9101711, ILogType.ForestryLog.POPLAR, (IAlleleFruit) null, WorldGenPoplar.Aspen.class), - Yew("taxus", "baccata", 9734733, 9743949, ILogType.ExtraTreeLog.Yew, (IAlleleFruit) null, WorldGenConifer.Yew.class), - Cypress("chamaecyparis", "lawsoniana", 9030055, 9035206, ILogType.ExtraTreeLog.Cypress, (IAlleleFruit) null, WorldGenConifer.Cypress.class), - DouglasFir("pseudotsuga", "menziesii", 10073474, 10080682, ILogType.ExtraTreeLog.Fir, (IAlleleFruit) null, WorldGenFir.DouglasFir.class), - Hazel("Corylus", "avellana", 10204498, 10215762, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenTree3.Hazel.class), - Sycamore("ficus", "sycomorus", 10528047, 11851100, ILogType.ExtraTreeLog.Fig, ExtraTreeFruitGene.Fig, WorldGenTree3.Sycamore.class), - Whitebeam("sorbus", "aria", 12242585, 7505471, ILogType.ExtraTreeLog.Whitebeam, (IAlleleFruit) null, WorldGenSorbus.Whitebeam.class), - Hawthorn("crataegus", "monogyna", 7055434, 10008443, ILogType.ExtraTreeLog.Hawthorn, (IAlleleFruit) null, WorldGenTree3.Hawthorn.class), - Pecan("carya", "illinoinensis", 8762996, 2906139, ILogType.ExtraTreeLog.Hickory, ExtraTreeFruitGene.Pecan, WorldGenTree3.Pecan.class), - Elm("ulmus", "procera", 8163400, 8175176, ILogType.ExtraTreeLog.Elm, (IAlleleFruit) null, WorldGenTree3.Elm.class), - Elder("sambucus", "nigra", 11450483, 14739389, ILogType.ExtraTreeLog.Elder, ExtraTreeFruitGene.Elderberry, WorldGenTree3.Elder.class), - Holly("ilex", "aquifolium", 2444108, 7246468, ILogType.ExtraTreeLog.Holly, (IAlleleFruit) null, WorldGenHolly.Holly.class), - Hornbeam("carpinus", "betulus", 9873179, 9887003, ILogType.ExtraTreeLog.Hornbeam, (IAlleleFruit) null, WorldGenTree3.Hornbeam.class), - Sallow("salix", "caprea", 11449123, 12053541, ILogType.ForestryLog.WILLOW, (IAlleleFruit) null, WorldGenTree3.Sallow.class), - AcornOak("quercus", "robur", 6714174, 10396209, ILogType.VanillaLog.Oak, ExtraTreeFruitGene.Acorn, WorldGenTree3.AcornOak.class), - Fir("abies", "alba", 7306272, 7328032, ILogType.ExtraTreeLog.Fir, (IAlleleFruit) null, WorldGenFir.SilverFir.class), - Cedar("cedrus", "libani", 9806704, 9824368, ILogType.ExtraTreeLog.Cedar, (IAlleleFruit) null, WorldGenConifer.Cedar.class), - Olive("olea", "europaea", 3950644, 3950644, ILogType.ExtraTreeLog.Olive, ExtraTreeFruitGene.Olive, WorldGenTree2.Olive.class), - RedMaple("acer", "ubrum", 15216151, 15216151, ILogType.ForestryLog.MAPLE, (IAlleleFruit) null, WorldGenMaple.RedMaple.class), - BalsamFir("abies", "balsamea", 7643260, 7643260, ILogType.ExtraTreeLog.Fir, (IAlleleFruit) null, WorldGenFir.BalsamFir.class), - LoblollyPine("pinus", "taeda", 7309895, 7309895, ILogType.ForestryLog.PINE, (IAlleleFruit) null, WorldGenConifer.LoblollyPine.class), - Sweetgum("liquidambar", "styraciflua", 9144162, 9144162, ILogType.ExtraTreeLog.Sweetgum, (IAlleleFruit) null, WorldGenTree2.Sweetgum.class), - Locust("robinia", "pseudoacacia", 8942336, 8942336, ILogType.ExtraTreeLog.Locust, (IAlleleFruit) null, WorldGenTree2.Locust.class), - Pear("pyrus", "communis", 6195238, 6195238, ILogType.ExtraTreeLog.Pear, ExtraTreeFruitGene.Pear, WorldGenTree2.Pear.class), - OsangeOsange("maclura", "pomifera", 6847056, 6847056, ILogType.ExtraTreeLog.Maclura, ExtraTreeFruitGene.OsangeOsange, WorldGenJungle.OsangeOsange.class), - OldFustic("maclura", "tinctoria", 6847056, 6847056, ILogType.ExtraTreeLog.Maclura, (IAlleleFruit) null, WorldGenJungle.OldFustic.class), - Brazilwood("caesalpinia", "echinata", 6321241, 6321241, ILogType.ExtraTreeLog.Brazilwood, (IAlleleFruit) null, WorldGenJungle.Brazilwood.class), - Logwood("haematoxylum", "campechianum", 8953707, 8953707, ILogType.ExtraTreeLog.Logwood, (IAlleleFruit) null, WorldGenJungle.Logwood.class), - Rosewood("dalbergia", "latifolia", 8887074, 8887074, ILogType.ExtraTreeLog.Rosewood, (IAlleleFruit) null, WorldGenJungle.Rosewood.class), - Purpleheart("peltogyne", "spp.", 7835477, 7835477, ILogType.ExtraTreeLog.Purpleheart, (IAlleleFruit) null, WorldGenJungle.Purpleheart.class), - Iroko("milicia", "excelsa", 11520108, 11520108, ILogType.ExtraTreeLog.Iroko, (IAlleleFruit) null, WorldGenTree2.Iroko.class), - Gingko("ginkgo", "biloba", 7444049, 7444049, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut, WorldGenTree2.Gingko.class), - Brazilnut("bertholletia", "excelsa", 8163195, 8163195, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut, WorldGenJungle.BrazilNut.class), - RoseGum("eucalyptus", "grandis", 10265176, 10265176, ILogType.ExtraTreeLog.Eucalyptus, (IAlleleFruit) null, WorldGenEucalyptus.RoseGum.class), - SwampGum("eucalyptus", "grandis", 10667654, 10667654, ILogType.ExtraTreeLog.Eucalyptus2, (IAlleleFruit) null, WorldGenEucalyptus.SwampGum.class), - Box("boxus", "sempervirens", 7510381, 7510381, ILogType.ExtraTreeLog.Box, (IAlleleFruit) null, WorldGenTree2.Box.class), - Clove("syzygium", "aromaticum", 8028703, 8028703, ILogType.ExtraTreeLog.Syzgium, ExtraTreeFruitGene.Clove, WorldGenTree2.Clove.class), - Coffee("coffea", "arabica", 7311461, 7311461, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coffee, WorldGenJungle.Coffee.class), - MonkeyPuzzle("araucaria", "araucana", 5726552, 5726552, ILogType.ForestryLog.PINE, (IAlleleFruit) null, WorldGenConifer.MonkeyPuzzle.class), - RainbowGum("eucalyptus", "deglupta", 12054565, 12054565, ILogType.ExtraTreeLog.Eucalyptus3, (IAlleleFruit) null, WorldGenEucalyptus.RainbowGum.class), - PinkIvory("berchemia", "zeyheri", 8163673, 8163673, ILogType.ExtraTreeLog.PinkIvory, (IAlleleFruit) null, WorldGenTree.class), - Blackcurrant("ribes", "nigrum", 10934876, 10934876, (ILogType) null, ExtraTreeFruitGene.Blackcurrant, WorldGenShrub.Shrub.class), - Redcurrant("ribes", "rubrum", 7646208, 7646208, (ILogType) null, ExtraTreeFruitGene.Redcurrant, WorldGenShrub.Shrub.class), - Blackberry("rubus", "fruticosus", 9617755, 9617755, (ILogType) null, ExtraTreeFruitGene.Blackberry, WorldGenShrub.Shrub.class), - Raspberry("rubus", "idaeus", 8632686, 8632686, (ILogType) null, ExtraTreeFruitGene.Raspberry, WorldGenShrub.Shrub.class), - Blueberry("vaccinium", "corymbosum", 7522128, 7522128, (ILogType) null, ExtraTreeFruitGene.Blueberry, WorldGenShrub.Shrub.class), - Cranberry("vaccinium", "oxycoccos", 9884025, 9884025, (ILogType) null, ExtraTreeFruitGene.Cranberry, WorldGenShrub.Shrub.class), - Juniper("juniperus", "communis", 9482569, 9482569, (ILogType) null, ExtraTreeFruitGene.Juniper, WorldGenShrub.Shrub.class), - Gooseberry("ribes", "grossularia", 7977728, 7977728, (ILogType) null, ExtraTreeFruitGene.Gooseberry, WorldGenShrub.Shrub.class), - GoldenRaspberry("rubus", "occidentalis", 8632686, 8632686, (ILogType) null, ExtraTreeFruitGene.GoldenRaspberry, WorldGenShrub.Shrub.class), - Cinnamon("cinnamomum", "cassia", 7573003, 7573003, ILogType.ExtraTreeLog.Cinnamon, (IAlleleFruit) null, WorldGenLazy.Tree.class), - Coconut("cocous", "nucifera", 6592803, 6592803, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coconut, WorldGenPalm.Coconut.class), - Cashew("anacardium", "occidentale", 11254114, 11254114, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Cashew, WorldGenLazy.Tree.class), - Avacado("persea", "americana", 9872245, 9872245, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Avacado, WorldGenLazy.Tree.class), - Nutmeg("myristica", "fragrans", 4754764, 4754764, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Nutmeg, WorldGenLazy.Tree.class), - Allspice("pimenta", "dioica", 8165156, 8165156, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.Tree.class), - Chilli("capsicum", "annuum", 2793217, 2793217, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Chilli, WorldGenLazy.Tree.class), - StarAnise("illicium", "verum", 8373257, 8373257, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.StarAnise, WorldGenLazy.Tree.class), - Mango("mangifera", "indica", 8893812, 8893812, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Mango, WorldGenTropical.Mango.class), - Starfruit("averrhoa", "carambola", 7186733, 7186733, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Starfruit, WorldGenLazy.Tree.class), - Candlenut("aleurites", "moluccana", 9085804, 9085804, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Candlenut, WorldGenLazy.Tree.class), - DwarfHazel("Corylus", "americana", 10204498, 10215762, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.Shrub.class); +import java.awt.*; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; + +public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider { + OrchardApple("malus", "domestica", 0x648830, 0xff9cf3, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Apple, WorldGenApple.OrchardApple.class), + SweetCrabapple("malus", "coronaria", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.SweetCrabapple.class), + FloweringCrabapple("malus", "hopa", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.FloweringCrabapple.class), + PrairieCrabapple("malus", "ioensis", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.PrairieCrabapple.class), + Blackthorn("prunus", "spinosa ", 0x6d8f1e, 0xff87c7, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Blackthorn, null), + CherryPlum("prunus", "cerasifera", 0x6d8f1e, 0xff87c7, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.CherryPlum, null), + Peach("prunus", "persica", 0x6d8f1e, 0xff269a, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Peach, null), + Nectarine("prunus", "nectarina", 0x6d8f1e, 0xff269a, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Nectarine, null), + Apricot("prunus", "armeniaca", 0x6d8f1e, 0xf5b8d8, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Apricot, null), + Almond("prunus", "amygdalus", 0x6d8f1e, 0xf584c0, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Almond, null), + WildCherry("prunus", "avium", 0x6d8f1e, 0xf7ebf6, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.WildCherry, null), + SourCherry("prunus", "cerasus", 0x6d8f1e, 0xf7ebf6, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.SourCherry, null), + BlackCherry("prunus", "serotina", 0x6d8f1e, 0xfae1f8, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.BlackCherry, null), + Orange("citrus", "sinensis", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Orange, null), + Manderin("citrus", "reticulata", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Manderin, null), + Satsuma("citrus", "unshiu", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Satsuma, null), + Tangerine("citrus", "tangerina", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Tangerine, null), + Lime("citrus", "latifolia", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Lime, null), + KeyLime("citrus", "aurantifolia", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.KeyLime, null), + FingerLime("citrus", "australasica", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.FingerLime, null), + Pomelo("citrus", "maxima", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Pomelo, null), + Grapefruit("citrus", "paradisi", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Grapefruit, null), + Kumquat("citrus", "margarita", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Kumquat, null), + Citron("citrus", "medica", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Citron, null), + BuddhaHand("citrus", "sarcodactylus", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.BuddhaHand, null), + Banana("musa", "sinensis", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Banana, WorldGenBanana.class), + RedBanana("musa", "rubra", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.RedBanana, WorldGenBanana.class), + Plantain("musa", "paradisiaca", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Plantain, WorldGenBanana.class), + Butternut("juglans", "cinerea", 0x82b58c, 0x82dd8c, ILogType.ExtraTreeLog.Butternut, ExtraTreeFruitGene.Butternut, WorldGenWalnut.Butternut.class), + Rowan("sorbus", "aucuparia", 0x9ec79b, 0x9ee8b2, ILogType.ExtraTreeLog.Rowan, null, WorldGenSorbus.Rowan.class), + Hemlock("tsuga", "heterophylla", 0x5cac72, 0x5cd172, ILogType.ExtraTreeLog.Hemlock, null, WorldGenConifer.WesternHemlock.class), + Ash("fraxinus", "excelsior", 0x488e2b, 0x48e42b, ILogType.ExtraTreeLog.Ash, null, WorldGenAsh.CommonAsh.class), + Alder("alnus", "glutinosa", 0x698a33, 0x69ae33, ILogType.ExtraTreeLog.Alder, null, WorldGenAlder.CommonAlder.class), + Beech("fagus", "sylvatica", 0x83a04c, 0x83c64c, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CommonBeech.class), + CopperBeech("fagus", "purpurea", 0x801318, 0xd15b4d, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CopperBeech.class), + Aspen("populus", "tremula", 0x8acc37, 0x8ae18f, ILogType.ForestryLog.POPLAR, null, WorldGenPoplar.Aspen.class), + Yew("taxus", "baccata", 0x948a4d, 0x94ae4d, ILogType.ExtraTreeLog.Yew, null, WorldGenConifer.Yew.class), + Cypress("chamaecyparis", "lawsoniana", 0x89c9a7, 0x89ddc6, ILogType.ExtraTreeLog.Cypress, null, WorldGenConifer.Cypress.class), + DouglasFir("pseudotsuga", "menziesii", 0x99b582, 0x99d1aa, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.DouglasFir.class), + Hazel("Corylus", "avellana", 0x9bb552, 0x9be152, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenTree3.Hazel.class), + Sycamore("ficus", "sycomorus", 0xa0a52f, 0xb4d55c, ILogType.ExtraTreeLog.Fig, ExtraTreeFruitGene.Fig, WorldGenTree3.Sycamore.class), + Whitebeam("sorbus", "aria", 0xbace99, 0x72863f, ILogType.ExtraTreeLog.Whitebeam, null, WorldGenSorbus.Whitebeam.class), + Hawthorn("crataegus", "monogyna", 0x6ba84a, 0x98b77b, ILogType.ExtraTreeLog.Hawthorn, null, WorldGenTree3.Hawthorn.class), + Pecan("carya", "illinoinensis", 0x85b674, 0x2c581b, ILogType.ExtraTreeLog.Hickory, ExtraTreeFruitGene.Pecan, WorldGenTree3.Pecan.class), + Elm("ulmus", "procera", 0x7c9048, 0x7cbe48, ILogType.ExtraTreeLog.Elm, null, WorldGenTree3.Elm.class), + Elder("sambucus", "nigra", 0xaeb873, 0xe0e7bd, ILogType.ExtraTreeLog.Elder, ExtraTreeFruitGene.Elderberry, WorldGenTree3.Elder.class), + Holly("ilex", "aquifolium", 0x254b4c, 0x6e9284, ILogType.ExtraTreeLog.Holly, null, WorldGenHolly.Holly.class), + Hornbeam("carpinus", "betulus", 0x96a71b, 0x96dd1b, ILogType.ExtraTreeLog.Hornbeam, null, WorldGenTree3.Hornbeam.class), + Sallow("salix", "caprea", 0xaeb323, 0xb7ec25, ILogType.ForestryLog.WILLOW, null, WorldGenTree3.Sallow.class), + AcornOak("quercus", "robur", 0x66733e, 0x9ea231, ILogType.VanillaLog.Oak, ExtraTreeFruitGene.Acorn, WorldGenTree3.AcornOak.class), + Fir("abies", "alba", 0x6f7c20, 0x6fd120, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.SilverFir.class), + Cedar("cedrus", "libani", 0x95a370, 0x95e870, ILogType.ExtraTreeLog.Cedar, null, WorldGenConifer.Cedar.class), + Olive("olea", "europaea", 0x3c4834, 0x3c4834, ILogType.ExtraTreeLog.Olive, ExtraTreeFruitGene.Olive, WorldGenTree2.Olive.class), + RedMaple("acer", "ubrum", 0xe82e17, 0xe82e17, ILogType.ForestryLog.MAPLE, null, WorldGenMaple.RedMaple.class), + BalsamFir("abies", "balsamea", 0x74a07c, 0x74a07c, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.BalsamFir.class), + LoblollyPine("pinus", "taeda", 0x6f8a47, 0x6f8a47, ILogType.ForestryLog.PINE, null, WorldGenConifer.LoblollyPine.class), + Sweetgum("liquidambar", "styraciflua", 0x8b8762, 0x8b8762, ILogType.ExtraTreeLog.Sweetgum, null, WorldGenTree2.Sweetgum.class), + Locust("robinia", "pseudoacacia", 0x887300, 0x887300, ILogType.ExtraTreeLog.Locust, null, WorldGenTree2.Locust.class), + Pear("pyrus", "communis", 0x5e8826, 0x5e8826, ILogType.ExtraTreeLog.Pear, ExtraTreeFruitGene.Pear, WorldGenTree2.Pear.class), + OsangeOsange("maclura", "pomifera", 0x687a50, 0x687a50, ILogType.ExtraTreeLog.Maclura, ExtraTreeFruitGene.OsangeOsange, WorldGenJungle.OsangeOsange.class), + OldFustic("maclura", "tinctoria", 0x687a50, 0x687a50, ILogType.ExtraTreeLog.Maclura, null, WorldGenJungle.OldFustic.class), + Brazilwood("caesalpinia", "echinata", 0x607459, 0x607459, ILogType.ExtraTreeLog.Brazilwood, null, WorldGenJungle.Brazilwood.class), + Logwood("haematoxylum", "campechianum", 0x889f6b, 0x889f6b, ILogType.ExtraTreeLog.Logwood, null, WorldGenJungle.Logwood.class), + Rosewood("dalbergia", "latifolia", 0x879b22, 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenJungle.Rosewood.class), + Purpleheart("peltogyne", "spp.", 0x778f55, 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenJungle.Purpleheart.class), + Iroko("milicia", "excelsa", 0xafc86c, 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenTree2.Iroko.class), + Gingko("ginkgo", "biloba", 0x719651, 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut, WorldGenTree2.Gingko.class), + Brazilnut("bertholletia", "excelsa", 0x7c8f7b, 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut, WorldGenJungle.BrazilNut.class), + RoseGum("eucalyptus", "grandis", 0x9ca258, 0x9ca258, ILogType.ExtraTreeLog.Eucalyptus, null, WorldGenEucalyptus.RoseGum.class), + SwampGum("eucalyptus", "grandis", 0xa2c686, 0xa2c686, ILogType.ExtraTreeLog.Eucalyptus2, null, WorldGenEucalyptus.SwampGum.class), + Box("boxus", "sempervirens", 0x72996d, 0x72996d, ILogType.ExtraTreeLog.Box, null, WorldGenTree2.Box.class), + Clove("syzygium", "aromaticum", 0x7a821f, 0x7a821f, ILogType.ExtraTreeLog.Syzgium, ExtraTreeFruitGene.Clove, WorldGenTree2.Clove.class), + Coffee("coffea", "arabica", 0x6f9065, 0x6f9065, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coffee, WorldGenJungle.Coffee.class), + MonkeyPuzzle("araucaria", "araucana", 0x576158, 0x576158, ILogType.ForestryLog.PINE, null, WorldGenConifer.MonkeyPuzzle.class), + RainbowGum("eucalyptus", "deglupta", 0xb7f025, 0xb7f025, ILogType.ExtraTreeLog.Eucalyptus3, null, WorldGenEucalyptus.RainbowGum.class), + PinkIvory("berchemia", "zeyheri", 0x7c9159, 0x7c9159, ILogType.ExtraTreeLog.PinkIvory, null, WorldGenTree.class), + Blackcurrant("ribes", "nigrum", 0xa6da5c, 0xa6da5c, null, ExtraTreeFruitGene.Blackcurrant, WorldGenShrub.Shrub.class), + Redcurrant("ribes", "rubrum", 0x74ac00, 0x74ac00, null, ExtraTreeFruitGene.Redcurrant, WorldGenShrub.Shrub.class), + Blackberry("rubus", "fruticosus", 0x92c15b, 0x92c15b, null, ExtraTreeFruitGene.Blackberry, WorldGenShrub.Shrub.class), + Raspberry("rubus", "idaeus", 0x83b96e, 0x83b96e, null, ExtraTreeFruitGene.Raspberry, WorldGenShrub.Shrub.class), + Blueberry("vaccinium", "corymbosum", 0x72c750, 0x72c750, null, ExtraTreeFruitGene.Blueberry, WorldGenShrub.Shrub.class), + Cranberry("vaccinium", "oxycoccos", 0x96d179, 0x96d179, null, ExtraTreeFruitGene.Cranberry, WorldGenShrub.Shrub.class), + Juniper("juniperus", "communis", 0x90b149, 0x90b149, null, ExtraTreeFruitGene.Juniper, WorldGenShrub.Shrub.class), + Gooseberry("ribes", "grossularia", 0x79bb00, 0x79bb00, null, ExtraTreeFruitGene.Gooseberry, WorldGenShrub.Shrub.class), + GoldenRaspberry("rubus", "occidentalis", 0x83b96e, 0x83b96e, null, ExtraTreeFruitGene.GoldenRaspberry, WorldGenShrub.Shrub.class), + Cinnamon("cinnamomum", "cassia", 0x738e0b, 0x738e0b, ILogType.ExtraTreeLog.Cinnamon, null, WorldGenLazy.Tree.class), + Coconut("cocous", "nucifera", 0x649923, 0x649923, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coconut, WorldGenPalm.Coconut.class), + Cashew("anacardium", "occidentale", 0xabb962, 0xabb962, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Cashew, WorldGenLazy.Tree.class), + Avacado("persea", "americana", 0x96a375, 0x96a375, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Avacado, WorldGenLazy.Tree.class), + Nutmeg("myristica", "fragrans", 0x488d4c, 0x488d4c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Nutmeg, WorldGenLazy.Tree.class), + Allspice("pimenta", "dioica", 0x7c9724, 0x7c9724, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.Tree.class), + Chilli("capsicum", "annuum", 0x2a9f01, 0x2a9f01, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Chilli, WorldGenLazy.Tree.class), + StarAnise("illicium", "verum", 0x7fc409, 0x7fc409, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.StarAnise, WorldGenLazy.Tree.class), + Mango("mangifera", "indica", 0x87b574, 0x87b574, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Mango, WorldGenTropical.Mango.class), + Starfruit("averrhoa", "carambola", 0x6da92d, 0x6da92d, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Starfruit, WorldGenLazy.Tree.class), + Candlenut("aleurites", "moluccana", 0x8aa36c, 0x8aa36c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Candlenut, WorldGenLazy.Tree.class), + DwarfHazel("Corylus", "americana", 0x9bb552, 0x9be152, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.Shrub.class); - private LeafType leafType; - private SaplingType saplingType; ArrayList families; int girth; Class gen; @@ -196,33 +184,52 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm ILogType wood; String branchName; IClassification branch; + int colorPollineted; + private LeafType leafType; + private SaplingType saplingType; + + ExtraTreeSpecies(String branch, String binomial, int color, int polColor, ILogType wood, IAlleleFruit fruit, Class gen) { + this.color = color; + this.wood = wood; + this.fruit = fruit; + this.gen = ((gen == null) ? WorldGenTree.class : gen); + this.binomial = binomial; + leafType = LeafType.Normal; + saplingType = SaplingType.Default; + families = new ArrayList<>(); + girth = 1; + colorPollineted = new Color(color).brighter().getRGB(); + uid = toString().toLowerCase(); + branchName = branch; + } public static void init() { - final String bookArborist = "Arborist Manual"; - for (final ExtraTreeSpecies species : values()) { + String bookArborist = "Arborist Manual"; + for (ExtraTreeSpecies species : values()) { species.preInit(); } + ExtraTreeSpecies.OrchardApple.finished(); ExtraTreeSpecies.SweetCrabapple.finished(); ExtraTreeSpecies.FloweringCrabapple.finished(); ExtraTreeSpecies.PrairieCrabapple.finished(); - final ExtraTreeSpecies[] arr$2; - final ExtraTreeSpecies[] pruneSpecies = arr$2 = new ExtraTreeSpecies[] { ExtraTreeSpecies.Blackthorn, ExtraTreeSpecies.CherryPlum, ExtraTreeSpecies.Almond, ExtraTreeSpecies.Apricot, ExtraTreeSpecies.Peach, ExtraTreeSpecies.Nectarine, ExtraTreeSpecies.WildCherry, ExtraTreeSpecies.SourCherry, ExtraTreeSpecies.BlackCherry }; - for (final ExtraTreeSpecies species2 : arr$2) { - final IAlleleTreeSpecies citrus = (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treePlum"); + ExtraTreeSpecies[] pruneSpecies = new ExtraTreeSpecies[]{ExtraTreeSpecies.Blackthorn, ExtraTreeSpecies.CherryPlum, ExtraTreeSpecies.Almond, ExtraTreeSpecies.Apricot, ExtraTreeSpecies.Peach, ExtraTreeSpecies.Nectarine, ExtraTreeSpecies.WildCherry, ExtraTreeSpecies.SourCherry, ExtraTreeSpecies.BlackCherry}; + for (ExtraTreeSpecies species2 : pruneSpecies) { + IAlleleTreeSpecies citrus = (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treePlum"); species2.setWorldGen(citrus.getGenerator().getWorldGenerator(TreeManager.treeRoot.templateAsIndividual(citrus.getRoot().getDefaultTemplate())).getClass()); species2.saplingType = SaplingType.Fruit; species2.finished(); } - ExtraTreeSpecies[] arr$3; - final ExtraTreeSpecies[] citrusSpecies = arr$3 = new ExtraTreeSpecies[] { ExtraTreeSpecies.Orange, ExtraTreeSpecies.Manderin, ExtraTreeSpecies.Satsuma, ExtraTreeSpecies.Tangerine, ExtraTreeSpecies.Lime, ExtraTreeSpecies.KeyLime, ExtraTreeSpecies.FingerLime, ExtraTreeSpecies.Pomelo, ExtraTreeSpecies.Grapefruit, ExtraTreeSpecies.Kumquat, ExtraTreeSpecies.Citron, ExtraTreeSpecies.BuddhaHand }; - for (final ExtraTreeSpecies species3 : arr$3) { + + ExtraTreeSpecies[] citrusSpecies = new ExtraTreeSpecies[]{ExtraTreeSpecies.Orange, ExtraTreeSpecies.Manderin, ExtraTreeSpecies.Satsuma, ExtraTreeSpecies.Tangerine, ExtraTreeSpecies.Lime, ExtraTreeSpecies.KeyLime, ExtraTreeSpecies.FingerLime, ExtraTreeSpecies.Pomelo, ExtraTreeSpecies.Grapefruit, ExtraTreeSpecies.Kumquat, ExtraTreeSpecies.Citron, ExtraTreeSpecies.BuddhaHand}; + for (ExtraTreeSpecies species3 : citrusSpecies) { species3.setLeafType(LeafType.Jungle); species3.saplingType = SaplingType.Fruit; - final IAlleleTreeSpecies citrus2 = (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treeLemon"); + IAlleleTreeSpecies citrus2 = (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treeLemon"); species3.setWorldGen(citrus2.getGenerator().getWorldGenerator(TreeManager.treeRoot.templateAsIndividual(citrus2.getRoot().getDefaultTemplate())).getClass()); species3.finished(); } + ExtraTreeSpecies.Banana.setLeafType(LeafType.Palm); ExtraTreeSpecies.RedBanana.setLeafType(LeafType.Palm); ExtraTreeSpecies.Plantain.setLeafType(LeafType.Palm); @@ -320,16 +327,18 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm ExtraTreeSpecies.Juniper.saplingType = SaplingType.Shrub; ExtraTreeSpecies.Gooseberry.saplingType = SaplingType.Shrub; ExtraTreeSpecies.GoldenRaspberry.saplingType = SaplingType.Shrub; - arr$3 = values(); - for (final ExtraTreeSpecies species3 : arr$3) { - final String scientific = species3.branchName.substring(0, 1).toUpperCase() + species3.branchName.substring(1).toLowerCase(); - final String uid = "trees." + species3.branchName.toLowerCase(); + + citrusSpecies = values(); + for (ExtraTreeSpecies species3 : citrusSpecies) { + String scientific = species3.branchName.substring(0, 1).toUpperCase() + species3.branchName.substring(1).toLowerCase(); + String uid = "trees." + species3.branchName.toLowerCase(); IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); if (branch == null) { branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } (species3.branch = branch).addMemberSpecies(species3); } + ExtraTreeSpecies.Cinnamon.setLeafType(LeafType.Jungle); ExtraTreeSpecies.Coconut.setLeafType(LeafType.Palm); ExtraTreeSpecies.Cashew.setLeafType(LeafType.Jungle); @@ -340,264 +349,790 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm ExtraTreeSpecies.StarAnise.setLeafType(LeafType.Jungle); ExtraTreeSpecies.Mango.setLeafType(LeafType.Jungle); ExtraTreeSpecies.Starfruit.setLeafType(LeafType.Jungle); - final IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); - final IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); - final IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); - final IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); - final IFruitFamily familyBerry = ExtraTreeFruitFamily.Berry; - final IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus; - ExtraTreeSpecies.OrchardApple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.SweetCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.FloweringCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.PrairieCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Blackthorn.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.CherryPlum.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Peach.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Nectarine.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Apricot.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Almond.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.WildCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.SourCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.BlackCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Orange.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Manderin.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Satsuma.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Tangerine.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Lime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.KeyLime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.FingerLime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Pomelo.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Grapefruit.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Kumquat.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Citron.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.BuddhaHand.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Banana.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.RedBanana.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Plantain.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Butternut.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Rowan.addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Ash.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Alder.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Beech.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.CopperBeech.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Aspen.addFamily(familyPome).addFamily(familyNuts); - ExtraTreeSpecies.Hazel.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Sycamore.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Whitebeam.addFamily(familyPome).addFamily(familyPrune); - ExtraTreeSpecies.Hawthorn.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Pecan.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Elm.addFamily(familyPome).addFamily(familyPrune); - ExtraTreeSpecies.Elder.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus).addFamily(familyBerry); - ExtraTreeSpecies.Holly.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Hornbeam.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Sallow.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.AcornOak.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.Olive.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.RedMaple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.Sweetgum.addFamily(familyNuts); - ExtraTreeSpecies.Locust.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Pear.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus); - ExtraTreeSpecies.OsangeOsange.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle); - ExtraTreeSpecies.OldFustic.addFamily(familyJungle); - ExtraTreeSpecies.Brazilwood.addFamily(familyJungle); - ExtraTreeSpecies.Logwood.addFamily(familyJungle); - ExtraTreeSpecies.Rosewood.addFamily(familyJungle); - ExtraTreeSpecies.Purpleheart.addFamily(familyJungle); - ExtraTreeSpecies.Iroko.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Gingko.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Brazilnut.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.RoseGum.addFamily(familyJungle); - ExtraTreeSpecies.SwampGum.addFamily(familyJungle); - ExtraTreeSpecies.Box.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus); - ExtraTreeSpecies.Clove.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Coffee.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.MonkeyPuzzle.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.RainbowGum.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.PinkIvory.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Blackcurrant.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Redcurrant.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Blackberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Raspberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Blueberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Cranberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Juniper.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Gooseberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.GoldenRaspberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry); - ExtraTreeSpecies.Cinnamon.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Coconut.addFamily(familyJungle); - ExtraTreeSpecies.Cashew.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Avacado.addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle); - ExtraTreeSpecies.Nutmeg.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Allspice.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Chilli.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.StarAnise.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.Mango.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle); - ExtraTreeSpecies.Starfruit.addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle); - ExtraTreeSpecies.Candlenut.addFamily(familyNuts).addFamily(familyJungle); - ExtraTreeSpecies.DwarfHazel.addFamily(familyPrune).addFamily(familyNuts); - ExtraTreeSpecies.OrchardApple.setYield(ForestryAllele.Yield.Higher).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.SweetCrabapple.setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.FloweringCrabapple.setFertility(ForestryAllele.Saplings.Average).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.PrairieCrabapple.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Blackthorn.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.CherryPlum.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Peach.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Nectarine.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Apricot.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Almond.setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.WildCherry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.SourCherry.setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.BlackCherry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Lowest).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Orange.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Manderin.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Satsuma.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Tangerine.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Average).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Lime.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.KeyLime.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Lowest).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.FingerLime.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Pomelo.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Grapefruit.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Kumquat.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Citron.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.BuddhaHand.setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Banana.setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.RedBanana.setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Plantain.setHeight(ForestryAllele.TreeHeight.Average).setYield(ForestryAllele.Yield.Lower); - ExtraTreeSpecies.Butternut.setHeight(ForestryAllele.TreeHeight.Smaller).setYield(ForestryAllele.Yield.Low); - ExtraTreeSpecies.Rowan.setHeight(ForestryAllele.TreeHeight.Larger).setFertility(ForestryAllele.Saplings.Low).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Hemlock.setHeight(ForestryAllele.TreeHeight.Average).setFertility(ForestryAllele.Saplings.Low).setMaturation(ForestryAllele.Maturation.Slower); - ExtraTreeSpecies.Ash.setFertility(ForestryAllele.Saplings.Low).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Alder.setHeight(ForestryAllele.TreeHeight.Average).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Beech.setHeight(ForestryAllele.TreeHeight.Average).setYield(ForestryAllele.Yield.Lower); - ExtraTreeSpecies.CopperBeech.setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.Aspen.setFertility(ForestryAllele.Saplings.Average).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Yew.setHeight(ForestryAllele.TreeHeight.Large).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Cypress.setHeight(ForestryAllele.TreeHeight.Larger).setFertility(ForestryAllele.Saplings.Low).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.DouglasFir.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setMaturation(ForestryAllele.Maturation.Slower); - ExtraTreeSpecies.Hazel.setHeight(ForestryAllele.TreeHeight.Average).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Sycamore.setFertility(ForestryAllele.Saplings.Lowest).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Whitebeam.setHeight(ForestryAllele.TreeHeight.Smaller); - ExtraTreeSpecies.Hawthorn.setHeight(ForestryAllele.TreeHeight.Average); - ExtraTreeSpecies.Pecan.setHeight(ForestryAllele.TreeHeight.Large).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.Elm.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Elder.setHeight(ForestryAllele.TreeHeight.Smaller).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Holly.setHeight(ForestryAllele.TreeHeight.Average).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Hornbeam.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.Sallow.setHeight(ForestryAllele.TreeHeight.Large).setFertility(ForestryAllele.Saplings.Low); - ExtraTreeSpecies.AcornOak.setHeight(ForestryAllele.TreeHeight.Large).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Fir.setHeight(ForestryAllele.TreeHeight.Large).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.Cedar.setHeight(ForestryAllele.TreeHeight.Smaller).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slower); - ExtraTreeSpecies.Olive.setYield(ForestryAllele.Yield.Average); - ExtraTreeSpecies.RedMaple.setFertility(ForestryAllele.Saplings.Average).setSappiness(ForestryAllele.Sappiness.High); - ExtraTreeSpecies.BalsamFir.setHeight(ForestryAllele.TreeHeight.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.LoblollyPine.setHeight(ForestryAllele.TreeHeight.Smaller).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Slow); - ExtraTreeSpecies.Sweetgum.setHeight(ForestryAllele.TreeHeight.Average).setFertility(ForestryAllele.Saplings.High).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Average); - ExtraTreeSpecies.Locust.setHeight(ForestryAllele.TreeHeight.Smallest); - ExtraTreeSpecies.Pear.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.OsangeOsange.setYield(ForestryAllele.Yield.Lower); - ExtraTreeSpecies.OldFustic.setHeight(ForestryAllele.TreeHeight.Smaller).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Brazilwood.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Logwood.setHeight(ForestryAllele.TreeHeight.Average).setFertility(ForestryAllele.Saplings.Low).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Rosewood.setHeight(ForestryAllele.TreeHeight.Average).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Purpleheart.setHeight(ForestryAllele.TreeHeight.Large).setSappiness(ForestryAllele.Sappiness.Lower); - ExtraTreeSpecies.Iroko.setHeight(ForestryAllele.TreeHeight.Average).setFertility(ForestryAllele.Saplings.Low); - ExtraTreeSpecies.Gingko.setHeight(ForestryAllele.TreeHeight.Large).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Brazilnut.setHeight(ForestryAllele.TreeHeight.Larger).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.RoseGum.setHeight(ForestryAllele.TreeHeight.Largest).setFertility(ForestryAllele.Saplings.Lowest).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Slowest); - ExtraTreeSpecies.SwampGum.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Lowest).setMaturation(ForestryAllele.Maturation.Slower); - ExtraTreeSpecies.Box.setHeight(ForestryAllele.TreeHeight.Smaller).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Clove.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Coffee.setHeight(ForestryAllele.TreeHeight.Large).setYield(ForestryAllele.Yield.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.MonkeyPuzzle.setHeight(ForestryAllele.TreeHeight.Average).setYield(ForestryAllele.Yield.Lower).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.RainbowGum.setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Lower); - ExtraTreeSpecies.PinkIvory.setHeight(ForestryAllele.TreeHeight.Smallest); - ExtraTreeSpecies.Blackcurrant.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Redcurrant.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Average).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Blackberry.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Raspberry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Blueberry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Average).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Cranberry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Average).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Juniper.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Low).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.Gooseberry.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.High).setYield(ForestryAllele.Yield.High).setMaturation(ForestryAllele.Maturation.Faster); - ExtraTreeSpecies.GoldenRaspberry.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fastest); - ExtraTreeSpecies.Cinnamon.setHeight(ForestryAllele.TreeHeight.Average).setYield(ForestryAllele.Yield.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Coconut.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Cashew.setYield(ForestryAllele.Yield.Low); - ExtraTreeSpecies.Avacado.setHeight(ForestryAllele.TreeHeight.Smallest).setYield(ForestryAllele.Yield.Average); - ExtraTreeSpecies.Nutmeg.setHeight(ForestryAllele.TreeHeight.Smaller).setYield(ForestryAllele.Yield.High).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.Allspice.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.High); - ExtraTreeSpecies.Chilli.setHeight(ForestryAllele.TreeHeight.Smaller).setYield(ForestryAllele.Yield.Higher).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.StarAnise.setHeight(ForestryAllele.TreeHeight.Average).setYield(ForestryAllele.Yield.High); - ExtraTreeSpecies.Mango.setHeight(ForestryAllele.TreeHeight.Smaller).setFertility(ForestryAllele.Saplings.Low).setYield(ForestryAllele.Yield.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Starfruit.setYield(ForestryAllele.Yield.Average).setMaturation(ForestryAllele.Maturation.Fast); - ExtraTreeSpecies.Candlenut.setHeight(ForestryAllele.TreeHeight.Smallest).setFertility(ForestryAllele.Saplings.Lowest).setYield(ForestryAllele.Yield.Low).setSappiness(ForestryAllele.Sappiness.Low); - ExtraTreeSpecies.DwarfHazel.setFertility(ForestryAllele.Saplings.Average).setSappiness(ForestryAllele.Sappiness.Lower).setMaturation(ForestryAllele.Maturation.Faster); + + IFruitFamily familyPrune = AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes"); + IFruitFamily familyPome = AlleleManager.alleleRegistry.getFruitFamily("forestry.pomes"); + IFruitFamily familyJungle = AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle"); + IFruitFamily familyNuts = AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts"); + IFruitFamily familyBerry = ExtraTreeFruitFamily.Berry; + IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus; + + ExtraTreeSpecies.OrchardApple + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.Higher) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.SweetCrabapple + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.FloweringCrabapple + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setFertility(ForestryAllele.Saplings.Average) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.PrairieCrabapple + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Blackthorn + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.CherryPlum + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Peach + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Nectarine + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Apricot + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Almond + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.WildCherry + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.SourCherry + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.BlackCherry + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Lowest) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Orange + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Manderin + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Satsuma + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Tangerine + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Average) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Lime + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.KeyLime + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Lowest) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.FingerLime + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Pomelo + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Grapefruit + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Kumquat + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Citron + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.BuddhaHand + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Banana + .addFamily(familyNuts) + .addFamily(familyJungle) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.RedBanana + .addFamily(familyNuts) + .addFamily(familyJungle) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Plantain + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setYield(ForestryAllele.Yield.Lower); + + ExtraTreeSpecies.Butternut + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setYield(ForestryAllele.Yield.Low); + + ExtraTreeSpecies.Rowan + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Larger) + .setFertility(ForestryAllele.Saplings.Low) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Ash + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setFertility(ForestryAllele.Saplings.Low) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Alder + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Average) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Beech + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Average) + .setYield(ForestryAllele.Yield.Lower); + + ExtraTreeSpecies.CopperBeech + .addFamily(familyPrune) + .addFamily(familyNuts) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.Aspen + .addFamily(familyPome) + .addFamily(familyNuts) + .setFertility(ForestryAllele.Saplings.Average) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Hazel + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Average) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Sycamore + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setFertility(ForestryAllele.Saplings.Lowest) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Whitebeam + .addFamily(familyPome) + .addFamily(familyPrune) + .setHeight(ForestryAllele.TreeHeight.Smaller); + + ExtraTreeSpecies.Hawthorn + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Average); + + ExtraTreeSpecies.Pecan + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Large) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.Elm + .addFamily(familyPome) + .addFamily(familyPrune) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Elder + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Holly + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Average) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Hornbeam + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.Sallow + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Large) + .setFertility(ForestryAllele.Saplings.Low); + + ExtraTreeSpecies.AcornOak + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Large) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Fir + .setHeight(ForestryAllele.TreeHeight.Large) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.Olive + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setYield(ForestryAllele.Yield.Average); + + ExtraTreeSpecies.Cedar + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slower); + + ExtraTreeSpecies.RedMaple + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setFertility(ForestryAllele.Saplings.Average) + .setSappiness(ForestryAllele.Sappiness.High); + + ExtraTreeSpecies.BalsamFir + .setHeight(ForestryAllele.TreeHeight.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.LoblollyPine + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.Sweetgum + .addFamily(familyNuts) + .setHeight(ForestryAllele.TreeHeight.Average) + .setFertility(ForestryAllele.Saplings.High) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Average); + + ExtraTreeSpecies.Locust + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smallest); + + ExtraTreeSpecies.Pear + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.OsangeOsange + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .addFamily(familyJungle) + .setYield(ForestryAllele.Yield.Lower); + + ExtraTreeSpecies.OldFustic + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Brazilwood + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Logwood + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setFertility(ForestryAllele.Saplings.Low) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Rosewood + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Purpleheart + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Large) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Iroko + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setFertility(ForestryAllele.Saplings.Low); + + ExtraTreeSpecies.Gingko + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Large) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Brazilnut + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Larger) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.RoseGum + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Largest) + .setFertility(ForestryAllele.Saplings.Lowest) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Slowest); + + ExtraTreeSpecies.SwampGum + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Lowest) + .setMaturation(ForestryAllele.Maturation.Slower); + + ExtraTreeSpecies.Box + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyCitrus) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Clove + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Coffee + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Large) + .setYield(ForestryAllele.Yield.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.MonkeyPuzzle + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setYield(ForestryAllele.Yield.Lower) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.RainbowGum + .addFamily(familyNuts) + .addFamily(familyJungle) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Lower); + + ExtraTreeSpecies.PinkIvory + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smallest); + + ExtraTreeSpecies.Blackcurrant + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Redcurrant + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Average) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Blackberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Raspberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Blueberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Average) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Cranberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Average) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Juniper + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Low) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Gooseberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.High) + .setYield(ForestryAllele.Yield.High) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.GoldenRaspberry + .addFamily(familyPrune) + .addFamily(familyNuts) + .addFamily(familyBerry) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fastest); + + ExtraTreeSpecies.Cinnamon + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setYield(ForestryAllele.Yield.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Coconut + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Cashew + .addFamily(familyNuts) + .addFamily(familyJungle) + .setYield(ForestryAllele.Yield.Low); + + ExtraTreeSpecies.Avacado + .addFamily(familyPrune) + .addFamily(familyCitrus) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setYield(ForestryAllele.Yield.Average); + + ExtraTreeSpecies.Nutmeg + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setYield(ForestryAllele.Yield.High) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.Allspice + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.High); + + ExtraTreeSpecies.Chilli + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setYield(ForestryAllele.Yield.Higher) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.StarAnise + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Average) + .setYield(ForestryAllele.Yield.High); + + ExtraTreeSpecies.Mango + .addFamily(familyPome) + .addFamily(familyPrune) + .addFamily(familyCitrus) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setYield(ForestryAllele.Yield.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Starfruit + .addFamily(familyPrune) + .addFamily(familyCitrus) + .addFamily(familyJungle) + .setYield(ForestryAllele.Yield.Average) + .setMaturation(ForestryAllele.Maturation.Fast); + + ExtraTreeSpecies.Candlenut + .addFamily(familyNuts) + .addFamily(familyJungle) + .setHeight(ForestryAllele.TreeHeight.Smallest) + .setFertility(ForestryAllele.Saplings.Lowest) + .setYield(ForestryAllele.Yield.Low) + .setSappiness(ForestryAllele.Sappiness.Low); + + ExtraTreeSpecies.DwarfHazel + .addFamily(familyPrune) + .addFamily(familyNuts) + .setFertility(ForestryAllele.Saplings.Average) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Faster); + + ExtraTreeSpecies.Yew + .setHeight(ForestryAllele.TreeHeight.Large) + .setSappiness(ForestryAllele.Sappiness.Lower); + + ExtraTreeSpecies.Cypress + .setHeight(ForestryAllele.TreeHeight.Larger) + .setFertility(ForestryAllele.Saplings.Low) + .setSappiness(ForestryAllele.Sappiness.Lower) + .setMaturation(ForestryAllele.Maturation.Slow); + + ExtraTreeSpecies.DouglasFir + .setHeight(ForestryAllele.TreeHeight.Smaller) + .setFertility(ForestryAllele.Saplings.Low) + .setMaturation(ForestryAllele.Maturation.Slower); + + ExtraTreeSpecies.Hemlock + .setHeight(ForestryAllele.TreeHeight.Average) + .setFertility(ForestryAllele.Saplings.Low) + .setMaturation(ForestryAllele.Maturation.Slower); } - private ExtraTreeSpecies addFamily(final IFruitFamily family) { - this.families.add(family); - return this; - } - - static final ItemStack getEBXLStack(final String name) { + // TODO unused method? + static ItemStack getEBXLStack(String name) { try { - final Class elements = Class.forName("extrabiomes.lib.Element"); - final Method getElementMethod = elements.getMethod("valueOf", String.class); - final Method getItemStack = elements.getMethod("get", new Class[0]); - final Object element = getElementMethod.invoke(null, "SAPLING_AUTUMN_YELLOW"); - return (ItemStack) getItemStack.invoke(element, new Object[0]); + Class elements = Class.forName("extrabiomes.lib.Element"); + Method getElementMethod = elements.getMethod("valueOf", String.class); + Method getItemStack = elements.getMethod("get"); + Object element = getElementMethod.invoke(null, "SAPLING_AUTUMN_YELLOW"); + return (ItemStack) getItemStack.invoke(element); } catch (Exception e) { throw new RuntimeException(e); } } - private void setWorldGen(final Class gen) { + private ExtraTreeSpecies addFamily(IFruitFamily family) { + families.add(family); + return this; + } + + private void setWorldGen(Class gen) { this.gen = gen; } - private void setGirth(final int i) { - this.template[EnumTreeChromosome.GIRTH.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.i" + i + "d"); + private void setGirth(int i) { + template[EnumTreeChromosome.GIRTH.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.i" + i + "d"); } public void preInit() { - (this.template = Binnie.Genetics.getTreeRoot().getDefaultTemplate())[0] = this; - if (this.fruit != null) { - this.template[EnumTreeChromosome.FRUITS.ordinal()] = this.fruit; + template = Binnie.Genetics.getTreeRoot().getDefaultTemplate(); + template[0] = this; + if (fruit != null) { + template[EnumTreeChromosome.FRUITS.ordinal()] = fruit; } - this.template[EnumTreeChromosome.GIRTH.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.i" + this.girth + "d"); - final IClassification clas = AlleleManager.alleleRegistry.getClassification("trees." + this.branch); + + template[EnumTreeChromosome.GIRTH.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.i" + girth + "d"); + IClassification clas = AlleleManager.alleleRegistry.getClassification("trees." + branch); if (clas != null) { clas.addMemberSpecies(this); - this.branch = clas; + branch = clas; } } - int colorPollineted; - - private ExtraTreeSpecies(final String branch, final String binomial, final int color, final int polColor, final ILogType wood, final IAlleleFruit fruit, final Class gen) { - this.leafType = LeafType.Normal; - this.saplingType = SaplingType.Default; - this.families = new ArrayList(); - this.girth = 1; - this.fruit = null; - this.color = color; - this.colorPollineted = new Color(color).brighter().getRGB(); - this.uid = this.toString().toLowerCase(); - this.wood = wood; - this.fruit = fruit; - this.gen = ((gen == null) ? WorldGenTree.class : gen); - this.branchName = branch; - this.binomial = binomial; - } - @Override public String getName() { - return ExtraTrees.proxy.localise("species." + this.name().toLowerCase() + ".name"); + return ExtraTrees.proxy.localise("species." + name().toLowerCase() + ".name"); } @Override public String getDescription() { - return ExtraTrees.proxy.localiseOrBlank("species." + this.name().toLowerCase() + ".desc"); + return ExtraTrees.proxy.localiseOrBlank("species." + name().toLowerCase() + ".desc"); } @Override @@ -627,7 +1162,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @Override public String getBinomial() { - return this.binomial; + return binomial; } @Override @@ -637,12 +1172,12 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @Override public IClassification getBranch() { - return this.branch; + return branch; } @Override public String getUID() { - return "extratrees.species." + this.uid; + return "extratrees.species." + uid; } @Override @@ -661,8 +1196,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @Override public void setLogBlock(ITreeGenome arg0, World arg1, int arg2, int arg3, int arg4, ForgeDirection arg5) { - if (ExtraTreeSpecies.this.wood != null) - ExtraTreeSpecies.this.wood.placeBlock(arg1, arg2, arg3, arg4); + if (wood != null) + wood.placeBlock(arg1, arg2, arg3, arg4); } @Override @@ -688,142 +1223,142 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm if (decorative) { tileLeaves.setDecorative(); } - tileLeaves.setTree(new Tree(genome)); + tileLeaves.setTree(new Tree(genome)); world.markBlockForUpdate(x, y, z); } @Override - public void setLogBlock(World arg0, int arg1, int arg2, int arg3, ForgeDirection arg4) { - ExtraTreeSpecies.this.wood.placeBlock(arg0, arg1, arg2, arg3); + public void setLogBlock(World world, int x, int y, int z, ForgeDirection direction) { + wood.placeBlock(world, x, y, z); } @Override - public void setLeaves(World world, GameProfile arg1, int x, int y, int z, boolean arg5) { + public void setLeaves(World world, GameProfile player, int x, int y, int z, boolean arg5) { } @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { - return ExtraTreeSpecies.this.getGenerator(tree); + return getGenerator(tree); } - }; } - public WorldGenerator getGenerator(final ITreeGenData tree) { - if (this.gen != null) { + public WorldGenerator getGenerator(ITreeGenData tree) { + if (gen != null) { try { - return this.gen.getConstructor(ITree.class).newInstance(tree); + return gen.getConstructor(ITree.class).newInstance(tree); } catch (Exception ex) { + // ignored } } return new WorldGenDefault(tree); } - void setLeafType(final LeafType type) { - this.leafType = type; - if (this.leafType == LeafType.Conifer) { - this.saplingType = SaplingType.Conifer; + void setLeafType(LeafType type) { + leafType = type; + if (leafType == LeafType.Conifer) { + saplingType = SaplingType.Conifer; } - if (this.leafType == LeafType.Jungle) { - this.saplingType = SaplingType.Jungle; + if (leafType == LeafType.Jungle) { + saplingType = SaplingType.Jungle; } - if (this.leafType == LeafType.Palm) { - this.saplingType = SaplingType.Palm; + if (leafType == LeafType.Palm) { + saplingType = SaplingType.Palm; } } public IAllele[] getTemplate() { - return this.template; + return template; } @Override public ArrayList getSuitableFruit() { - return this.families; + return families; } public ILogType getLog() { - return this.wood; + return wood; } - public ExtraTreeSpecies setHeight(final ForestryAllele.TreeHeight height) { - final IAllele allele = height.getAllele(); + public ExtraTreeSpecies setHeight(ForestryAllele.TreeHeight height) { + IAllele allele = height.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.HEIGHT.ordinal()] = allele; + template[EnumTreeChromosome.HEIGHT.ordinal()] = allele; } return this; } - public ExtraTreeSpecies setSappiness(final ForestryAllele.Sappiness height) { - final IAllele allele = height.getAllele(); + public ExtraTreeSpecies setSappiness(ForestryAllele.Sappiness height) { + IAllele allele = height.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.SAPPINESS.ordinal()] = allele; + template[EnumTreeChromosome.SAPPINESS.ordinal()] = allele; } return this; } - public ExtraTreeSpecies setMaturation(final ForestryAllele.Maturation height) { - final IAllele allele = height.getAllele(); + public ExtraTreeSpecies setMaturation(ForestryAllele.Maturation height) { + IAllele allele = height.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.MATURATION.ordinal()] = allele; + template[EnumTreeChromosome.MATURATION.ordinal()] = allele; } return this; } - public ExtraTreeSpecies setYield(final ForestryAllele.Yield height) { - final IAllele allele = height.getAllele(); + public ExtraTreeSpecies setYield(ForestryAllele.Yield height) { + IAllele allele = height.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.YIELD.ordinal()] = allele; + template[EnumTreeChromosome.YIELD.ordinal()] = allele; } return this; } - public ExtraTreeSpecies setFertility(final ForestryAllele.Saplings height) { - final IAllele allele = height.getAllele(); + public ExtraTreeSpecies setFertility(ForestryAllele.Saplings height) { + IAllele allele = height.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.FERTILITY.ordinal()] = allele; + template[EnumTreeChromosome.FERTILITY.ordinal()] = allele; } return this; } - public void setGrowthConditions(final ForestryAllele.Growth growth) { - final IAllele allele = growth.getAllele(); + public void setGrowthConditions(ForestryAllele.Growth growth) { + IAllele allele = growth.getAllele(); if (allele != null) { - this.template[EnumTreeChromosome.GROWTH.ordinal()] = allele; + template[EnumTreeChromosome.GROWTH.ordinal()] = allele; } } public void finished() { } - public int getLeafColour(final ITree tree) { - return this.color; + public int getLeafColour(ITree tree) { + return color; } - public short getLeafIconIndex(final ITree tree, final boolean fancy) { + public short getLeafIconIndex(ITree tree, boolean fancy) { if (!fancy) { - return this.leafType.plainUID; + return leafType.plainUID; } if (tree.getMate() != null) { - return this.leafType.changedUID; + return leafType.changedUID; } - return this.leafType.fancyUID; + return leafType.fancyUID; } @Override - public int getIconColour(final int renderPass) { - return (renderPass == 0) ? this.color : 0xFFFFFF;// 10451021; + public int getIconColour(int renderPass) { + return (renderPass == 0) ? color : 0xFFFFFF;// 10451021; } @Override @SideOnly(Side.CLIENT) - public IIcon getGermlingIcon(final EnumGermlingType type, final int renderPass) { + public IIcon getGermlingIcon(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.POLLEN) { return PluginArboriculture.items.pollenFertile.getIcon(PluginArboriculture.items.pollenFertile.getItemStack(), renderPass); } - return (renderPass == 0) ? this.saplingType.icon[1] : this.saplingType.icon[0]; + return (renderPass == 0) ? saplingType.icon[1] : saplingType.icon[0]; } @Override @@ -832,13 +1367,13 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm } @Override - public IIcon getIcon(final short texUID) { + public IIcon getIcon(short texUID) { return TextureManager.getInstance().getIcon(texUID); } @Override - public void registerIcons(final IIconRegister register) { - for (final SaplingType type : SaplingType.values()) { + public void registerIcons(IIconRegister register) { + for (SaplingType type : SaplingType.values()) { (type.icon = new IIcon[2])[0] = ExtraTrees.proxy.getIcon(register, "saplings/" + type.toString().toLowerCase() + ".trunk"); type.icon[1] = ExtraTrees.proxy.getIcon(register, "saplings/" + type.toString().toLowerCase() + ".leaves"); } @@ -850,18 +1385,20 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm } @Override - public float getResearchSuitability(final ItemStack itemstack) { + public float getResearchSuitability(ItemStack itemstack) { if (itemstack == null) { return 0.0f; } - if (this.template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { - final ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) this.template[EnumTreeChromosome.FRUITS.ordinal()]; - for (final ItemStack stack : fruit.products.keySet()) { + + if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { + ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()]; + for (ItemStack stack : fruit.products.keySet()) { if (stack.isItemEqual(itemstack)) { return 1.0f; } } } + if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) { return 0.5f; } @@ -874,7 +1411,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm if (AlleleManager.alleleRegistry.isIndividual(itemstack)) { return 1.0f; } - for (final Map.Entry entry : this.getRoot().getResearchCatalysts().entrySet()) { + + for (Map.Entry entry : getRoot().getResearchCatalysts().entrySet()) { if (entry.getKey().isItemEqual(itemstack)) { return entry.getValue(); } @@ -883,23 +1421,25 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm } @Override - public ItemStack[] getResearchBounty(final World world, final GameProfile researcher, final IIndividual individual, final int bountyLevel) { - final ArrayList bounty = new ArrayList(); + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + ArrayList bounty = new ArrayList<>(); ItemStack research = null; if (world.rand.nextFloat() < 10.0f / bountyLevel) { - final Collection combinations = this.getRoot().getCombinations(this); + Collection combinations = getRoot().getCombinations(this); if (combinations.size() > 0) { - final IMutation[] candidates = combinations.toArray(new IMutation[0]); + IMutation[] candidates = combinations.toArray(new IMutation[0]); research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]); } } + if (research != null) { bounty.add(research); } - if (this.template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { - final ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) this.template[EnumTreeChromosome.FRUITS.ordinal()]; - for (final ItemStack stack : fruit.products.keySet()) { - final ItemStack stack2 = stack.copy(); + + if (template[EnumTreeChromosome.FRUITS.ordinal()] instanceof ExtraTreeFruitGene) { + ExtraTreeFruitGene fruit = (ExtraTreeFruitGene) template[EnumTreeChromosome.FRUITS.ordinal()]; + for (ItemStack stack : fruit.products.keySet()) { + ItemStack stack2 = stack.copy(); stack2.stackSize = world.rand.nextInt((int) (bountyLevel / 2.0f)) + 1; bounty.add(stack2); } @@ -909,31 +1449,37 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @Override @SideOnly(Side.CLIENT) - public int getGermlingColour(final EnumGermlingType type, int renderPass) { + public int getGermlingColour(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.SAPLING) { - return (renderPass == 0) ? this.getLeafColour(null) : ((this.getLog() == null) ? 16777215 : this.getLog().getColour()); + if (renderPass == 0) { + return getLeafColour(null); + } + if (getLog() == null) { + return 0xffffff; + } + return getLog().getColour(); } - return this.getLeafColour(null); + return getLeafColour(null); } @Override public int getComplexity() { - return 1 + this.getGeneticAdvancement(this, new ArrayList()); + return 1 + getGeneticAdvancement(this, new ArrayList<>()); } - private int getGeneticAdvancement(final IAllele species, final ArrayList exclude) { - final int own = 1; + private int getGeneticAdvancement(IAllele species, ArrayList exclude) { + int own = 1; int highest = 0; exclude.add(species); - for (final IMutation mutation : this.getRoot().getPaths(species, EnumBeeChromosome.SPECIES)) { + for (IMutation mutation : getRoot().getPaths(species, EnumBeeChromosome.SPECIES)) { if (!exclude.contains(mutation.getAllele0())) { - final int otherAdvance = this.getGeneticAdvancement(mutation.getAllele0(), exclude); + int otherAdvance = getGeneticAdvancement(mutation.getAllele0(), exclude); if (otherAdvance > highest) { highest = otherAdvance; } } if (!exclude.contains(mutation.getAllele1())) { - final int otherAdvance = this.getGeneticAdvancement(mutation.getAllele1(), exclude); + int otherAdvance = getGeneticAdvancement(mutation.getAllele1(), exclude); if (otherAdvance <= highest) { continue; } @@ -944,50 +1490,15 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm } public ItemStack[] getLogStacks() { - if (this.wood == null) { + if (wood == null) { return new ItemStack[0]; } - return new ItemStack[] { this.wood.getItemStack() }; + return new ItemStack[]{wood.getItemStack()}; } @Override public String getUnlocalizedName() { - return "extratrees.species." + this.toString().toLowerCase() + ".name"; - } - - public enum LeafType - { - Normal((short) 10, (short) 11, (short) 12, "Deciduous"), - Conifer((short) 15, (short) 16, (short) 17, "Conifers"), - Jungle((short) 20, (short) 21, (short) 22, "Jungle"), - Willow((short) 25, (short) 26, (short) 27, "Willow"), - Maple((short) 30, (short) 31, (short) 32, "Maple"), - Palm((short) 35, (short) 36, (short) 37, "Palm"); - - public final short fancyUID; - public final short plainUID; - public final short changedUID; - public final String descript; - - private LeafType(final short fancyUID, final short plainUID, final short changedUID, final String descript) { - this.fancyUID = fancyUID; - this.plainUID = plainUID; - this.changedUID = changedUID; - this.descript = descript; - } - } - - public enum SaplingType - { - Default, - Jungle, - Conifer, - Fruit, - Poplar, - Palm, - Shrub; - - IIcon[] icon; + return "extratrees.species." + toString().toLowerCase() + ".name"; } @Override @@ -1016,4 +1527,36 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return getGermlingIcon(type, renderPass); } + public enum LeafType { + Normal((short) 10, (short) 11, (short) 12, "Deciduous"), + Conifer((short) 15, (short) 16, (short) 17, "Conifers"), + Jungle((short) 20, (short) 21, (short) 22, "Jungle"), + Willow((short) 25, (short) 26, (short) 27, "Willow"), + Maple((short) 30, (short) 31, (short) 32, "Maple"), + Palm((short) 35, (short) 36, (short) 37, "Palm"); + + public short fancyUID; + public short plainUID; + public short changedUID; + public String descript; + + LeafType(short fancyUID, short plainUID, short changedUID, String descript) { + this.fancyUID = fancyUID; + this.plainUID = plainUID; + this.changedUID = changedUID; + this.descript = descript; + } + } + + public enum SaplingType { + Default, + Jungle, + Conifer, + Fruit, + Poplar, + Palm, + Shrub; + + protected IIcon[] icon; + } } diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index ece4683c..3665103e 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,20 +1,15 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; -import binnie.extratrees.ExtraTrees; import binnie.Binnie; -import net.minecraft.client.renderer.texture.IIconRegister; +import binnie.core.resource.BinnieIcon; +import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; -import binnie.core.resource.BinnieIcon; import forestry.api.core.IIconProvider; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; -public enum FruitSprite implements IIconProvider -{ +public enum FruitSprite implements IIconProvider { Tiny, Small, Average, @@ -22,16 +17,16 @@ public enum FruitSprite implements IIconProvider Larger, Pear; - BinnieIcon icon; + protected BinnieIcon icon; public short getIndex() { - return (short) (this.ordinal() + 4200); + return (short) (ordinal() + 4200); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final short texUID) { - final int index = texUID - 4200; + public IIcon getIcon(short texUID) { + int index = texUID - 4200; if (index >= 0 && index < values().length) { return values()[index].icon.getIcon(); } @@ -40,7 +35,7 @@ public enum FruitSprite implements IIconProvider @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.icon = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "fruit/" + this.toString().toLowerCase()); + public void registerIcons(IIconRegister register) { + icon = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "fruit/" + toString().toLowerCase()); } } diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 199f298d..f5cda236 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -1,83 +1,89 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.genetics; -import java.util.Locale; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IClassification; -import binnie.core.BinnieCore; import binnie.Binnie; -import forestry.api.genetics.IAllele; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IClassification; + import java.util.ArrayList; import java.util.List; -import binnie.core.IInitializable; +import java.util.Locale; -public class ModuleGenetics implements IInitializable -{ - String[] branches; - List> classifications; +public class ModuleGenetics implements IInitializable { + protected String[] branches; + protected List> classifications; public ModuleGenetics() { - this.branches = new String[] { "Malus Maleae Amygdaloideae Rosaceae", "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems" }; - this.classifications = new ArrayList>(); + branches = new String[]{ + "Malus Maleae Amygdaloideae Rosaceae", + "Musa Musaceae Zingiberales Commelinids Angiosperms", + "Sorbus Maleae", + "Tsuga Pinaceae", + "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems" + }; + classifications = new ArrayList<>(); } @Override public void preInit() { - for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) { + for (ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) { AlleleManager.alleleRegistry.registerAllele(fruit); } - for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { + for (ExtraTreeSpecies species : ExtraTreeSpecies.values()) { AlleleManager.alleleRegistry.registerAllele(species); } } @Override public void init() { + // ignored } @Override public void postInit() { ExtraTreeSpecies.init(); ExtraTreeFruitGene.init(); - for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { + for (ExtraTreeSpecies species : ExtraTreeSpecies.values()) { Binnie.Genetics.getTreeRoot().registerTemplate(species.getTemplate()); } + ExtraTreeMutation.init(); - if (BinnieCore.isLepidopteryActive()) { - for (final ButterflySpecies species2 : ButterflySpecies.values()) { - AlleleManager.alleleRegistry.registerAllele(species2); - Binnie.Genetics.getButterflyRoot().registerTemplate(species2.getTemplate()); - final String scientific = species2.branchName.substring(0, 1).toUpperCase() + species2.branchName.substring(1).toLowerCase(); - final String uid = "trees." + species2.branchName.toLowerCase(); - IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); - if (branch == null) { - branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); - } - (species2.branch = branch).addMemberSpecies(species2); + if (!BinnieCore.isLepidopteryActive()) { + return; + } + + for (ButterflySpecies species2 : ButterflySpecies.values()) { + AlleleManager.alleleRegistry.registerAllele(species2); + Binnie.Genetics.getButterflyRoot().registerTemplate(species2.getTemplate()); + String scientific = species2.branchName.substring(0, 1).toUpperCase() + species2.branchName.substring(1).toLowerCase(); + String uid = "trees." + species2.branchName.toLowerCase(); + IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); + if (branch == null) { + branch = AlleleManager.alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } + (species2.branch = branch).addMemberSpecies(species2); } } private void generateBranches() { - for (final String hierarchy : this.branches) { - final List set = new ArrayList(); - for (final String string : hierarchy.split(" ", 0)) { + for (String hierarchy : branches) { + List set = new ArrayList(); + for (String string : hierarchy.split(" ", 0)) { set.add(string.toLowerCase()); } - this.classifications.add(set); + classifications.add(set); } - for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { - final IClassification branch = this.getOrCreateClassification(IClassification.EnumClassLevel.GENUS, species.branchName); + + for (ExtraTreeSpecies species : ExtraTreeSpecies.values()) { + IClassification branch = getOrCreateClassification(IClassification.EnumClassLevel.GENUS, species.branchName); branch.addMemberSpecies(species); species.branch = branch; IClassification clss = branch; int currentLevel = IClassification.EnumClassLevel.GENUS.ordinal(); + while (clss.getParent() == null) { - for (final List set2 : this.classifications) { + for (List set2 : classifications) { if (set2.contains(clss.getScientific().toLowerCase())) { String nextLevel = ""; int index = set2.indexOf(clss.getScientific().toLowerCase()) + 1; @@ -87,9 +93,10 @@ public class ModuleGenetics implements IInitializable } catch (IndexOutOfBoundsException ex) { throw new RuntimeException("Reached end point at " + set2.get(index - 2)); } - --currentLevel; + currentLevel--; } - final IClassification parent = this.getOrCreateClassification(IClassification.EnumClassLevel.values()[currentLevel], nextLevel); + + IClassification parent = getOrCreateClassification(IClassification.EnumClassLevel.values()[currentLevel], nextLevel); parent.addMemberGroup(clss); System.out.println("Went from " + clss.getScientific() + " to " + parent.getScientific()); clss = parent; @@ -100,11 +107,12 @@ public class ModuleGenetics implements IInitializable } } - private IClassification getOrCreateClassification(final IClassification.EnumClassLevel level, String name) { + private IClassification getOrCreateClassification(IClassification.EnumClassLevel level, String name) { if (level == IClassification.EnumClassLevel.GENUS) { name = "trees." + name; } - final String uid = level.name().toLowerCase(Locale.ENGLISH) + "." + name.toLowerCase(); + + String uid = level.name().toLowerCase(Locale.ENGLISH) + "." + name.toLowerCase(); if (AlleleManager.alleleRegistry.getClassification(uid) != null) { return AlleleManager.alleleRegistry.getClassification(uid); } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 4b1b03af..7b88e025 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -1,18 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import java.util.List; +import binnie.core.item.IItemMisc; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import binnie.core.item.IItemMisc; -public enum ExtraTreeItems implements IItemMisc -{ +import java.util.List; + +public enum ExtraTreeItems implements IItemMisc { CarpentryHammer("Fake Hammer", "carpentryHammer"), Sawdust("Sawdust", "sawdust"), Bark("Bark", "bark"), @@ -28,32 +24,33 @@ public enum ExtraTreeItems implements IItemMisc GrainRoasted("Roasted Grain", "grainRoasted"), GlassFitting("Glass Fittings", "glassFitting"); - String name; - String iconPath; - IIcon icon; + protected String name; + protected String iconPath; + protected IIcon icon; - private ExtraTreeItems(final String name, final String iconPath) { + ExtraTreeItems(String name, String iconPath) { this.name = name; this.iconPath = iconPath; } @Override - public IIcon getIcon(final ItemStack itemStack) { - return this.icon; + public IIcon getIcon(ItemStack itemStack) { + return icon; } @Override - public void registerIcons(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, this.iconPath); + public void registerIcons(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, iconPath); } @Override - public void addInformation(final List data) { + public void addInformation(List tooltip) { + // ignored } @Override - public String getName(final ItemStack itemStack) { - return this.name; + public String getName(ItemStack itemStack) { + return name; } @Override @@ -62,7 +59,7 @@ public enum ExtraTreeItems implements IItemMisc } @Override - public ItemStack get(final int count) { - return new ItemStack(ExtraTrees.itemMisc, count, this.ordinal()); + public ItemStack get(int count) { + return new ItemStack(ExtraTrees.itemMisc, count, ordinal()); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index 70ad3376..084629b6 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -1,64 +1,60 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import binnie.core.liquid.FluidContainer; import binnie.Binnie; -import net.minecraftforge.fluids.FluidStack; +import binnie.core.liquid.FluidContainer; +import binnie.core.liquid.ILiquidType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import binnie.core.liquid.ILiquidType; +import net.minecraftforge.fluids.FluidStack; -public enum ExtraTreeLiquid implements ILiquidType -{ +public enum ExtraTreeLiquid implements ILiquidType { Sap("Sap", "sap", 12481858), Resin("Resin", "resin", 13199360), Latex("Latex", "latex", 14212041), Turpentine("Turpentine", "turpentine", 7951162); public String name; - String ident; - IIcon icon; - int colour; - private ExtraTreeLiquid(final String name, final String ident, final int colour) { + protected String ident; + protected IIcon icon; + protected int color; + + ExtraTreeLiquid(String name, String ident, int color) { this.name = ""; this.name = name; this.ident = ident; - this.colour = colour; + this.color = color; } @Override public IIcon getIcon() { - return this.icon; + return icon; } @Override - public void registerIcon(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "liquids/" + this.getIdentifier()); + public void registerIcon(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "liquids/" + getIdentifier()); } @Override public String getName() { - return this.name; + return name; } @Override public String getIdentifier() { - return this.ident; + return ident; } @Override public int getColor() { - return 16777215; + return 0xffffff; } @Override - public FluidStack get(final int amount) { - return Binnie.Liquid.getLiquidStack(this.ident, amount); + public FluidStack get(int amount) { + return Binnie.Liquid.getLiquidStack(ident, amount); } @Override @@ -67,17 +63,19 @@ public enum ExtraTreeLiquid implements ILiquidType } @Override - public boolean canPlaceIn(final FluidContainer container) { + public boolean canPlaceIn(FluidContainer container) { return true; } @Override - public boolean showInCreative(final FluidContainer container) { - return container == FluidContainer.Bucket || container == FluidContainer.Can || container == FluidContainer.Capsule; + public boolean showInCreative(FluidContainer container) { + return container == FluidContainer.Bucket + || container == FluidContainer.Can + || container == FluidContainer.Capsule; } @Override - public int getContainerColour() { - return this.colour; + public int getContainerColor() { + return color; } } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index a5dabd01..69acfde7 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -1,25 +1,21 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import java.util.Collection; -import net.minecraftforge.oredict.OreDictionary; -import binnie.core.Mods; import binnie.Binnie; -import forestry.api.recipes.RecipeManagers; -import binnie.extratrees.alcohol.Juice; -import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.util.IIcon; +import binnie.core.Mods; import binnie.core.item.IItemMisc; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.alcohol.Juice; +import forestry.api.recipes.RecipeManagers; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; -public enum Food implements IItemMisc -{ +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public enum Food implements IItemMisc { Crabapple(2), Orange(4), Kumquat(2), @@ -81,68 +77,19 @@ public enum Food implements IItemMisc Starfruit(2), Candlenut(0); - IIcon icon; - int hunger; + protected IIcon icon; + protected int hunger; private List ores; - private Food() { + Food() { this(0); } - private Food(final int hunger) { - this.ores = new ArrayList(); + Food(int hunger) { + ores = new ArrayList<>(); this.hunger = hunger; } - public boolean isEdible() { - return this.hunger > 0; - } - - public int getHealth() { - return this.hunger; - } - - @Override - public boolean isActive() { - return true; - } - - @Override - public String getName(final ItemStack itemStack) { - return ExtraTrees.proxy.localise("item.food." + this.name().toLowerCase()); - } - - @Override - public ItemStack get(final int count) { - return new ItemStack(ExtraTrees.itemFood, count, this.ordinal()); - } - - @Override - public IIcon getIcon(final ItemStack itemStack) { - return this.icon; - } - - @Override - public void registerIcons(final IIconRegister register) { - this.icon = ExtraTrees.proxy.getIcon(register, "food/" + this.toString()); - } - - @Override - public void addInformation(final List data) { - } - - public void addJuice(final Juice juice, final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[] { this.get(1) }, Binnie.Liquid.getLiquidStack("juice", amount), Mods.Forestry.stack("mulch"), mulch); - } - - public void addJuice(final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[] { this.get(1) }, Binnie.Liquid.getLiquidStack("juice", amount), Mods.Forestry.stack("mulch"), mulch); - } - - public void addOil(final int time, final int amount, final int mulch) { - RecipeManagers.squeezerManager.addRecipe(time, new ItemStack[] { this.get(1) }, Binnie.Liquid.getLiquidStack("seedoil", amount), Mods.Forestry.stack("mulch"), mulch); - } - public static void registerOreDictionary() { Food.Crabapple.ore("Apple").ore("Crabapple"); Food.Orange.ore("Orange"); @@ -186,13 +133,82 @@ public enum Food implements IItemMisc Food.Clove.ore("Clove"); } - private Food ore(final String string) { - OreDictionary.registerOre("crop" + string, this.get(1)); - this.ores.add("crop" + string); + public boolean isEdible() { + return hunger > 0; + } + + public int getHealth() { + return hunger; + } + + @Override + public boolean isActive() { + return true; + } + + @Override + public String getName(ItemStack itemStack) { + return ExtraTrees.proxy.localise("item.food." + name().toLowerCase()); + } + + @Override + public ItemStack get(int count) { + return new ItemStack(ExtraTrees.itemFood, count, ordinal()); + } + + @Override + public IIcon getIcon(ItemStack itemStack) { + return icon; + } + + @Override + public void registerIcons(IIconRegister register) { + icon = ExtraTrees.proxy.getIcon(register, "food/" + toString()); + } + + @Override + public void addInformation(List tooltip) { + // ignored + } + + // TODO unused method? + public void addJuice(Juice juice, int time, int amount, int mulch) { + RecipeManagers.squeezerManager.addRecipe( + time, + new ItemStack[]{get(1)}, + Binnie.Liquid.getLiquidStack("juice", amount), + Mods.Forestry.stack("mulch"), + mulch + ); + } + + public void addJuice(int time, int amount, int mulch) { + RecipeManagers.squeezerManager.addRecipe( + time, + new ItemStack[]{get(1)}, + Binnie.Liquid.getLiquidStack("juice", amount), + Mods.Forestry.stack("mulch"), + mulch + ); + } + + public void addOil(int time, int amount, int mulch) { + RecipeManagers.squeezerManager.addRecipe( + time, + new ItemStack[]{get(1)}, + Binnie.Liquid.getLiquidStack("seedoil", amount), + Mods.Forestry.stack("mulch"), + mulch + ); + } + + private Food ore(String string) { + OreDictionary.registerOre("crop" + string, get(1)); + ores.add("crop" + string); return this; } public Collection getOres() { - return this.ores; + return ores; } } diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index b645670d..87a6e926 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,43 +1,45 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; -import net.minecraft.world.World; -import forestry.api.core.Tabs; -import net.minecraft.creativetab.CreativeTabs; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.ExtraTrees; +import forestry.api.core.Tabs; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; -public class ItemDictionary extends Item -{ - IIcon iconMaster; +import java.util.List; - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = ExtraTrees.proxy.getIcon(register, "arboristDatabase"); - this.iconMaster = ExtraTrees.proxy.getIcon(register, "masterArboristDatabase"); +public class ItemDictionary extends Item { + protected IIcon iconMaster; + + public ItemDictionary() { + setCreativeTab(Tabs.tabArboriculture); + setUnlocalizedName("database"); + setMaxStackSize(1); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(final int par1) { - return (par1 == 0) ? this.itemIcon : this.iconMaster; + public void registerIcons(IIconRegister register) { + itemIcon = ExtraTrees.proxy.getIcon(register, "arboristDatabase"); + iconMaster = ExtraTrees.proxy.getIcon(register, "masterArboristDatabase"); } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) { + public IIcon getIconFromDamage(int par1) { + return (par1 == 0) ? itemIcon : iconMaster; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4); if (par1ItemStack.getItemDamage() > 0) { par3List.add("Sengir-in-a-can"); @@ -46,30 +48,25 @@ public class ItemDictionary extends Item @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); - } - - public ItemDictionary() { - this.setCreativeTab(Tabs.tabArboriculture); - this.setUnlocalizedName("database"); - this.setMaxStackSize(1); + public void getSubItems(Item item, CreativeTabs tab, List list) { + super.getSubItems(item, tab, list); + list.add(new ItemStack(item, 1, 1)); } @Override - public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { - if (itemstack.getItemDamage() == 0) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 0) { ExtraTrees.proxy.openGui(ExtraTreesGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); - } - else { + } else { ExtraTrees.proxy.openGui(ExtraTreesGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); } - return itemstack; + return stack; } @Override - public String getItemStackDisplayName(final ItemStack i) { - return (i.getItemDamage() == 0) ? "Arborist Database" : "Master Arborist Database"; + public String getItemStackDisplayName(ItemStack i) { + return (i.getItemDamage() == 0) ? + "Arborist Database" : + "Master Arborist Database"; } } diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index 85c6e092..adebfff2 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -1,100 +1,96 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; +import binnie.core.item.IItemMisc; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import forestry.api.core.Tabs; -import binnie.core.item.IItemMisc; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; -public class ItemFood extends net.minecraft.item.ItemFood -{ - IItemMisc[] items; +import java.util.List; + +public class ItemFood extends net.minecraft.item.ItemFood { + protected IItemMisc[] items; public ItemFood() { super(0, 0.0f, false); - this.setUnlocalizedName("food"); - this.setCreativeTab(Tabs.tabArboriculture); - this.setHasSubtypes(true); - this.items = Food.values(); + setUnlocalizedName("food"); + setCreativeTab(Tabs.tabArboriculture); + setHasSubtypes(true); + items = Food.values(); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - for (final IItemMisc item : this.items) { - if (item.isActive()) { - par3List.add(this.getStack(item, 1)); + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (IItemMisc itemMisc : items) { + if (itemMisc.isActive()) { + list.add(getStack(itemMisc, 1)); } } } - private IItemMisc getItem(final int damage) { - return (damage >= this.items.length) ? this.items[0] : this.items[damage]; + private IItemMisc getItem(int damage) { + return (damage >= items.length) ? items[0] : items[damage]; } - public ItemStack getStack(final IItemMisc type, final int size) { + public ItemStack getStack(IItemMisc type, int size) { return new ItemStack(this, size, type.ordinal()); } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) { - super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4); - final IItemMisc item = this.getItem(par1ItemStack.getItemDamage()); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + IItemMisc item = getItem(stack.getItemDamage()); if (item != null) { - item.addInformation(par3List); + item.addInformation(tooltip); } } @Override - public String getItemStackDisplayName(final ItemStack stack) { - final IItemMisc item = this.getItem(stack.getItemDamage()); + public String getItemStackDisplayName(ItemStack stack) { + IItemMisc item = getItem(stack.getItemDamage()); return (item != null) ? item.getName(stack) : "null"; } @Override - public IIcon getIcon(final ItemStack stack, final int pass) { - final IItemMisc item = this.getItem(stack.getItemDamage()); + public IIcon getIcon(ItemStack stack, int pass) { + IItemMisc item = getItem(stack.getItemDamage()); return (item != null) ? item.getIcon(stack) : null; } @Override - public IIcon getIconFromDamage(final int damage) { - final IItemMisc item = this.getItem(damage); + public IIcon getIconFromDamage(int damage) { + IItemMisc item = getItem(damage); return (item != null) ? item.getIcon(null) : null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - for (final IItemMisc item : this.items) { + public void registerIcons(IIconRegister register) { + for (IItemMisc item : items) { if (item.isActive()) { item.registerIcons(register); } } } - private Food getFood(final ItemStack par1ItemStack) { - return Food.values()[par1ItemStack.getItemDamage()]; + private Food getFood(ItemStack stack) { + return Food.values()[stack.getItemDamage()]; } @Override - public int func_150905_g(final ItemStack p_150905_1_) { - return this.getFood(p_150905_1_).getHealth(); + public int func_150905_g(ItemStack stack) { + return getFood(stack).getHealth(); } @Override - public float func_150906_h(final ItemStack p_150906_1_) { + public float func_150906_h(ItemStack stack) { return 3.0f; } } diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 8a2db660..35895ba8 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,51 +1,47 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.creativetab.CreativeTabs; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IToolHammer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.extratrees.api.IToolHammer; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; -public class ItemHammer extends Item implements IToolHammer -{ - boolean isDurableHammer; +public class ItemHammer extends Item implements IToolHammer { + protected boolean isDurableHammer; + + public ItemHammer(boolean durable) { + isDurableHammer = false; + isDurableHammer = durable; + setCreativeTab(CreativeTabs.tabTools); + setUnlocalizedName(durable ? "durableHammer" : "hammer"); + setMaxStackSize(1); + setMaxDamage(durable ? 1562 : 251); + } @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = ExtraTrees.proxy.getIcon(register, this.isDurableHammer ? "durableHammer" : "carpentryHammer"); - } - - public ItemHammer(final boolean durable) { - this.isDurableHammer = false; - this.isDurableHammer = durable; - this.setCreativeTab(CreativeTabs.tabTools); - this.setUnlocalizedName(durable ? "durableHammer" : "hammer"); - this.setMaxStackSize(1); - this.setMaxDamage(durable ? 1562 : 251); + public void registerIcons(IIconRegister register) { + itemIcon = ExtraTrees.proxy.getIcon(register, isDurableHammer ? "durableHammer" : "carpentryHammer"); } @Override - public String getItemStackDisplayName(final ItemStack i) { - return this.isDurableHammer ? "Master Carpentry Hammer" : "Carpentry Hammer"; + public String getItemStackDisplayName(ItemStack i) { + return isDurableHammer ? + "Master Carpentry Hammer" : + "Carpentry Hammer"; } @Override - public boolean isActive(final ItemStack item) { + public boolean isActive(ItemStack stack) { return true; } @Override - public void onHammerUsed(final ItemStack item, final EntityPlayer player) { - item.damageItem(1, player); + public void onHammerUsed(ItemStack stack, EntityPlayer player) { + stack.damageItem(1, player); } } diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 86a8deac..4a1bd12d 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,75 +1,72 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.core.ExtraTreesGUID; -import net.minecraft.world.World; -import forestry.api.core.Tabs; -import net.minecraft.creativetab.CreativeTabs; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.ExtraTrees; +import forestry.api.core.Tabs; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; -public class ItemMothDatabase extends Item -{ - IIcon iconMaster; +import java.util.List; - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = ExtraTrees.proxy.getIcon(register, "lepiDatabase"); - this.iconMaster = ExtraTrees.proxy.getIcon(register, "masterLepiDatabase"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(final int par1) { - return (par1 == 0) ? this.itemIcon : this.iconMaster; - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack par1ItemStack, final EntityPlayer par2EntityPlayer, final List par3List, final boolean par4) { - super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4); - if (par1ItemStack.getItemDamage() > 0) { - par3List.add("Binnie's Emporium of Lepidopterans"); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); - } +public class ItemMothDatabase extends Item { + protected IIcon iconMaster; public ItemMothDatabase() { - this.setCreativeTab(Tabs.tabLepidopterology); - this.setUnlocalizedName("databaseMoth"); - this.setMaxStackSize(1); + setCreativeTab(Tabs.tabLepidopterology); + setUnlocalizedName("databaseMoth"); + setMaxStackSize(1); } @Override - public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { - if (itemstack.getItemDamage() == 0) { - ExtraTrees.proxy.openGui(ExtraTreesGUID.MothDatabase, player, (int) player.posX, (int) player.posY, (int) player.posZ); + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) { + itemIcon = ExtraTrees.proxy.getIcon(register, "lepiDatabase"); + iconMaster = ExtraTrees.proxy.getIcon(register, "masterLepiDatabase"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1) { + return (par1 == 0) ? itemIcon : iconMaster; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + if (stack.getItemDamage() > 0) { + tooltip.add("Binnie's Emporium of Lepidopterans"); } - else { + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + super.getSubItems(item, tab, list); + list.add(new ItemStack(item, 1, 1)); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 0) { + ExtraTrees.proxy.openGui(ExtraTreesGUID.MothDatabase, player, (int) player.posX, (int) player.posY, (int) player.posZ); + } else { ExtraTrees.proxy.openGui(ExtraTreesGUID.MothDatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); } - return itemstack; + return stack; } @Override - public String getItemStackDisplayName(final ItemStack i) { - return (i.getItemDamage() == 0) ? "Lepidopterist Database" : "Master Lepidopterist Database"; + public String getItemStackDisplayName(ItemStack stack) { + return (stack.getItemDamage() == 0) ? + "Lepidopterist Database" : + "Master Lepidopterist Database"; } } diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/src/main/java/binnie/extratrees/item/ItemSetSquare.java index 4327fe69..f2d76385 100644 --- a/src/main/java/binnie/extratrees/item/ItemSetSquare.java +++ b/src/main/java/binnie/extratrees/item/ItemSetSquare.java @@ -1,55 +1,51 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.creativetab.CreativeTabs; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IToolHammer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; -import binnie.extratrees.api.IToolHammer; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; -public class ItemSetSquare extends Item implements IToolHammer -{ +// TODO unused class? +public class ItemSetSquare extends Item implements IToolHammer { EnumSetSquareMode mode; + public ItemSetSquare(EnumSetSquareMode mode) { + this.mode = EnumSetSquareMode.Rotate; + this.mode = mode; + setCreativeTab(CreativeTabs.tabTools); + setUnlocalizedName("setSquare" + mode); + setMaxStackSize(1); + } + @Override @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = ExtraTrees.proxy.getIcon(register, "setSquare" + this.mode.ordinal()); - } - - public ItemSetSquare(final EnumSetSquareMode mode) { - this.mode = EnumSetSquareMode.Rotate; - this.mode = mode; - this.setCreativeTab(CreativeTabs.tabTools); - this.setUnlocalizedName("setSquare" + mode); - this.setMaxStackSize(1); + public void registerIcons(IIconRegister register) { + itemIcon = ExtraTrees.proxy.getIcon(register, "setSquare" + mode.ordinal()); } @Override - public String getItemStackDisplayName(final ItemStack i) { + public String getItemStackDisplayName(ItemStack i) { return "Set Square"; } @Override - public boolean isActive(final ItemStack item) { - return this.mode == EnumSetSquareMode.Rotate; + public boolean isActive(ItemStack stack) { + return mode == EnumSetSquareMode.Rotate; } @Override - public void onHammerUsed(final ItemStack item, final EntityPlayer player) { + public void onHammerUsed(ItemStack stack, EntityPlayer player) { + // ignored } - public enum EnumSetSquareMode - { + public enum EnumSetSquareMode { Rotate, Edit, - Swap; + Swap } } diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 14c11070..419da4b5 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -1,34 +1,29 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.item; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; +import binnie.core.Mods; +import binnie.core.item.ItemMisc; +import binnie.core.liquid.ItemFluidContainer; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.ILogType; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.core.Tabs; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import binnie.core.item.ItemMisc; import forestry.api.recipes.RecipeManagers; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import net.minecraft.item.Item; -import binnie.core.Mods; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.init.Items; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.oredict.OreDictionary; -import binnie.core.liquid.ItemFluidContainer; -import binnie.core.BinnieCore; -import binnie.extratrees.ExtraTrees; -import forestry.api.core.Tabs; -import binnie.Binnie; -import binnie.core.IInitializable; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; -public class ModuleItems implements IInitializable -{ +public class ModuleItems implements IInitializable { @Override public void preInit() { ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture); @@ -36,17 +31,16 @@ public class ModuleItems implements IInitializable if (BinnieCore.isLepidopteryActive()) { ExtraTrees.itemDictionaryLepi = new ItemMothDatabase(); } + Binnie.Liquid.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree); ExtraTrees.itemFood = new ItemFood(); ExtraTrees.itemHammer = new ItemHammer(false); ExtraTrees.itemDurableHammer = new ItemHammer(true); - } @Override public void init() { - OreDictionary.registerOre("pulpWood", ExtraTreeItems.Sawdust.get(1)); Food.registerOreDictionary(); OreDictionary.registerOre("cropApple", Items.apple); @@ -112,57 +106,157 @@ public class ModuleItems implements IInitializable @Override public void postInit() { - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), new Object[] { "wiw", " s ", " s ", 'w', Blocks.obsidian, 'i', Items.gold_ingot, 's', Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ExtraTrees.itemHammer, 1, 0), new Object[] { "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.iron_ingot, 's', Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), new Object[] { " m ", "mbm", 'b', Items.bread, 'm', Blocks.brown_mushroom })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.LagerYeast.get(8), new Object[] { "mbm", " m ", 'b', Items.bread, 'm', Blocks.brown_mushroom })); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), + "wiw", " s ", " s ", + 'w', Blocks.obsidian, + 'i', Items.gold_ingot, + 's', Items.stick + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + new ItemStack(ExtraTrees.itemHammer, 1, 0), + "wiw", " s ", " s ", + 'w', "plankWood", + 'i', Items.iron_ingot, + 's', Items.stick + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeItems.Yeast.get(8), + " m ", "mbm", + 'b', Items.bread, + 'm', Blocks.brown_mushroom + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeItems.LagerYeast.get(8), + "mbm", " m ", + 'b', Items.bread, + 'm', Blocks.brown_mushroom + )); + GameRegistry.addRecipe( ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.wheat_seeds ); GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeItems.GrainBarley.get(3), new Object[] { + ExtraTreeItems.GrainBarley.get(3), new Object[]{ false, " s ", "s ", " s ", 's', ExtraTreeItems.GrainWheat.get(1) } )); GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeItems.GrainCorn.get(3), new Object[] { + ExtraTreeItems.GrainCorn.get(3), new Object[]{ false, " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1) } )); - GameRegistry.addRecipe(ExtraTreeItems.GrainRye.get(3), new Object[] { " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1) }); - GameRegistry.addRecipe(ExtraTreeItems.Hops.get(3), new Object[] { " s ", "sps", " s ", 's', Items.wheat_seeds, 'p', Items.apple }); - GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), new Object[] { " s ", "s s", " s ", 's', Mods.Forestry.stack("oakStick") }); - GameRegistry.addRecipe(ExtraTreeItems.GlassFitting.get(6), new Object[] { "s s", " i ", "s s", 'i', Items.iron_ingot, 's', Items.stick }); + + GameRegistry.addRecipe( + ExtraTreeItems.GrainRye.get(3), + " ", "s s", " s ", + 's', ExtraTreeItems.GrainWheat.get(1) + ); + + GameRegistry.addRecipe( + ExtraTreeItems.Hops.get(3), + " s ", "sps", " s ", + 's', Items.wheat_seeds, + 'p', Items.apple + ); + + GameRegistry.addRecipe( + ExtraTreeItems.ProvenGear.get(1), + " s ", "s s", " s ", + 's', Mods.Forestry.stack("oakStick") + ); + + GameRegistry.addRecipe( + ExtraTreeItems.GlassFitting.get(6), + "s s", " i ", "s s", + 'i', Items.iron_ingot, + 's', Items.stick + ); + GameRegistry.addSmelting(ExtraTreeItems.GrainWheat.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainRye.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainCorn.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); + try { - final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null); - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.Papayimar.get(1), new Object[] { minium, "cropPapaya" })); + Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null); + CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.Papayimar.get(1), minium, "cropPapaya")); } catch (Exception ex) { + // ignored } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), (ItemStack) null, new ItemStack(ExtraTrees.itemDictionary), new Object[] { "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', "ingotCopper", 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald }); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), (ItemStack) null, new ItemStack(ExtraTrees.itemDictionaryLepi), new Object[] { "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', "ingotBronze", 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald }); - RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), (ItemStack) null, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 4), new Object[] { "x", 'x', Mods.Forestry.stack("beeswax") }); + + RecipeManagers.carpenterManager.addRecipe( + 100, + Binnie.Liquid.getLiquidStack("water", 2000), + null, + new ItemStack(ExtraTrees.itemDictionary), + "X#X", "YEY", "RDR", + '#', Blocks.glass_pane, + 'X', Items.gold_ingot, + 'Y', "ingotCopper", + 'R', Items.redstone, + 'D', Items.diamond, + 'E', Items.emerald + ); + + RecipeManagers.carpenterManager.addRecipe( + 100, + Binnie.Liquid.getLiquidStack("water", 2000), + null, + new ItemStack(ExtraTrees.itemDictionaryLepi), + "X#X", "YEY", "RDR", + '#', Blocks.glass_pane, + 'X', Items.gold_ingot, + 'Y', "ingotBronze", + 'R', Items.redstone, + 'D', Items.diamond, + 'E', Items.emerald + ); + + RecipeManagers.stillManager.addRecipe( + 25, + ExtraTreeLiquid.Resin.get(5), + ExtraTreeLiquid.Turpentine.get(3) + ); + + RecipeManagers.carpenterManager.addRecipe( + 25, + ExtraTreeLiquid.Turpentine.get(50), + null, + ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 4), + "x", + 'x', Mods.Forestry.stack("beeswax") + ); + if (Binnie.Liquid.getLiquidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.Liquid.getLiquidStack("Creosote Oil", 50), (ItemStack) null, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 1), new Object[] { "x", 'x', Mods.Forestry.stack("beeswax") }); + RecipeManagers.carpenterManager.addRecipe( + 25, + Binnie.Liquid.getLiquidStack("Creosote Oil", 50), + null, + ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 1), + "x", + 'x', Mods.Forestry.stack("beeswax") + ); } - for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { if (data.fluid.isFluidEqual(Binnie.Liquid.getLiquidStack("water", 0)) && data.fluid.amount == 1000) { - CraftingManager.getInstance().addRecipe(Mods.Forestry.stack("mulch"), new Object[] { " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy() }); + CraftingManager.getInstance().addRecipe(Mods.Forestry.stack("mulch"), " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy()); } } + FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Resin.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Resin.get(1).getFluid(), 30, 10000, 1)); - for (final ILogType.ExtraTreeLog log : ILogType.ExtraTreeLog.values()) { + for (ILogType.ExtraTreeLog log : ILogType.ExtraTreeLog.values()) { log.addRecipe(); } } diff --git a/src/main/java/binnie/extratrees/kitchen/BottleRack.java b/src/main/java/binnie/extratrees/kitchen/BottleRack.java index c57d462a..845acd19 100644 --- a/src/main/java/binnie/extratrees/kitchen/BottleRack.java +++ b/src/main/java/binnie/extratrees/kitchen/BottleRack.java @@ -1,28 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.kitchen; +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreeTexture; -import binnie.core.craftgui.minecraft.IMachineInformation; -public class BottleRack -{ - public static class PackageBottleRack extends KitchenMachine.PackageKitchenMachine implements IMachineInformation - { +public class BottleRack { + public static class PackageBottleRack extends KitchenMachine.PackageKitchenMachine implements IMachineInformation { public PackageBottleRack() { super("bottleRack", ExtraTreeTexture.lumbermillTexture); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.KitchenBottleRack); - final ComponentTankContainer inventory = new ComponentTankContainer(machine); + ComponentTankContainer inventory = new ComponentTankContainer(machine); for (int x = 0; x < 36; ++x) { inventory.addTank(x, "input", 1000); inventory.getTankSlot(x); diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index 1f144db4..057fd246 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -1,57 +1,51 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.kitchen; -import net.minecraft.client.renderer.RenderBlocks; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.resource.ResourceType; import binnie.Binnie; -import binnie.core.resource.BinnieResource; -import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; -import binnie.core.machines.MachinePackage; import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachinePackage; +import binnie.core.machines.TileEntityMachine; +import binnie.core.resource.BinnieResource; +import binnie.core.resource.ResourceType; +import binnie.extratrees.ExtraTrees; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; -public enum KitchenMachine implements IMachineType -{ - Worktop((Class) null), - Cupboard((Class) null), +public enum KitchenMachine implements IMachineType { + Worktop(null), + Cupboard(null), BottleRack(BottleRack.PackageBottleRack.class); - Class clss; + protected Class cls; - private KitchenMachine(final Class clss) { - this.clss = clss; + KitchenMachine(Class cls) { + this.cls = cls; } @Override public Class getPackageClass() { - return this.clss; + return cls; } @Override public boolean isActive() { - return this.clss != null; + return cls != null; } - public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.blockKitchen, i, this.ordinal()); + public ItemStack get(int i) { + return new ItemStack(ExtraTrees.blockKitchen, i, ordinal()); } - public abstract static class PackageKitchenMachine extends MachinePackage - { - BinnieResource textureName; + public abstract static class PackageKitchenMachine extends MachinePackage { + protected BinnieResource textureName; - protected PackageKitchenMachine(final String uid, final String textureName) { + protected PackageKitchenMachine(String uid, String textureName) { super(uid, false); this.textureName = Binnie.Resource.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); } - protected PackageKitchenMachine(final String uid, final BinnieResource textureName) { + protected PackageKitchenMachine(String uid, BinnieResource textureName) { super(uid, false); this.textureName = textureName; } @@ -62,8 +56,8 @@ public enum KitchenMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { - MachineRendererKitchen.instance.renderMachine(machine, this.textureName, x, y, z, partialTick, renderer); + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + MachineRendererKitchen.instance.renderMachine(machine, textureName, x, y, z, partialTick, renderer); } } } diff --git a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java index 77c5ec87..ea94e76f 100644 --- a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java @@ -1,33 +1,29 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.kitchen; -import net.minecraft.util.IIcon; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.TextureMap; -import org.lwjgl.opengl.GL11; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.init.Blocks; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.RenderBlocks; import binnie.core.machines.Machine; import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class MachineRendererKitchen -{ - static int level; - public static MachineRendererKitchen instance; - BinnieResource texture; +public class MachineRendererKitchen { + public static MachineRendererKitchen instance = new MachineRendererKitchen(); - public void renderMachine(final Machine machine, final BinnieResource texture, final double x, final double y, final double z, final float var8, final RenderBlocks renderer) { + protected static int level = 0; + protected BinnieResource texture; + + public void renderMachine(Machine machine, BinnieResource texture, double x, double y, double z, float var8, RenderBlocks renderer) { if (renderer != null && renderer.blockAccess != null) { - final Block block = machine.getPackage().getGroup().getBlock(); - final float i = 0.0625f; + Block block = machine.getPackage().getGroup().getBlock(); + float i = 0.0625f; renderer.setRenderBounds(2.0f * i, 0.0, 2.0f * i, 14.0f * i, 14.0f * i, 14.0f * i); renderer.renderStandardBlock(block, (int) x, (int) y, (int) z); MachineRendererKitchen.level = 1; @@ -38,31 +34,35 @@ public class MachineRendererKitchen if (RenderManager.instance == null || RenderManager.instance.renderEngine == null) { return; } - final IIcon icon = Blocks.dirt.getIcon(0, 0); - final Tessellator tess = Tessellator.instance; + + IIcon icon = Blocks.dirt.getIcon(0, 0); + Tessellator tess = Tessellator.instance; boolean wasTessellating = true; + try { tess.draw(); } catch (Exception e) { wasTessellating = false; } + tess.startDrawingQuads(); tess.draw(); GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 1.0, z + 0.5); RenderManager.instance.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - final float ux = icon.getMinU(); - final float uy = icon.getMinV(); - final float uw = icon.getMaxU(); - final float uh = icon.getMaxV(); - final int[] widths = { 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 6, 6, 5, 4 }; + float ux = icon.getMinU(); + float uy = icon.getMinV(); + float uw = icon.getMaxU(); + float uh = icon.getMaxV(); + int[] widths = {1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, 6, 6, 6, 5, 4}; + for (int h = 0; h < 15; ++h) { - final float h2 = h * i; - final float h3 = h2 + i; - final float d1 = widths[h] * i; - final float d2 = widths[h + 1] * i; + float h2 = h * i; + float h3 = h2 + i; + float d1 = widths[h] * i; + float d2 = widths[h + 1] * i; float ang = 0.707f; - final float half = 8.0f * i; + float half = 8.0f * i; if (h < 13) { ang -= 0.05f; for (int angle = 0; angle < 360; angle += 90) { @@ -71,6 +71,7 @@ public class MachineRendererKitchen } ang += 0.05f; } + for (int angle = 0; angle < 360; angle += 90) { GL11.glPushMatrix(); GL11.glRotatef(angle, 0.0f, 1.0f, 0.0f); @@ -97,9 +98,4 @@ public class MachineRendererKitchen } } } - - static { - MachineRendererKitchen.level = 0; - MachineRendererKitchen.instance = new MachineRendererKitchen(); - } } diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index 10944743..e091f6bf 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -1,20 +1,14 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.kitchen; -import net.minecraft.block.Block; -import forestry.api.core.Tabs; +import binnie.core.IInitializable; import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; -import binnie.core.IInitializable; +import forestry.api.core.Tabs; -public class ModuleKitchen implements IInitializable -{ +public class ModuleKitchen implements IInitializable { @Override public void preInit() { - final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "kitchen", "kitchen", KitchenMachine.values()); + MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "kitchen", "kitchen", KitchenMachine.values()); machineGroup.setCreativeTab(Tabs.tabArboriculture); machineGroup.customRenderer = false; ExtraTrees.blockKitchen = machineGroup.getBlock(); diff --git a/src/main/java/binnie/extratrees/machines/Brewery.java b/src/main/java/binnie/extratrees/machines/Brewery.java index 0f50fb61..7a2f2b92 100644 --- a/src/main/java/binnie/extratrees/machines/Brewery.java +++ b/src/main/java/binnie/extratrees/machines/Brewery.java @@ -1,20 +1,21 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; import binnie.Binnie; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.liquid.IFluidType; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.*; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.MachineSide; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.TankValidator; import binnie.core.machines.network.INetwork; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.extratrees.alcohol.Alcohol; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; @@ -33,19 +34,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Brewery -{ - public static int[] slotRecipeGrains; - public static int slotRecipeInput; - public static int slotRecipeYeast; - public static int[] slotInventory; - public static int tankInput; - public static int tankOutput; - private static List recipes; +public class Brewery { + public static int[] slotRecipeGrains = new int[]{0, 1, 2}; + public static int slotRecipeInput = 3; + public static int slotRecipeYeast = 4; + public static int[] slotInventory = new int[]{5, 6, 7, 8, 9, 10, 11, 12, 13}; + public static int tankInput = 0; + public static int tankOutput = 1; - public static boolean isValidGrain(final ItemStack itemstack) { - for (final IBreweryRecipe recipe : Brewery.recipes) { - for (final ItemStack ingredient : recipe.getGrains()) { + private static List recipes = new ArrayList<>(); + + public static boolean isValidGrain(ItemStack itemstack) { + for (IBreweryRecipe recipe : Brewery.recipes) { + for (ItemStack ingredient : recipe.getGrains()) { if (ingredient.isItemEqual(itemstack)) { return true; } @@ -54,9 +55,9 @@ public class Brewery return false; } - public static boolean isValidYeast(final ItemStack itemstack) { - for (final IBreweryRecipe recipe : Brewery.recipes) { - for (final ItemStack ingredient : recipe.getYeasts()) { + public static boolean isValidYeast(ItemStack itemstack) { + for (IBreweryRecipe recipe : Brewery.recipes) { + for (ItemStack ingredient : recipe.getYeasts()) { if (ingredient.isItemEqual(itemstack)) { return true; } @@ -65,9 +66,9 @@ public class Brewery return false; } - public static FluidStack getOutput(final FluidStack stack) { - final BreweryCrafting crafting = new BreweryCrafting(stack, null, null, null); - for (final IBreweryRecipe recipe : Brewery.recipes) { + public static FluidStack getOutput(FluidStack stack) { + BreweryCrafting crafting = new BreweryCrafting(stack, null, null, null); + for (IBreweryRecipe recipe : Brewery.recipes) { if (recipe.getOutput(crafting) != null) { return recipe.getOutput(crafting); } @@ -75,14 +76,12 @@ public class Brewery return null; } - public static FluidStack getOutput(final BreweryCrafting crafting) { - if (crafting.currentInput == null) { + public static FluidStack getOutput(BreweryCrafting crafting) { + if (crafting.currentInput == null || crafting.yeast == null) { return null; } - if (crafting.yeast == null) { - return null; - } - for (final IBreweryRecipe recipe : Brewery.recipes) { + + for (IBreweryRecipe recipe : Brewery.recipes) { if (recipe.getOutput(crafting) != null) { return recipe.getOutput(crafting); } @@ -90,9 +89,9 @@ public class Brewery return null; } - public static boolean isValidIngredient(final ItemStack itemstack) { - for (final IBreweryRecipe recipe : Brewery.recipes) { - for (final ItemStack ingr : recipe.getIngredient()) { + public static boolean isValidIngredient(ItemStack itemstack) { + for (IBreweryRecipe recipe : Brewery.recipes) { + for (ItemStack ingr : recipe.getIngredient()) { if (ingr.isItemEqual(itemstack)) { return true; } @@ -101,9 +100,9 @@ public class Brewery return false; } - public static boolean isValidInputLiquid(final FluidStack fluid) { - for (final IBreweryRecipe recipe : Brewery.recipes) { - for (final FluidStack ingr : recipe.getInput()) { + public static boolean isValidInputLiquid(FluidStack fluid) { + for (IBreweryRecipe recipe : Brewery.recipes) { + for (FluidStack ingr : recipe.getInput()) { if (ingr.isFluidEqual(fluid)) { return true; } @@ -112,9 +111,9 @@ public class Brewery return false; } - public static boolean isValidOutputLiquid(final FluidStack fluid) { - for (final IBreweryRecipe recipe : Brewery.recipes) { - for (final FluidStack ingr : recipe.getOutput()) { + public static boolean isValidOutputLiquid(FluidStack fluid) { + for (IBreweryRecipe recipe : Brewery.recipes) { + for (FluidStack ingr : recipe.getOutput()) { if (ingr.isFluidEqual(fluid)) { return true; } @@ -123,7 +122,7 @@ public class Brewery return false; } - public static void addRecipe(final FluidStack input, final FluidStack output) { + public static void addRecipe(FluidStack input, FluidStack output) { Brewery.recipes.add(new BreweryRecipe(input, output)); } @@ -131,42 +130,48 @@ public class Brewery Brewery.recipes.add(new BeerRecipe()); } - static { - Brewery.slotRecipeGrains = new int[] { 0, 1, 2 }; - Brewery.slotRecipeInput = 3; - Brewery.slotRecipeYeast = 4; - Brewery.slotInventory = new int[] { 5, 6, 7, 8, 9, 10, 11, 12, 13 }; - Brewery.tankInput = 0; - Brewery.tankOutput = 1; - Brewery.recipes = new ArrayList(); + private interface IBreweryRecipe { + FluidStack getOutput(BreweryCrafting crafting); + + FluidStack[] getInput(); + + FluidStack[] getOutput(); + + ItemStack[] getGrains(); + + ItemStack[] getIngredient(); + + ItemStack[] getYeasts(); } - public static class PackageBrewery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + public static class PackageBrewery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public PackageBrewery() { super("brewery", ExtraTreeTexture.breweryTexture, true); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Brewery); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); inventory.addSlotArray(Brewery.slotRecipeGrains, "grain"); - for (final InventorySlot slot : inventory.getSlots(Brewery.slotRecipeGrains)) { + for (InventorySlot slot : inventory.getSlots(Brewery.slotRecipeGrains)) { slot.setValidator(new SlotValidatorBreweryGrain()); slot.setType(InventorySlot.Type.Recipe); } + inventory.addSlotArray(Brewery.slotInventory, "inventory"); - for (final InventorySlot slot : inventory.getSlots(Brewery.slotInventory)) { + for (InventorySlot slot : inventory.getSlots(Brewery.slotInventory)) { slot.forbidExtraction(); } + inventory.addSlot(Brewery.slotRecipeYeast, "yeast"); inventory.getSlot(Brewery.slotRecipeYeast).setValidator(new SlotValidatorYeast()); inventory.getSlot(Brewery.slotRecipeYeast).setType(InventorySlot.Type.Recipe); inventory.addSlot(Brewery.slotRecipeInput, "ingredient"); inventory.getSlot(Brewery.slotRecipeInput).setValidator(new SlotValidatorBreweryIngredient()); inventory.getSlot(Brewery.slotRecipeInput).setType(InventorySlot.Type.Recipe); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); + + ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Brewery.tankInput, "input", 5000); tanks.getTankSlot(Brewery.tankInput).setValidator(new TankValidatorFermentInput()); tanks.getTankSlot(Brewery.tankInput).setOutputSides(MachineSide.TopAndBottom); @@ -174,6 +179,7 @@ public class Brewery tanks.getTankSlot(Brewery.tankOutput).setValidator(new TankValidatorFermentOutput()); tanks.getTankSlot(Brewery.tankOutput).forbidInsertion(); tanks.getTankSlot(Brewery.tankOutput).setOutputSides(MachineSide.Sides); + new ComponentPowerReceptor(machine); new ComponentBreweryLogic(machine); } @@ -184,92 +190,93 @@ public class Brewery } } - public static class BreweryCrafting implements INBTTagable - { + public static class BreweryCrafting implements INBTTagable { public FluidStack currentInput; public ItemStack[] inputs; public ItemStack ingr; public ItemStack yeast; - public BreweryCrafting(final FluidStack currentInput, final ItemStack ingr, final ItemStack[] inputs, final ItemStack yeast) { + public BreweryCrafting(FluidStack currentInput, ItemStack ingr, ItemStack[] inputs, ItemStack yeast) { this.currentInput = currentInput; this.inputs = ((inputs == null) ? new ItemStack[3] : inputs); this.ingr = ingr; this.yeast = yeast; } - public BreweryCrafting(final NBTTagCompound nbt) { - this.readFromNBT(nbt); + public BreweryCrafting(NBTTagCompound nbt) { + readFromNBT(nbt); } @Override - public void readFromNBT(final NBTTagCompound nbt) { - this.currentInput = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); - this.ingr = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ingr")); - (this.inputs = new ItemStack[3])[0] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in1")); - this.inputs[1] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in2")); - this.inputs[2] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in3")); - this.yeast = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("yeast")); + public void readFromNBT(NBTTagCompound nbt) { + currentInput = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); + ingr = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("ingr")); + + inputs = new ItemStack[3]; + inputs[0] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in1")); + inputs[1] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in2")); + inputs[2] = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("in3")); + yeast = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("yeast")); } @Override - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagCompound fluidTag = new NBTTagCompound(); - this.currentInput.writeToNBT(fluidTag); + public void writeToNBT(NBTTagCompound nbt) { + NBTTagCompound fluidTag = new NBTTagCompound(); + currentInput.writeToNBT(fluidTag); nbt.setTag("fluid", fluidTag); - nbt.setTag("ingr", this.getNBT(this.ingr)); - nbt.setTag("in1", this.getNBT(this.inputs[0])); - nbt.setTag("in2", this.getNBT(this.inputs[1])); - nbt.setTag("in3", this.getNBT(this.inputs[2])); - nbt.setTag("yeast", this.getNBT(this.yeast)); + nbt.setTag("ingr", getNBT(ingr)); + nbt.setTag("in1", getNBT(inputs[0])); + nbt.setTag("in2", getNBT(inputs[1])); + nbt.setTag("in3", getNBT(inputs[2])); + nbt.setTag("yeast", getNBT(yeast)); } - private NBTTagCompound getNBT(final ItemStack ingr) { + private NBTTagCompound getNBT(ItemStack ingr) { if (ingr == null) { return new NBTTagCompound(); } - final NBTTagCompound nbt = new NBTTagCompound(); + + NBTTagCompound nbt = new NBTTagCompound(); ingr.writeToNBT(nbt); return nbt; } } - public static class ComponentBreweryLogic extends ComponentProcessSetCost implements IProcess, INetwork.GuiNBT - { + public static class ComponentBreweryLogic extends ComponentProcessSetCost implements IProcess, INetwork.GuiNBT { public BreweryCrafting currentCrafting; - public ComponentBreweryLogic(final Machine machine) { + public ComponentBreweryLogic(Machine machine) { super(machine, 16000, 800); - this.currentCrafting = null; + currentCrafting = null; } @Override public ErrorState canWork() { - if (this.getUtil().isTankEmpty(Brewery.tankInput) && this.currentCrafting == null) { + if (getUtil().isTankEmpty(Brewery.tankInput) && currentCrafting == null) { return new ErrorState.InsufficientLiquid("No Input Liquid", Brewery.tankInput); } - if (Brewery.getOutput(this.getInputCrafting()) == null && this.currentCrafting == null) { + if (Brewery.getOutput(getInputCrafting()) == null && currentCrafting == null) { return new ErrorState("No Recipe", "Brewing cannot occur with these ingredients"); } - if (!this.getUtil().hasIngredients(new int[] { 0, 1, 2, 3, 4 }, Brewery.slotInventory) && this.currentCrafting == null) { + if (!getUtil().hasIngredients(new int[]{0, 1, 2, 3, 4}, Brewery.slotInventory) && currentCrafting == null) { return new ErrorState("Insufficient Ingredients", "Not enough ingredients for Brewing"); } return super.canWork(); } private BreweryCrafting getInputCrafting() { - return new BreweryCrafting(this.getUtil().getFluid(Brewery.tankInput), this.getUtil().getStack(Brewery.slotRecipeInput), this.getUtil().getStacks(Brewery.slotRecipeGrains), this.getUtil().getStack(Brewery.slotRecipeYeast)); + return new BreweryCrafting(getUtil().getFluid(Brewery.tankInput), getUtil().getStack(Brewery.slotRecipeInput), getUtil().getStacks(Brewery.slotRecipeGrains), getUtil().getStack(Brewery.slotRecipeYeast)); } @Override public ErrorState canProgress() { - if (this.currentCrafting == null) { + if (currentCrafting == null) { return new ErrorState("Brewery Empty", "No liquid in Brewery"); } - if (!this.getUtil().spaceInTank(Brewery.tankOutput, 1000)) { + if (!getUtil().spaceInTank(Brewery.tankOutput, 1000)) { return new ErrorState.TankSpace("No Space for Fermented Liquid", Brewery.tankOutput); } - if (this.getUtil().getFluid(Brewery.tankOutput) != null && !this.getUtil().getFluid(Brewery.tankOutput).isFluidEqual(Brewery.getOutput(this.currentCrafting))) { + if (getUtil().getFluid(Brewery.tankOutput) != null && !getUtil().getFluid(Brewery.tankOutput).isFluidEqual(Brewery.getOutput(currentCrafting))) { return new ErrorState.TankSpace("Different fluid in tank", Brewery.tankOutput); } return super.canProgress(); @@ -277,62 +284,64 @@ public class Brewery @Override protected void onFinishTask() { - final FluidStack output = Brewery.getOutput(this.currentCrafting).copy(); + FluidStack output = Brewery.getOutput(currentCrafting).copy(); output.amount = 1000; - this.getUtil().fillTank(Brewery.tankOutput, output); + getUtil().fillTank(Brewery.tankOutput, output); } @Override public void onUpdate() { super.onUpdate(); - if (this.canWork() == null && this.currentCrafting == null && this.getUtil().getTank(Brewery.tankInput).getFluidAmount() >= 1000) { - final FluidStack stack = this.getUtil().drainTank(Brewery.tankInput, 1000); - this.currentCrafting = this.getInputCrafting(); - this.currentCrafting.currentInput = stack; + if (canWork() != null || currentCrafting != null || getUtil().getTank(Brewery.tankInput).getFluidAmount() < 1000) { + return; } + + FluidStack stack = getUtil().drainTank(Brewery.tankInput, 1000); + currentCrafting = getInputCrafting(); + currentCrafting.currentInput = stack; } @Override - public void sendGuiNBT(final Map nbts) { - final NBTTagCompound nbt = new NBTTagCompound(); - if (this.currentCrafting == null) { + public void sendGuiNBT(Map nbts) { + NBTTagCompound nbt = new NBTTagCompound(); + if (currentCrafting == null) { nbt.setBoolean("null", true); - } - else { - this.currentCrafting.writeToNBT(nbt); + } else { + currentCrafting.writeToNBT(nbt); } nbts.put("brewery-recipe", nbt); } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { - if (name.equals("brewery-recipe")) { - if (nbt.getBoolean("null")) { - this.currentCrafting = null; - } - else { - this.currentCrafting = new BreweryCrafting(nbt); - } + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { + if (!name.equals("brewery-recipe")) { + return; + } + + if (nbt.getBoolean("null")) { + currentCrafting = null; + } else { + currentCrafting = new BreweryCrafting(nbt); } } @Override public String getTooltip() { - if (this.currentCrafting == null) { + if (currentCrafting == null) { return "Empty"; } - return "Creating " + Brewery.getOutput(this.currentCrafting).getFluid().getLocalizedName(); + // TODO remove deprecated + return "Creating " + Brewery.getOutput(currentCrafting).getFluid().getLocalizedName(); } } - public static class SlotValidatorBreweryGrain extends SlotValidator - { + public static class SlotValidatorBreweryGrain extends SlotValidator { public SlotValidatorBreweryGrain() { super(SlotValidator.IconBlock); } @Override - public boolean isValid(final ItemStack itemStack) { + public boolean isValid(ItemStack itemStack) { return Brewery.isValidGrain(itemStack); } @@ -342,14 +351,13 @@ public class Brewery } } - public static class SlotValidatorBreweryIngredient extends SlotValidator - { + public static class SlotValidatorBreweryIngredient extends SlotValidator { public SlotValidatorBreweryIngredient() { super(SlotValidator.IconBlock); } @Override - public boolean isValid(final ItemStack itemStack) { + public boolean isValid(ItemStack itemStack) { return Brewery.isValidIngredient(itemStack); } @@ -359,14 +367,13 @@ public class Brewery } } - public static class SlotValidatorYeast extends SlotValidator - { + public static class SlotValidatorYeast extends SlotValidator { public SlotValidatorYeast() { super(SlotValidator.IconBlock); } @Override - public boolean isValid(final ItemStack itemStack) { + public boolean isValid(ItemStack itemStack) { return Brewery.isValidYeast(itemStack); } @@ -376,10 +383,9 @@ public class Brewery } } - public static class TankValidatorFermentInput extends TankValidator - { + public static class TankValidatorFermentInput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Brewery.isValidInputLiquid(liquid); } @@ -389,10 +395,9 @@ public class Brewery } } - public static class TankValidatorFermentOutput extends TankValidator - { + public static class TankValidatorFermentOutput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Brewery.isValidOutputLiquid(liquid); } @@ -402,36 +407,35 @@ public class Brewery } } - public static class BreweryRecipe implements IBreweryRecipe - { - FluidStack input; - ItemStack specificYeast; - FluidStack output; + public static class BreweryRecipe implements IBreweryRecipe { + protected FluidStack input; + protected ItemStack specificYeast; + protected FluidStack output; - public BreweryRecipe(final FluidStack input, final FluidStack output) { + public BreweryRecipe(FluidStack input, FluidStack output) { this(input, null, output); } - public BreweryRecipe(final FluidStack input, final ItemStack specificYeast, final FluidStack output) { + public BreweryRecipe(FluidStack input, ItemStack specificYeast, FluidStack output) { this.input = input; this.specificYeast = specificYeast; this.output = output; } @Override - public FluidStack getOutput(final BreweryCrafting crafting) { - if (this.specificYeast != null && !this.specificYeast.isItemEqual(crafting.yeast)) { + public FluidStack getOutput(BreweryCrafting crafting) { + if (specificYeast != null && !specificYeast.isItemEqual(crafting.yeast)) { return null; } - if (this.input.isFluidEqual(crafting.currentInput)) { - return this.output; + if (input.isFluidEqual(crafting.currentInput)) { + return output; } return null; } @Override public FluidStack[] getInput() { - return new FluidStack[] { this.input }; + return new FluidStack[]{input}; } @Override @@ -451,92 +455,99 @@ public class Brewery @Override public ItemStack[] getYeasts() { - return new ItemStack[] { ExtraTreeItems.Yeast.get(1) }; + return new ItemStack[]{ExtraTreeItems.Yeast.get(1)}; } } - public static class BeerRecipe implements IBreweryRecipe - { + public static class BeerRecipe implements IBreweryRecipe { + protected static String barley = "seedBarley"; + protected static String wheat = "seedWheat"; + protected static String rye = "seedRye"; + protected static String corn = "seedCorn"; + protected static String roasted = "seedRoasted"; + Map grainCrops; List outputs; - static String barley; - static String wheat; - static String rye; - static String corn; - static String roasted; String[] grains; FluidStack water; ItemStack hops; public BeerRecipe() { - this.grainCrops = new HashMap(); - this.outputs = new ArrayList(); - this.grains = new String[] { BeerRecipe.barley, BeerRecipe.wheat, BeerRecipe.rye, BeerRecipe.corn, BeerRecipe.roasted }; - for (final String grainType : this.grains) { - for (final ItemStack stack : OreDictionary.getOres(grainType)) { - this.grainCrops.put(stack, grainType); + grainCrops = new HashMap<>(); + outputs = new ArrayList<>(); + grains = new String[]{BeerRecipe.barley, BeerRecipe.wheat, BeerRecipe.rye, BeerRecipe.corn, BeerRecipe.roasted}; + for (String grainType : grains) { + for (ItemStack stack : OreDictionary.getOres(grainType)) { + grainCrops.put(stack, grainType); } } - this.water = Binnie.Liquid.getLiquidStack("water", 5); - this.hops = OreDictionary.getOres("cropHops").get(0); - this.add(Alcohol.Ale); - this.add(Alcohol.Lager); - this.add(Alcohol.Stout); - this.add(Alcohol.CornBeer); - this.add(Alcohol.RyeBeer); - this.add(Alcohol.WheatBeer); - this.add(Alcohol.Barley); - this.add(Alcohol.Corn); - this.add(Alcohol.Rye); - this.add(Alcohol.Wheat); + + water = Binnie.Liquid.getLiquidStack("water", 5); + hops = OreDictionary.getOres("cropHops").get(0); + add(Alcohol.Ale); + add(Alcohol.Lager); + add(Alcohol.Stout); + add(Alcohol.CornBeer); + add(Alcohol.RyeBeer); + add(Alcohol.WheatBeer); + add(Alcohol.Barley); + add(Alcohol.Corn); + add(Alcohol.Rye); + add(Alcohol.Wheat); } - private void add(final IFluidType fluid) { - this.outputs.add(fluid.get(1)); + private void add(IFluidType fluid) { + outputs.add(fluid.get(1)); } @Override - public FluidStack getOutput(final BreweryCrafting crafting) { - if (!crafting.currentInput.isFluidEqual(this.water)) { + public FluidStack getOutput(BreweryCrafting crafting) { + if (!crafting.currentInput.isFluidEqual(water)) { return null; } + int roasted = 0; int barley = 0; int wheat = 0; int rye = 0; int corn = 0; - for (final ItemStack stack : crafting.inputs) { + + for (ItemStack stack : crafting.inputs) { if (stack == null) { return null; } + String name = ""; - for (final Map.Entry entry : this.grainCrops.entrySet()) { + for (Map.Entry entry : grainCrops.entrySet()) { if (entry.getKey().isItemEqual(stack)) { name = entry.getValue(); break; } } + if (name.isEmpty()) { return null; } + if (name.equals(BeerRecipe.roasted)) { - ++roasted; + roasted++; } if (name.equals(BeerRecipe.barley)) { - ++barley; + barley++; } if (name.equals(BeerRecipe.wheat)) { - ++wheat; + wheat++; } if (name.equals(BeerRecipe.rye)) { - ++rye; + rye++; } if (name.equals(BeerRecipe.corn)) { - ++corn; + corn++; } } - final boolean isBeer = crafting.ingr != null; - final boolean isLager = crafting.yeast.isItemEqual(ExtraTreeItems.LagerYeast.get(1)); + + boolean isBeer = crafting.ingr != null; + boolean isLager = crafting.yeast.isItemEqual(ExtraTreeItems.LagerYeast.get(1)); if (roasted >= 2 && isBeer) { return Alcohol.Stout.get(5); } @@ -554,50 +565,30 @@ public class Brewery @Override public FluidStack[] getInput() { - return new FluidStack[] { this.water }; + return new FluidStack[]{water}; } @Override public FluidStack[] getOutput() { - return this.outputs.toArray(new FluidStack[0]); + return outputs.toArray(new FluidStack[0]); } @Override public ItemStack[] getGrains() { - return this.grainCrops.keySet().toArray(new ItemStack[0]); + return grainCrops.keySet().toArray(new ItemStack[0]); } @Override public ItemStack[] getIngredient() { - return new ItemStack[] { this.hops }; + return new ItemStack[]{hops}; } @Override public ItemStack[] getYeasts() { - return new ItemStack[] { ExtraTreeItems.Yeast.get(1), ExtraTreeItems.LagerYeast.get(1) }; + return new ItemStack[]{ + ExtraTreeItems.Yeast.get(1), + ExtraTreeItems.LagerYeast.get(1) + }; } - - static { - BeerRecipe.barley = "seedBarley"; - BeerRecipe.wheat = "seedWheat"; - BeerRecipe.rye = "seedRye"; - BeerRecipe.corn = "seedCorn"; - BeerRecipe.roasted = "seedRoasted"; - } - } - - private interface IBreweryRecipe - { - FluidStack getOutput(final BreweryCrafting p0); - - FluidStack[] getInput(); - - FluidStack[] getOutput(); - - ItemStack[] getGrains(); - - ItemStack[] getIngredient(); - - ItemStack[] getYeasts(); } } diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index 983a5492..e1cc62e8 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -1,198 +1,184 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import java.util.Map; -import binnie.core.machines.power.ErrorState; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.item.ItemStack; -import binnie.extratrees.api.CarpentryManager; -import net.minecraft.nbt.NBTTagCompound; -import binnie.extratrees.carpentry.EnumDesign; -import binnie.extratrees.api.IDesign; -import binnie.core.machines.power.IErrorStateSource; -import binnie.core.machines.network.INetwork; -import binnie.core.machines.component.IComponentRecipe; -import binnie.core.machines.component.ComponentRecipe; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.machines.Machine; import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.component.ComponentRecipe; +import binnie.core.machines.component.IComponentRecipe; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.network.INetwork; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IErrorStateSource; +import binnie.extratrees.api.CarpentryManager; +import binnie.extratrees.api.IDesign; +import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.carpentry.EnumDesign; +import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -public abstract class Designer -{ - public static int beeswaxSlot; - public static int design1Slot; - public static int design2Slot; +import java.util.Map; - static { - Designer.beeswaxSlot = 0; - Designer.design1Slot = 1; - Designer.design2Slot = 2; - } +public abstract class Designer { + public static int beeswaxSlot = 0; + public static int design1Slot = 1; + public static int design2Slot = 2; - public static class PackageWoodworker extends PackageCarpenter - { + public static class PackageWoodworker extends PackageCarpenter { public PackageWoodworker() { super(DesignerType.Woodworker); } } - public static class PackagePanelworker extends PackageCarpenter - { + public static class PackagePanelworker extends PackageCarpenter { public PackagePanelworker() { super(DesignerType.Panelworker); } } - public static class PackageGlassworker extends PackageCarpenter - { + public static class PackageGlassworker extends PackageCarpenter { public PackageGlassworker() { super(DesignerType.GlassWorker); } } - public static class PackageTileworker extends PackageCarpenter - { + public static class PackageTileworker extends PackageCarpenter { public PackageTileworker() { super(DesignerType.Tileworker); } } - public abstract static class PackageCarpenter extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + public abstract static class PackageCarpenter extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { DesignerType type; - public PackageCarpenter(final DesignerType type) { + public PackageCarpenter(DesignerType type) { super(type.name, type.texture, false); this.type = type; } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Woodworker); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); inventory.addSlot(Designer.beeswaxSlot, "polish"); inventory.addSlot(Designer.design1Slot, "wood"); inventory.addSlot(Designer.design2Slot, "wood"); - inventory.getSlot(Designer.beeswaxSlot).setValidator(new Validators.SlotValidatorBeeswax(this.type)); - inventory.getSlot(Designer.design1Slot).setValidator(new Validators.SlotValidatorPlanks(this.type)); - inventory.getSlot(Designer.design2Slot).setValidator(new Validators.SlotValidatorPlanks(this.type)); - new ComponentWoodworkerRecipe(machine, this.type); + inventory.getSlot(Designer.beeswaxSlot).setValidator(new Validators.SlotValidatorBeeswax(type)); + inventory.getSlot(Designer.design1Slot).setValidator(new Validators.SlotValidatorPlanks(type)); + inventory.getSlot(Designer.design2Slot).setValidator(new Validators.SlotValidatorPlanks(type)); + new ComponentWoodworkerRecipe(machine, type); } } - public static class ComponentWoodworkerRecipe extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource - { + public static class ComponentWoodworkerRecipe extends ComponentRecipe implements + IComponentRecipe, + INetwork.GuiNBT, + IErrorStateSource { public DesignerType type; + private IDesign design; - public ComponentWoodworkerRecipe(final Machine machine, final DesignerType type) { + public ComponentWoodworkerRecipe(Machine machine, DesignerType type) { super(machine); - this.design = EnumDesign.Diamond; + design = EnumDesign.Diamond; this.type = type; } @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); - this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbttagcompound.getInteger("design"))); + setDesign(CarpentryManager.carpentryInterface.getDesign(nbttagcompound.getInteger("design"))); } @Override - public void writeToNBT(final NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - nbttagcompound.setInteger("design", CarpentryManager.carpentryInterface.getDesignIndex(this.design)); + nbttagcompound.setInteger("design", CarpentryManager.carpentryInterface.getDesignIndex(design)); } @Override public boolean isRecipe() { - return this.getProduct() != null; + return getProduct() != null; } @Override public ItemStack getProduct() { - final ItemStack plank1 = this.getUtil().getStack(Designer.design1Slot); - final ItemStack plank2 = this.getUtil().getStack(Designer.design2Slot); + ItemStack plank1 = getUtil().getStack(Designer.design1Slot); + ItemStack plank2 = getUtil().getStack(Designer.design2Slot); if (plank1 == null || plank2 == null) { return null; } - final IDesignMaterial type1 = this.type.getSystem().getMaterial(plank1); - final IDesignMaterial type2 = this.type.getSystem().getMaterial(plank2); - final IDesign design = this.getDesign(); - final ItemStack stack = this.type.getBlock(type1, type2, design); + + IDesignMaterial type1 = type.getSystem().getMaterial(plank1); + IDesignMaterial type2 = type.getSystem().getMaterial(plank2); + IDesign design = getDesign(); + ItemStack stack = type.getBlock(type1, type2, design); return stack; } @Override - public ItemStack doRecipe(final boolean takeItem) { - if (!this.isRecipe()) { + public ItemStack doRecipe(boolean takeItem) { + if (!isRecipe() || canWork() != null) { return null; } - if (this.canWork() != null) { - return null; - } - final ItemStack product = this.getProduct(); + + ItemStack product = getProduct(); if (takeItem) { - final ItemStack a = this.getUtil().decreaseStack(Designer.design1Slot, 1); + ItemStack a = getUtil().decreaseStack(Designer.design1Slot, 1); if (a == null) { - this.getUtil().decreaseStack(Designer.design2Slot, 1); + getUtil().decreaseStack(Designer.design2Slot, 1); + } else if (design != EnumDesign.Blank) { + getUtil().decreaseStack(Designer.design2Slot, 1); } - else if (this.design != EnumDesign.Blank) { - this.getUtil().decreaseStack(Designer.design2Slot, 1); - } - this.getUtil().decreaseStack(Designer.beeswaxSlot, 1); + getUtil().decreaseStack(Designer.beeswaxSlot, 1); } return product; } public IDesign getDesign() { - return this.design; + return design; } - @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { - if (name.equals("recipe")) { - final InventoryPlayer playerInv = player.inventory; - final ItemStack recipe = this.doRecipe(false); - if (recipe == null) { - return; - } - if (playerInv.getItemStack() == null) { - playerInv.setItemStack(this.doRecipe(true)); - } - else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { - final int fit = recipe.getMaxStackSize() - (recipe.stackSize + playerInv.getItemStack().stackSize); - if (fit >= 0) { - final ItemStack doRecipe; - final ItemStack rec = doRecipe = this.doRecipe(true); - doRecipe.stackSize += playerInv.getItemStack().stackSize; - playerInv.setItemStack(rec); - } - } - player.openContainer.detectAndSendChanges(); - if (player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).updateHeldItem(); - } - } - else if (name.equals("design")) { - this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d"))); - } - } - - private void setDesign(final IDesign design) { + private void setDesign(IDesign design) { this.design = design; } + @Override + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { + if (name.equals("recipe")) { + InventoryPlayer playerInv = player.inventory; + ItemStack recipe = doRecipe(false); + if (recipe == null) { + return; + } + + if (playerInv.getItemStack() == null) { + playerInv.setItemStack(doRecipe(true)); + } else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { + int fit = recipe.getMaxStackSize() - (recipe.stackSize + playerInv.getItemStack().stackSize); + if (fit >= 0) { + ItemStack doRecipe; + ItemStack rec = doRecipe = doRecipe(true); + doRecipe.stackSize += playerInv.getItemStack().stackSize; + playerInv.setItemStack(rec); + } + } + + player.openContainer.detectAndSendChanges(); + if (player instanceof EntityPlayerMP) { + ((EntityPlayerMP) player).updateHeldItem(); + } + } else if (name.equals("design")) { + setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d"))); + } + } + @Override public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(Designer.beeswaxSlot)) { + if (getUtil().isSlotEmpty(Designer.beeswaxSlot)) { return new ErrorState.NoItem("Requires Adhesive to Function", Designer.beeswaxSlot); } return null; @@ -204,14 +190,14 @@ public abstract class Designer } @Override - public void sendGuiNBT(final Map nbts) { - final NBTTagCompound tag = new NBTTagCompound(); - tag.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(this.getDesign())); + public void sendGuiNBT(Map nbts) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(getDesign())); nbts.put("design", tag); } public DesignerType getDesignerType() { - return this.type; + return type; } } } diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index e549bec8..6cc3dae6 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -1,24 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import binnie.extratrees.core.ExtraTreeTexture; import binnie.botany.Botany; +import binnie.botany.ceramic.CeramicDesignSystem; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.carpentry.BlockDesign; -import binnie.extratrees.carpentry.ModuleCarpentry; -import binnie.extratrees.carpentry.EnumDesign; -import net.minecraft.item.ItemStack; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; -import binnie.botany.ceramic.CeramicDesignSystem; -import binnie.extratrees.carpentry.DesignSystem; import binnie.extratrees.api.IDesignSystem; +import binnie.extratrees.carpentry.BlockDesign; +import binnie.extratrees.carpentry.DesignSystem; +import binnie.extratrees.carpentry.EnumDesign; +import binnie.extratrees.carpentry.ModuleCarpentry; +import binnie.extratrees.core.ExtraTreeTexture; +import net.minecraft.item.ItemStack; -public enum DesignerType -{ +public enum DesignerType { Woodworker("woodworker", ExtraTreeTexture.carpenterTexture), Panelworker("panelworker", ExtraTreeTexture.panelerTexture), GlassWorker("glassworker", ExtraTreeTexture.panelerTexture), @@ -27,74 +22,69 @@ public enum DesignerType public String name; public String texture; - private DesignerType(final String name, final String texture) { + DesignerType(String name, String texture) { this.name = name; this.texture = texture; } public IDesignSystem getSystem() { switch (this) { - case GlassWorker: { - return DesignSystem.Glass; - } - case Tileworker: { - return CeramicDesignSystem.instance; - } - default: { - return DesignSystem.Wood; - } + case GlassWorker: { + return DesignSystem.Glass; + } + case Tileworker: { + return CeramicDesignSystem.instance; + } + default: { + return DesignSystem.Wood; + } } } - public ItemStack getBlock(final IDesignMaterial type1, IDesignMaterial type2, final IDesign design) { + public ItemStack getBlock(IDesignMaterial type1, IDesignMaterial type2, IDesign design) { int stackSize = 2; if (design == EnumDesign.Blank) { type2 = type1; stackSize = 1; } - final ItemStack stack = ModuleCarpentry.getItemStack(this.getBlock(), type1, type2, design); + + ItemStack stack = ModuleCarpentry.getItemStack(getBlock(), type1, type2, design); stack.stackSize = stackSize; return stack; } private BlockDesign getBlock() { switch (this) { - case GlassWorker: { - return ExtraTrees.blockStained; - } - case Panelworker: { - return ExtraTrees.blockPanel; - } - case Tileworker: { - return Botany.ceramicTile; - } - default: { - return ExtraTrees.blockCarpentry; - } + case GlassWorker: + return ExtraTrees.blockStained; + + case Panelworker: + return ExtraTrees.blockPanel; + + case Tileworker: + return Botany.ceramicTile; } + return ExtraTrees.blockCarpentry; } - public ItemStack getDisplayStack(final IDesign design) { - return this.getBlock(this.getSystem().getDefaultMaterial(), this.getSystem().getDefaultMaterial2(), design); + public ItemStack getDisplayStack(IDesign design) { + return getBlock(getSystem().getDefaultMaterial(), getSystem().getDefaultMaterial2(), design); } public String getMaterialTooltip() { switch (this) { - case GlassWorker: { - return "Glass"; - } - case Panelworker: { - return "Wooden Plank"; - } - case Tileworker: { - return "Ceramic Block"; - } - case Woodworker: { - return "Wooden Plank"; - } - default: { - return ""; - } + case GlassWorker: + return "Glass"; + + case Panelworker: + return "Wooden Plank"; + + case Tileworker: + return "Ceramic Block"; + + case Woodworker: + return "Wooden Plank"; } + return ""; } } diff --git a/src/main/java/binnie/extratrees/machines/Distillery.java b/src/main/java/binnie/extratrees/machines/Distillery.java index c26a033e..31322309 100644 --- a/src/main/java/binnie/extratrees/machines/Distillery.java +++ b/src/main/java/binnie/extratrees/machines/Distillery.java @@ -1,9 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -15,7 +12,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import cpw.mods.fml.relauncher.Side; @@ -30,20 +26,26 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Distillery -{ - public static int tankInput; - public static int tankOutput; - static List> recipes; +public class Distillery { + public static int tankInput = 0; + public static int tankOutput = 1; - public static FluidStack getOutput(final FluidStack fluid, final int level) { + protected static List> recipes = new ArrayList<>(); + + static { + Distillery.recipes.add(new HashMap<>()); + Distillery.recipes.add(new HashMap<>()); + Distillery.recipes.add(new HashMap<>()); + } + + public static FluidStack getOutput(FluidStack fluid, int level) { if (fluid == null) { return null; } return Distillery.recipes.get(level).get(fluid.getFluid()); } - public static boolean isValidInputLiquid(final FluidStack fluid) { + public static boolean isValidInputLiquid(FluidStack fluid) { for (int i = 0; i < 3; ++i) { if (Distillery.recipes.get(i).containsKey(fluid.getFluid())) { return true; @@ -52,9 +54,9 @@ public class Distillery return false; } - public static boolean isValidOutputLiquid(final FluidStack fluid) { + public static boolean isValidOutputLiquid(FluidStack fluid) { for (int i = 0; i < 3; ++i) { - for (final Map.Entry entry : Distillery.recipes.get(i).entrySet()) { + for (Map.Entry entry : Distillery.recipes.get(i).entrySet()) { if (entry.getValue().isFluidEqual(fluid)) { return true; } @@ -63,29 +65,20 @@ public class Distillery return false; } - public static void addRecipe(final FluidStack input, final FluidStack output, final int level) { + public static void addRecipe(FluidStack input, FluidStack output, int level) { Distillery.recipes.get(level).put(input.getFluid(), output); } - static { - Distillery.tankInput = 0; - Distillery.tankOutput = 1; - (Distillery.recipes = new ArrayList>()).add(new HashMap()); - Distillery.recipes.add(new HashMap()); - Distillery.recipes.add(new HashMap()); - } - - public static class PackageDistillery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + public static class PackageDistillery extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public PackageDistillery() { super("distillery", ExtraTreeTexture.distilleryTexture, true); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Distillery); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Distillery.tankInput, "input", 5000); tanks.getTankSlot(Distillery.tankInput).setValidator(new TankValidatorDistilleryInput()); tanks.getTankSlot(Distillery.tankInput).setOutputSides(MachineSide.TopAndBottom); @@ -103,17 +96,20 @@ public class Distillery } } - public static class ComponentDistilleryLogic extends ComponentProcessSetCost implements IProcess, INetwork.SendGuiNBT, INetwork.RecieveGuiNBT - { + public static class ComponentDistilleryLogic extends ComponentProcessSetCost implements + IProcess, + INetwork.SendGuiNBT, + INetwork.RecieveGuiNBT { public FluidStack currentFluid; public int level; - int guiLevel; - public ComponentDistilleryLogic(final Machine machine) { + protected int guiLevel; + + public ComponentDistilleryLogic(Machine machine) { super(machine, 16000, 800); - this.currentFluid = null; - this.level = 0; - this.guiLevel = machine.getUniqueProgressBarID(); + currentFluid = null; + level = 0; + guiLevel = machine.getUniqueProgressBarID(); } @Override @@ -123,24 +119,24 @@ public class Distillery @Override public int getProcessLength() { - return 2000 + 800 * this.level; + return 2000 + 800 * level; } @Override - public void readFromNBT(final NBTTagCompound nbt) { + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - this.level = nbt.getByte("dlevel"); + level = nbt.getByte("dlevel"); } @Override - public void writeToNBT(final NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - nbt.setByte("dlevel", (byte) this.level); + nbt.setByte("dlevel", (byte) level); } @Override public ErrorState canWork() { - if (this.getUtil().isTankEmpty(Distillery.tankInput) && this.currentFluid == null) { + if (getUtil().isTankEmpty(Distillery.tankInput) && currentFluid == null) { return new ErrorState.InsufficientLiquid("No Input Liquid", Distillery.tankInput); } return super.canWork(); @@ -148,85 +144,85 @@ public class Distillery @Override public ErrorState canProgress() { - if (this.currentFluid == null) { + if (currentFluid == null) { return new ErrorState("Distillery Empty", "No liquid in Distillery"); } - if (!this.getUtil().isTankEmpty(Distillery.tankOutput) && this.getOutput() != null && !this.getOutput().isFluidEqual(this.getUtil().getFluid(Distillery.tankOutput))) { - return new ErrorState.Tank("No Room", "No room for liquid", new int[] { Distillery.tankOutput }); + if (!getUtil().isTankEmpty(Distillery.tankOutput) && getOutput() != null && !getOutput().isFluidEqual(getUtil().getFluid(Distillery.tankOutput))) { + return new ErrorState.Tank("No Room", "No room for liquid", new int[]{Distillery.tankOutput}); } - if (this.getUtil().getFluid(Distillery.tankOutput) != null && !this.getUtil().getFluid(Distillery.tankOutput).isFluidEqual(Distillery.getOutput(this.getUtil().getFluid(Distillery.tankInput), this.level))) { + if (getUtil().getFluid(Distillery.tankOutput) != null && !getUtil().getFluid(Distillery.tankOutput).isFluidEqual(Distillery.getOutput(getUtil().getFluid(Distillery.tankInput), level))) { return new ErrorState.TankSpace("Different fluid in tank", Distillery.tankOutput); } return super.canProgress(); } private FluidStack getOutput() { - return Distillery.getOutput(this.getUtil().getFluid(Distillery.tankInput), this.level); + return Distillery.getOutput(getUtil().getFluid(Distillery.tankInput), level); } @Override protected void onFinishTask() { - final FluidStack output = Distillery.getOutput(this.currentFluid, this.level).copy(); + FluidStack output = Distillery.getOutput(currentFluid, level).copy(); output.amount = 1000; - this.getUtil().fillTank(Distillery.tankOutput, output); + getUtil().fillTank(Distillery.tankOutput, output); } @Override protected void onTickTask() { + // ignored } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("still-level")) { - this.level = nbt.getByte("i"); + level = nbt.getByte("i"); } + if (name.equals("still-recipe")) { if (nbt.getBoolean("null")) { - this.currentFluid = null; - } - else { - this.currentFluid = FluidStack.loadFluidStackFromNBT(nbt); + currentFluid = null; + } else { + currentFluid = FluidStack.loadFluidStackFromNBT(nbt); } } } @Override - public void sendGuiNBT(final Map nbts) { - final NBTTagCompound nbt = new NBTTagCompound(); - if (this.currentFluid == null) { + public void sendGuiNBT(Map nbts) { + NBTTagCompound nbt = new NBTTagCompound(); + if (currentFluid == null) { nbt.setBoolean("null", true); + } else { + currentFluid.writeToNBT(nbt); } - else { - this.currentFluid.writeToNBT(nbt); - } + nbts.put("still-recipe", nbt); - final NBTTagCompound nbt2 = new NBTTagCompound(); - nbt.setByte("i", (byte) this.level); + nbt.setByte("i", (byte) level); nbts.put("still-level", nbt); } @Override public void onUpdate() { super.onUpdate(); - if (this.canWork() == null && this.currentFluid == null && this.getUtil().getTank(Distillery.tankInput).getFluidAmount() >= 1000) { - final FluidStack stack = this.getUtil().drainTank(Distillery.tankInput, 1000); - this.currentFluid = stack; + if (canWork() == null && currentFluid == null && getUtil().getTank(Distillery.tankInput).getFluidAmount() >= 1000) { + FluidStack stack = getUtil().drainTank(Distillery.tankInput, 1000); + currentFluid = stack; } } @Override public String getTooltip() { - if (this.currentFluid == null) { + if (currentFluid == null) { return "Empty"; } - return "Creating " + Distillery.getOutput(this.currentFluid, this.level).getFluid().getLocalizedName(); + // TODO remove deprecated + return "Creating " + Distillery.getOutput(currentFluid, level).getFluid().getLocalizedName(); } } - public static class TankValidatorDistilleryInput extends TankValidator - { + public static class TankValidatorDistilleryInput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Distillery.isValidInputLiquid(liquid); } @@ -236,10 +232,9 @@ public class Distillery } } - public static class TankValidatorDistilleryOutput extends TankValidator - { + public static class TankValidatorDistilleryOutput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Distillery.isValidOutputLiquid(liquid); } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index ce0280cf..3734f286 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,29 +1,24 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import net.minecraft.client.renderer.RenderBlocks; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.resource.ResourceType; import binnie.Binnie; -import binnie.core.resource.BinnieResource; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.machines.component.IInteraction; -import binnie.core.machines.MachineComponent; -import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; import binnie.core.BinnieCore; -import binnie.core.machines.MachinePackage; import binnie.core.machines.IMachineType; +import binnie.core.machines.Machine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.MachinePackage; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.component.IInteraction; +import binnie.core.resource.BinnieResource; +import binnie.core.resource.ResourceType; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.core.ExtraTreesGUID; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public enum ExtraTreeMachine implements IMachineType -{ +public enum ExtraTreeMachine implements IMachineType { Lumbermill(Lumbermill.PackageLumbermill.class), Woodworker(Designer.PackageWoodworker.class), Panelworker(Designer.PackagePanelworker.class), @@ -34,15 +29,15 @@ public enum ExtraTreeMachine implements IMachineType Glassworker(Designer.PackageGlassworker.class), Tileworker(Designer.PackageTileworker.class); - Class clss; + protected Class cls; - private ExtraTreeMachine(final Class clss) { - this.clss = clss; + ExtraTreeMachine(Class cls) { + this.cls = cls; } @Override public Class getPackageClass() { - return this.clss; + return cls; } @Override @@ -53,35 +48,33 @@ public enum ExtraTreeMachine implements IMachineType return this != ExtraTreeMachine.Nursery; } - public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.blockMachine, i, this.ordinal()); + public ItemStack get(int i) { + return new ItemStack(ExtraTrees.blockMachine, i, ordinal()); } - public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick - { - ExtraTreesGUID id; + public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { + protected ExtraTreesGUID id; - public ComponentExtraTreeGUI(final Machine machine, final ExtraTreesGUID id) { + public ComponentExtraTreeGUI(Machine machine, ExtraTreesGUID id) { super(machine); this.id = id; } @Override - public void onRightClick(final World world, final EntityPlayer player, final int x, final int y, final int z) { - ExtraTrees.proxy.openGui(this.id, player, x, y, z); + public void onRightClick(World world, EntityPlayer player, int x, int y, int z) { + ExtraTrees.proxy.openGui(id, player, x, y, z); } } - public abstract static class PackageExtraTreeMachine extends MachinePackage - { - BinnieResource textureName; + public abstract static class PackageExtraTreeMachine extends MachinePackage { + protected BinnieResource textureName; - protected PackageExtraTreeMachine(final String uid, final String textureName, final boolean powered) { + protected PackageExtraTreeMachine(String uid, String textureName, boolean powered) { super(uid, powered); this.textureName = Binnie.Resource.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); } - protected PackageExtraTreeMachine(final String uid, final BinnieResource textureName, final boolean powered) { + protected PackageExtraTreeMachine(String uid, BinnieResource textureName, boolean powered) { super(uid, powered); this.textureName = textureName; } @@ -92,8 +85,8 @@ public enum ExtraTreeMachine implements IMachineType } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { - MachineRendererForestry.renderMachine(this.textureName.getShortPath(), x, y, z, partialTick); + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z, partialTick); } } } diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index 809bdf38..a3a35189 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -1,48 +1,44 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.inventory.MachineSide; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.machines.Machine; import binnie.extratrees.core.ExtraTreeTexture; -import binnie.core.craftgui.minecraft.IMachineInformation; -import java.util.HashMap; +import binnie.extratrees.core.ExtraTreesGUID; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import java.util.HashMap; import java.util.Map; -public class Infuser -{ - public static int tankInput; - public static int tankOutput; - static Map recipes; +public class Infuser { + public static int tankInput = 0; + public static int tankOutput = 1; + static Map recipes = new HashMap<>(); - public static FluidStack getOutput(final FluidStack fluid, final ItemStack stack) { + public static FluidStack getOutput(FluidStack fluid, ItemStack stack) { if (fluid == null) { return null; } return Infuser.recipes.get(fluid.getFluid()); } - public static boolean isValidInputLiquid(final FluidStack fluid) { + public static boolean isValidInputLiquid(FluidStack fluid) { return Infuser.recipes.containsKey(fluid.getFluid()); } - public static boolean isValidOutputLiquid(final FluidStack fluid) { - for (final Map.Entry entry : Infuser.recipes.entrySet()) { + public static boolean isValidOutputLiquid(FluidStack fluid) { + for (Map.Entry entry : Infuser.recipes.entrySet()) { if (entry.getValue().isFluidEqual(fluid)) { return true; } @@ -50,27 +46,21 @@ public class Infuser return false; } - public static void addRecipe(final FluidStack input, final FluidStack output) { + public static void addRecipe(FluidStack input, FluidStack output) { Infuser.recipes.put(input.getFluid(), output); } - static { - Infuser.tankInput = 0; - Infuser.tankOutput = 1; - Infuser.recipes = new HashMap(); - } - - public static class PackageInfuser extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + // TODO unused class? + public static class PackageInfuser extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public PackageInfuser() { super("infuser", ExtraTreeTexture.infuserTexture, true); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Infuser); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Infuser.tankInput, "input", 5000); tanks.getTankSlot(Infuser.tankInput).setValidator(new TankValidatorInfuserInput()); tanks.getTankSlot(Infuser.tankInput).setOutputSides(MachineSide.TopAndBottom); @@ -88,17 +78,16 @@ public class Infuser } } - public static class ComponentInfuserLogic extends ComponentProcessSetCost implements IProcess - { - ItemStack infusing; + public static class ComponentInfuserLogic extends ComponentProcessSetCost implements IProcess { + protected ItemStack infusing; - public ComponentInfuserLogic(final Machine machine) { + public ComponentInfuserLogic(Machine machine) { super(machine, 16000, 800); } @Override public int getProcessEnergy() { - return this.getProcessLength() * 2; + return getProcessLength() * 2; } @Override @@ -108,7 +97,7 @@ public class Infuser @Override public ErrorState canWork() { - if (this.getUtil().isTankEmpty(Infuser.tankInput)) { + if (getUtil().isTankEmpty(Infuser.tankInput)) { return new ErrorState.InsufficientLiquid("No Input Liquid", Infuser.tankInput); } return super.canWork(); @@ -116,27 +105,28 @@ public class Infuser @Override public ErrorState canProgress() { - if (!this.getUtil().isTankEmpty(Infuser.tankOutput) && this.getOutput() != null && !this.getOutput().isFluidEqual(this.getUtil().getFluid(Infuser.tankOutput))) { - return new ErrorState.Tank("No Room", "No room for liquid", new int[] { Infuser.tankOutput }); + if (!getUtil().isTankEmpty(Infuser.tankOutput) && getOutput() != null && !getOutput().isFluidEqual(getUtil().getFluid(Infuser.tankOutput))) { + return new ErrorState.Tank("No Room", "No room for liquid", new int[]{Infuser.tankOutput}); } - if (this.getUtil().getFluid(Infuser.tankOutput) != null && !this.getUtil().getFluid(Infuser.tankOutput).isFluidEqual(this.getOutput())) { + if (getUtil().getFluid(Infuser.tankOutput) != null && !getUtil().getFluid(Infuser.tankOutput).isFluidEqual(getOutput())) { return new ErrorState.TankSpace("Different fluid in tank", Infuser.tankOutput); } return super.canProgress(); } private FluidStack getOutput() { - return Infuser.getOutput(this.getUtil().getFluid(Infuser.tankInput), this.infusing); + return Infuser.getOutput(getUtil().getFluid(Infuser.tankInput), infusing); } @Override protected void onFinishTask() { - final FluidStack output = this.getOutput().copy(); - this.getUtil().fillTank(Infuser.tankOutput, output); + FluidStack output = getOutput().copy(); + getUtil().fillTank(Infuser.tankOutput, output); } @Override protected void onTickTask() { + // ignored } @Override @@ -145,10 +135,9 @@ public class Infuser } } - public static class TankValidatorInfuserInput extends TankValidator - { + public static class TankValidatorInfuserInput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Infuser.isValidInputLiquid(liquid); } @@ -158,10 +147,9 @@ public class Infuser } } - public static class TankValidatorInfuserOutput extends TankValidator - { + public static class TankValidatorInfuserOutput extends TankValidator { @Override - public boolean isValid(final FluidStack liquid) { + public boolean isValid(FluidStack liquid) { return Infuser.isValidOutputLiquid(liquid); } diff --git a/src/main/java/binnie/extratrees/machines/Lumbermill.java b/src/main/java/binnie/extratrees/machines/Lumbermill.java index 55aaa528..3c24b0d1 100644 --- a/src/main/java/binnie/extratrees/machines/Lumbermill.java +++ b/src/main/java/binnie/extratrees/machines/Lumbermill.java @@ -1,55 +1,52 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import net.minecraftforge.oredict.OreDictionary; -import binnie.core.machines.inventory.SlotValidator; -import binnie.extratrees.item.ExtraTreeItems; -import binnie.extratrees.ExtraTrees; +import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.item.ItemMisc; +import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.inventory.TankValidator; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreeTexture; -import binnie.core.craftgui.minecraft.IMachineInformation; -import java.util.HashMap; -import java.util.List; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraft.item.crafting.CraftingManager; -import java.util.ArrayList; -import java.util.Collection; +import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; +import binnie.extratrees.core.ExtraTreeTexture; +import binnie.extratrees.core.ExtraTreesGUID; +import binnie.extratrees.item.ExtraTreeItems; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; import java.util.Map; -public class Lumbermill -{ - public static int slotWood; - public static int slotPlanks; - public static int slotBark; - public static int slotSawdust; - public static int tankWater; - static Map recipes; +public class Lumbermill { + public static int slotWood = 0; + public static int slotPlanks = 1; + public static int slotBark = 2; + public static int slotSawdust = 3; + public static int tankWater = 0; + static Map recipes = new HashMap<>(); - public static ItemStack getPlankProduct(final ItemStack item) { + public static ItemStack getPlankProduct(ItemStack item) { ItemStack stack = null; if (Lumbermill.recipes.isEmpty()) { calculateLumbermillProducts(); } - for (final Map.Entry entry : Lumbermill.recipes.entrySet()) { + + for (Map.Entry entry : Lumbermill.recipes.entrySet()) { if (entry.getKey().isItemEqual(item)) { stack = entry.getValue().copy(); break; @@ -60,48 +57,47 @@ public class Lumbermill } private static void calculateLumbermillProducts() { - for (final IPlankType type : WoodManager.getAllPlankTypes()) { - for (final ItemStack wood : getRecipeResult(type.getStack())) { + for (IPlankType type : WoodManager.getAllPlankTypes()) { + for (ItemStack wood : getRecipeResult(type.getStack())) { Lumbermill.recipes.put(wood, type.getStack()); } } } - private static Collection getRecipeResult(final ItemStack output) { - final List list = new ArrayList(); - for (final Object recipeO : CraftingManager.getInstance().getRecipeList()) { + private static Collection getRecipeResult(ItemStack output) { + List list = new ArrayList(); + for (Object recipeO : CraftingManager.getInstance().getRecipeList()) { if (recipeO instanceof ShapelessRecipes) { - final ShapelessRecipes recipe = (ShapelessRecipes) recipeO; - if (recipe.recipeItems.size() != 1) { + ShapelessRecipes recipe = (ShapelessRecipes) recipeO; + if (recipe.recipeItems.size() != 1 || !(recipe.recipeItems.get(0) instanceof ItemStack)) { continue; } - if (!(recipe.recipeItems.get(0) instanceof ItemStack)) { - continue; - } - final ItemStack input = (ItemStack) recipe.recipeItems.get(0); + + ItemStack input = (ItemStack) recipe.recipeItems.get(0); if (recipe.getRecipeOutput() != null && recipe.getRecipeOutput().isItemEqual(output)) { list.add(input); } } + if (recipeO instanceof ShapedRecipes) { - final ShapedRecipes recipe2 = (ShapedRecipes) recipeO; + ShapedRecipes recipe2 = (ShapedRecipes) recipeO; if (recipe2.recipeItems.length != 1) { continue; } - final ItemStack input = recipe2.recipeItems[0]; + + ItemStack input = recipe2.recipeItems[0]; if (recipe2.getRecipeOutput() != null && recipe2.getRecipeOutput().isItemEqual(output)) { list.add(input); } } + if (recipeO instanceof ShapelessOreRecipe) { - final ShapelessOreRecipe recipe3 = (ShapelessOreRecipe) recipeO; - if (recipe3.getInput().size() != 1) { + ShapelessOreRecipe recipe3 = (ShapelessOreRecipe) recipeO; + if (recipe3.getInput().size() != 1 || !(recipe3.getInput().get(0) instanceof ItemStack)) { continue; } - if (!(recipe3.getInput().get(0) instanceof ItemStack)) { - continue; - } - final ItemStack input = (ItemStack) recipe3.getInput().get(0); + + ItemStack input = (ItemStack) recipe3.getInput().get(0); if (recipe3.getRecipeOutput() == null || !recipe3.getRecipeOutput().isItemEqual(output)) { continue; } @@ -111,25 +107,15 @@ public class Lumbermill return list; } - static { - Lumbermill.slotWood = 0; - Lumbermill.slotPlanks = 1; - Lumbermill.slotBark = 2; - Lumbermill.slotSawdust = 3; - Lumbermill.tankWater = 0; - Lumbermill.recipes = new HashMap(); - } - - public static class PackageLumbermill extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + public static class PackageLumbermill extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public PackageLumbermill() { super("lumbermill", ExtraTreeTexture.lumbermillTexture, true); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Lumbermill); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); inventory.addSlot(Lumbermill.slotWood, "input"); inventory.getSlot(Lumbermill.slotWood).setValidator(new SlotValidatorLog()); inventory.getSlot(Lumbermill.slotWood).forbidExtraction(); @@ -139,7 +125,7 @@ public class Lumbermill inventory.getSlot(Lumbermill.slotPlanks).setReadOnly(); inventory.getSlot(Lumbermill.slotBark).setReadOnly(); inventory.getSlot(Lumbermill.slotSawdust).setReadOnly(); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); + ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Lumbermill.tankWater, "input", 10000); tanks.getTankSlot(Lumbermill.tankWater).setValidator(new TankValidator.Basic("water")); new ComponentPowerReceptor(machine); @@ -152,22 +138,22 @@ public class Lumbermill } } - public static class ComponentLumbermillLogic extends ComponentProcessSetCost implements IProcess - { - public ComponentLumbermillLogic(final Machine machine) { + public static class ComponentLumbermillLogic extends ComponentProcessSetCost implements IProcess { + public ComponentLumbermillLogic(Machine machine) { super(machine, 900, 30); } @Override public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(Lumbermill.slotWood)) { + if (getUtil().isSlotEmpty(Lumbermill.slotWood)) { return new ErrorState.NoItem("No Wood", Lumbermill.slotWood); } - final ItemStack result = Lumbermill.getPlankProduct(this.getUtil().getStack(Lumbermill.slotWood)); - if (!this.getUtil().isSlotEmpty(Lumbermill.slotPlanks) && result != null) { - final ItemStack currentPlank = this.getUtil().getStack(Lumbermill.slotPlanks); + + ItemStack result = Lumbermill.getPlankProduct(getUtil().getStack(Lumbermill.slotWood)); + if (!getUtil().isSlotEmpty(Lumbermill.slotPlanks) && result != null) { + ItemStack currentPlank = getUtil().getStack(Lumbermill.slotPlanks); if (!result.isItemEqual(currentPlank) || result.stackSize + currentPlank.stackSize > currentPlank.getMaxStackSize()) { - return new ErrorState.NoSpace("No room for new planks", new int[] { Lumbermill.slotPlanks }); + return new ErrorState.NoSpace("No room for new planks", new int[]{Lumbermill.slotPlanks}); } } return super.canWork(); @@ -175,7 +161,7 @@ public class Lumbermill @Override public ErrorState canProgress() { - if (!this.getUtil().liquidInTank(Lumbermill.tankWater, 5)) { + if (!getUtil().liquidInTank(Lumbermill.tankWater, 5)) { return new ErrorState.InsufficientLiquid("Not Enough Water", Lumbermill.tankWater); } return super.canProgress(); @@ -183,31 +169,31 @@ public class Lumbermill @Override protected void onFinishTask() { - final ItemStack result = Lumbermill.getPlankProduct(this.getUtil().getStack(Lumbermill.slotWood)); + ItemStack result = Lumbermill.getPlankProduct(getUtil().getStack(Lumbermill.slotWood)); if (result == null) { return; } - this.getUtil().addStack(Lumbermill.slotPlanks, result); - this.getUtil().addStack(Lumbermill.slotSawdust, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Sawdust, 1)); - this.getUtil().addStack(Lumbermill.slotBark, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Bark, 1)); - this.getUtil().decreaseStack(Lumbermill.slotWood, 1); + + getUtil().addStack(Lumbermill.slotPlanks, result); + getUtil().addStack(Lumbermill.slotSawdust, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Sawdust, 1)); + getUtil().addStack(Lumbermill.slotBark, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Bark, 1)); + getUtil().decreaseStack(Lumbermill.slotWood, 1); } @Override protected void onTickTask() { - this.getUtil().drainTank(Lumbermill.tankWater, 10); + getUtil().drainTank(Lumbermill.tankWater, 10); } } - public static class SlotValidatorLog extends SlotValidator - { + public static class SlotValidatorLog extends SlotValidator { public SlotValidatorLog() { super(SlotValidator.IconBlock); } @Override - public boolean isValid(final ItemStack itemStack) { - final String name = OreDictionary.getOreName(OreDictionary.getOreID(itemStack)); + public boolean isValid(ItemStack itemStack) { + String name = OreDictionary.getOreName(OreDictionary.getOreID(itemStack)); return name.contains("logWood") && Lumbermill.getPlankProduct(itemStack) != null; } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 36ae44b2..1019fcc3 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -1,28 +1,21 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import java.util.HashMap; - +import forestry.core.render.TankRenderInfo; import net.minecraftforge.common.util.ForgeDirection; import java.lang.reflect.Method; +import java.util.HashMap; import java.util.Map; -import forestry.core.render.TankRenderInfo; - -public class MachineRendererForestry -{ - static Map instances; +public class MachineRendererForestry { + static Map instances = new HashMap<>(); static Method renderMethod; - private static void loadMethod(final String file, final boolean waterTank, final boolean productTank) { + private static void loadMethod(String file, boolean waterTank, boolean productTank) { try { - final Class clss = Class.forName("forestry.core.render.RenderMachine"); - final Object instance = clss.getConstructor(String.class).newInstance(file); - MachineRendererForestry.renderMethod = clss.getDeclaredMethod("render", TankRenderInfo.class, TankRenderInfo.class, ForgeDirection.class, Double.TYPE, Double.TYPE, Double.TYPE); + Class cls = Class.forName("forestry.core.render.RenderMachine"); + Object instance = cls.getConstructor(String.class).newInstance(file); + MachineRendererForestry.renderMethod = cls.getDeclaredMethod("render", TankRenderInfo.class, TankRenderInfo.class, ForgeDirection.class, Double.TYPE, Double.TYPE, Double.TYPE); MachineRendererForestry.renderMethod.setAccessible(true); MachineRendererForestry.instances.put(file, instance); } catch (Exception ex) { @@ -30,18 +23,15 @@ public class MachineRendererForestry } } - public static void renderMachine(final String name, final double x, final double y, final double z, final float var8) { + public static void renderMachine(String name, double x, double y, double z, float var8) { if (!MachineRendererForestry.instances.containsKey(name)) { loadMethod(name, false, false); } + try { MachineRendererForestry.renderMethod.invoke(MachineRendererForestry.instances.get(name), TankRenderInfo.EMPTY, TankRenderInfo.EMPTY, ForgeDirection.UP, x, y, z); } catch (Exception ex) { // ex.printStackTrace(); } } - - static { - MachineRendererForestry.instances = new HashMap(); - } } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index 63e11388..e690cb79 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -1,38 +1,31 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.BinnieCore; +import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; -import binnie.core.BinnieCore; -import org.lwjgl.opengl.GL11; import net.minecraftforge.client.model.IModelCustom; -import binnie.core.resource.BinnieResource; +import org.lwjgl.opengl.GL11; + +public class MachineRendererNursery { + public static MachineRendererNursery instance = new MachineRendererNursery(); + + protected BinnieResource texture; -public class MachineRendererNursery -{ - public static MachineRendererNursery instance; - BinnieResource texture; private IModelCustom casinoMachine; private ModelNursery model; public MachineRendererNursery() { - this.model = new ModelNursery(); + model = new ModelNursery(); } - public void renderMachine(final BinnieResource texture, final double x, final double y, final double z, final float var8) { + public void renderMachine(BinnieResource texture, double x, double y, double z, float var8) { this.texture = texture; GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y, z + 0.5); GL11.glScaled(0.05, 0.05, 0.05); BinnieCore.proxy.bindTexture(new BinnieResource(ExtraTrees.instance, ResourceType.Tile, "test.png")); - this.casinoMachine.renderAll(); + casinoMachine.renderAll(); GL11.glPopMatrix(); } - - static { - MachineRendererNursery.instance = new MachineRendererNursery(); - } } diff --git a/src/main/java/binnie/extratrees/machines/ModelNursery.java b/src/main/java/binnie/extratrees/machines/ModelNursery.java index 62839333..4c801fa1 100644 --- a/src/main/java/binnie/extratrees/machines/ModelNursery.java +++ b/src/main/java/binnie/extratrees/machines/ModelNursery.java @@ -1,119 +1,140 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import net.minecraft.entity.Entity; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; -public class ModelNursery extends ModelBase -{ - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - ModelRenderer Shape9; - ModelRenderer Shape10; - ModelRenderer Shape11; - ModelRenderer Shape12; - ModelRenderer Shape13; +public class ModelNursery extends ModelBase { + private ModelRenderer shape1; + private ModelRenderer shape2; + private ModelRenderer shape3; + private ModelRenderer shape4; + private ModelRenderer shape5; + private ModelRenderer shape6; + private ModelRenderer shape7; + private ModelRenderer shape8; + private ModelRenderer shape9; + private ModelRenderer shape10; + private ModelRenderer shape11; + private ModelRenderer shape12; + private ModelRenderer shape13; public ModelNursery() { - this.textureWidth = 64; - this.textureHeight = 64; - (this.Shape1 = new ModelRenderer(this, 0, 0)).addBox(-5.0f, -5.0f, -5.0f, 10, 10, 10); - this.Shape1.setRotationPoint(0.0f, 16.0f, 0.0f); - this.Shape1.setTextureSize(64, 64); - this.Shape1.mirror = true; - this.setRotation(this.Shape1, 0.0f, 0.0f, 0.0f); - (this.Shape2 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape2.setRotationPoint(-5.0f, 16.0f, -5.0f); - this.Shape2.setTextureSize(64, 64); - this.Shape2.mirror = true; - this.setRotation(this.Shape2, 0.0f, 0.0f, 0.0f); - (this.Shape3 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape3.setRotationPoint(-5.0f, 16.0f, 5.0f); - this.Shape3.setTextureSize(64, 64); - this.Shape3.mirror = true; - this.setRotation(this.Shape3, 0.0f, 0.0f, 0.0f); - (this.Shape4 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape4.setRotationPoint(5.0f, 16.0f, -5.0f); - this.Shape4.setTextureSize(64, 64); - this.Shape4.mirror = true; - this.setRotation(this.Shape4, 0.0f, 0.0f, 0.0f); - (this.Shape5 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape5.setRotationPoint(5.0f, 16.0f, 5.0f); - this.Shape5.setTextureSize(64, 64); - this.Shape5.mirror = true; - this.setRotation(this.Shape5, 0.0f, 0.0f, 0.0f); - (this.Shape6 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape6.setRotationPoint(5.0f, 21.0f, 0.0f); - this.Shape6.setTextureSize(64, 64); - this.Shape6.mirror = true; - this.setRotation(this.Shape6, 1.570796f, 0.0f, 0.0f); - (this.Shape7 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape7.setRotationPoint(5.0f, 11.0f, 0.0f); - this.Shape7.setTextureSize(64, 64); - this.Shape7.mirror = true; - this.setRotation(this.Shape7, 1.570796f, 0.0f, 0.0f); - (this.Shape8 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape8.setRotationPoint(-5.0f, 21.0f, 0.0f); - this.Shape8.setTextureSize(64, 64); - this.Shape8.mirror = true; - this.setRotation(this.Shape8, 1.570796f, 0.0f, 0.0f); - (this.Shape9 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape9.setRotationPoint(-5.0f, 11.0f, 0.0f); - this.Shape9.setTextureSize(64, 64); - this.Shape9.mirror = true; - this.setRotation(this.Shape9, 1.570796f, 0.0f, 0.0f); - (this.Shape10 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape10.setRotationPoint(0.0f, 11.0f, 5.0f); - this.Shape10.setTextureSize(64, 64); - this.Shape10.mirror = true; - this.setRotation(this.Shape10, 0.0f, 0.0f, 1.570796f); - (this.Shape11 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape11.setRotationPoint(0.0f, 21.0f, -5.0f); - this.Shape11.setTextureSize(64, 64); - this.Shape11.mirror = true; - this.setRotation(this.Shape11, 0.0f, 0.0f, 1.570796f); - (this.Shape12 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape12.setRotationPoint(0.0f, 21.0f, 5.0f); - this.Shape12.setTextureSize(64, 64); - this.Shape12.mirror = true; - this.setRotation(this.Shape12, 0.0f, 0.0f, 1.570796f); - (this.Shape13 = new ModelRenderer(this, 0, 20)).addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); - this.Shape13.setRotationPoint(0.0f, 11.0f, -5.0f); - this.Shape13.setTextureSize(64, 64); - this.Shape13.mirror = true; - this.setRotation(this.Shape13, 0.0f, 0.0f, 1.570796f); + textureWidth = 64; + textureHeight = 64; + + shape1 = new ModelRenderer(this, 0, 0); + shape1.addBox(-5.0f, -5.0f, -5.0f, 10, 10, 10); + shape1.setRotationPoint(0.0f, 16.0f, 0.0f); + shape1.setTextureSize(64, 64); + shape1.mirror = true; + setRotation(shape1, 0.0f, 0.0f, 0.0f); + + shape2 = new ModelRenderer(this, 0, 20); + shape2.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape2.setRotationPoint(-5.0f, 16.0f, -5.0f); + shape2.setTextureSize(64, 64); + shape2.mirror = true; + setRotation(shape2, 0.0f, 0.0f, 0.0f); + + shape3 = new ModelRenderer(this, 0, 20); + shape3.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape3.setRotationPoint(-5.0f, 16.0f, 5.0f); + shape3.setTextureSize(64, 64); + shape3.mirror = true; + setRotation(shape3, 0.0f, 0.0f, 0.0f); + + shape4 = new ModelRenderer(this, 0, 20); + shape4.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape4.setRotationPoint(5.0f, 16.0f, -5.0f); + shape4.setTextureSize(64, 64); + shape4.mirror = true; + setRotation(shape4, 0.0f, 0.0f, 0.0f); + + shape5 = new ModelRenderer(this, 0, 20); + shape5.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape5.setRotationPoint(5.0f, 16.0f, 5.0f); + shape5.setTextureSize(64, 64); + shape5.mirror = true; + setRotation(shape5, 0.0f, 0.0f, 0.0f); + + shape6 = new ModelRenderer(this, 0, 20); + shape6.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape6.setRotationPoint(5.0f, 21.0f, 0.0f); + shape6.setTextureSize(64, 64); + shape6.mirror = true; + setRotation(shape6, 1.570796f, 0.0f, 0.0f); + + shape7 = new ModelRenderer(this, 0, 20); + shape7.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape7.setRotationPoint(5.0f, 11.0f, 0.0f); + shape7.setTextureSize(64, 64); + shape7.mirror = true; + setRotation(shape7, 1.570796f, 0.0f, 0.0f); + + shape8 = new ModelRenderer(this, 0, 20); + shape8.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape8.setRotationPoint(-5.0f, 21.0f, 0.0f); + shape8.setTextureSize(64, 64); + shape8.mirror = true; + setRotation(shape8, 1.570796f, 0.0f, 0.0f); + + shape9 = new ModelRenderer(this, 0, 20); + shape9.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape9.setRotationPoint(-5.0f, 11.0f, 0.0f); + shape9.setTextureSize(64, 64); + shape9.mirror = true; + setRotation(shape9, 1.570796f, 0.0f, 0.0f); + + shape10 = new ModelRenderer(this, 0, 20); + shape10.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape10.setRotationPoint(0.0f, 11.0f, 5.0f); + shape10.setTextureSize(64, 64); + shape10.mirror = true; + setRotation(shape10, 0.0f, 0.0f, 1.570796f); + + shape11 = new ModelRenderer(this, 0, 20); + shape11.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape11.setRotationPoint(0.0f, 21.0f, -5.0f); + shape11.setTextureSize(64, 64); + shape11.mirror = true; + setRotation(shape11, 0.0f, 0.0f, 1.570796f); + + shape12 = new ModelRenderer(this, 0, 20); + shape12.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape12.setRotationPoint(0.0f, 21.0f, 5.0f); + shape12.setTextureSize(64, 64); + shape12.mirror = true; + setRotation(shape12, 0.0f, 0.0f, 1.570796f); + + shape13 = new ModelRenderer(this, 0, 20); + shape13.addBox(-1.0f, -8.0f, -1.0f, 2, 16, 2); + shape13.setRotationPoint(0.0f, 11.0f, -5.0f); + shape13.setTextureSize(64, 64); + shape13.mirror = true; + setRotation(shape13, 0.0f, 0.0f, 1.570796f); } @Override - public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.Shape1.render(f5); - this.Shape2.render(f5); - this.Shape3.render(f5); - this.Shape4.render(f5); - this.Shape5.render(f5); - this.Shape6.render(f5); - this.Shape7.render(f5); - this.Shape8.render(f5); - this.Shape9.render(f5); - this.Shape10.render(f5); - this.Shape11.render(f5); - this.Shape12.render(f5); - this.Shape13.render(f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + shape1.render(f5); + shape2.render(f5); + shape3.render(f5); + shape4.render(f5); + shape5.render(f5); + shape6.render(f5); + shape7.render(f5); + shape8.render(f5); + shape9.render(f5); + shape10.render(f5); + shape11.render(f5); + shape12.render(f5); + shape13.render(f5); } - private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; model.rotateAngleZ = z; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 14071248..5b600461 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -1,29 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import net.minecraft.block.Block; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; -import binnie.core.Mods; -import net.minecraft.init.Items; -import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.init.Blocks; import binnie.core.BinnieCore; -import forestry.api.core.Tabs; +import binnie.core.IInitializable; +import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; -import binnie.core.IInitializable; +import binnie.extratrees.item.ExtraTreeItems; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.core.Tabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.oredict.ShapedOreRecipe; -public class ModuleMachine implements IInitializable -{ +public class ModuleMachine implements IInitializable { @Override public void preInit() { - final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values()); + MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values()); machineGroup.setCreativeTab(Tabs.tabArboriculture); ExtraTrees.blockMachine = machineGroup.getBlock(); BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine")); @@ -31,17 +24,93 @@ public class ModuleMachine implements IInitializable @Override public void init() { + // ignore } @Override public void postInit() { - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Lumbermill.get(1), new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), 'A', Items.iron_axe, 's', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze" })); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Press.get(1), new Object[] { "iGi", "tSt", "tPt", 'i', "ingotIron", 'G', Blocks.glass, 't', "ingotTin", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze" })); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Brewery.get(1), new Object[] { "bGb", "iSi", "bPb", 'i', "ingotIron", 'G', Blocks.glass, 'b', "gearBronze", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze" })); - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Distillery.get(1), new Object[] { "rGr", "iSi", "rPr", 'i', "ingotIron", 'G', Blocks.glass, 'r', "dustRedstone", 'S', Mods.Forestry.stack("sturdyMachine"), 'P', "gearBronze" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Woodworker.get(1), new Object[] { "wGw", "GsG", "ggg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.planks, 's', Mods.Forestry.stack("impregnatedCasing") })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Panelworker.get(1), new Object[] { "wGw", "GsG", "ggg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.wooden_slab, 's', Mods.Forestry.stack("impregnatedCasing") })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Glassworker.get(1), new Object[] { "wGw", "GsG", "ggg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Blocks.glass, 's', Mods.Forestry.stack("impregnatedCasing") })); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeMachine.Tileworker.get(1), new Object[] { "wGw", "GsG", "ggg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), 'w', Items.clay_ball, 's', Mods.Forestry.stack("impregnatedCasing") })); + GameRegistry.addRecipe(new ShapedOreRecipe( + ExtraTreeMachine.Lumbermill.get(1), + new Object[]{ + "gAg", "GsG", "gPg", + 'G', Blocks.glass, + 'g', ExtraTreeItems.ProvenGear.get(1), + 'A', Items.iron_axe, + 's', Mods.Forestry.stack("sturdyMachine"), + 'P', "gearBronze" + } + )); + + GameRegistry.addRecipe(new ShapedOreRecipe( + ExtraTreeMachine.Press.get(1), + new Object[]{ + "iGi", "tSt", "tPt", + 'i', "ingotIron", + 'G', Blocks.glass, + 't', "ingotTin", + 'S', Mods.Forestry.stack("sturdyMachine"), + 'P', "gearBronze" + } + )); + + GameRegistry.addRecipe(new ShapedOreRecipe( + ExtraTreeMachine.Brewery.get(1), + new Object[]{ + "bGb", "iSi", "bPb", + 'i', "ingotIron", + 'G', Blocks.glass, + 'b', "gearBronze", + 'S', Mods.Forestry.stack("sturdyMachine"), + 'P', "gearBronze" + } + )); + + GameRegistry.addRecipe(new ShapedOreRecipe( + ExtraTreeMachine.Distillery.get(1), + new Object[]{ + "rGr", "iSi", "rPr", + 'i', "ingotIron", + 'G', Blocks.glass, + 'r', "dustRedstone", + 'S', Mods.Forestry.stack("sturdyMachine"), + 'P', "gearBronze" + } + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeMachine.Woodworker.get(1), + "wGw", "GsG", "ggg", + 'G', Blocks.glass, + 'g', ExtraTreeItems.ProvenGear.get(1), + 'w', Blocks.planks, + 's', Mods.Forestry.stack("impregnatedCasing") + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeMachine.Panelworker.get(1), + "wGw", "GsG", "ggg", + 'G', Blocks.glass, + 'g', ExtraTreeItems.ProvenGear.get(1), + 'w', Blocks.wooden_slab, + 's', Mods.Forestry.stack("impregnatedCasing") + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeMachine.Glassworker.get(1), + "wGw", "GsG", "ggg", + 'G', Blocks.glass, + 'g', ExtraTreeItems.ProvenGear.get(1), + 'w', Blocks.glass, + 's', Mods.Forestry.stack("impregnatedCasing") + )); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( + ExtraTreeMachine.Tileworker.get(1), + "wGw", "GsG", "ggg", + 'G', Blocks.glass, + 'g', ExtraTreeItems.ProvenGear.get(1), + 'w', Items.clay_ball, + 's', Mods.Forestry.stack("impregnatedCasing") + )); } } diff --git a/src/main/java/binnie/extratrees/machines/Nursery.java b/src/main/java/binnie/extratrees/machines/Nursery.java index 27f9ef16..c4eb6509 100644 --- a/src/main/java/binnie/extratrees/machines/Nursery.java +++ b/src/main/java/binnie/extratrees/machines/Nursery.java @@ -1,32 +1,22 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.extratrees.core.ExtraTreeTexture; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.Machine; -import binnie.extratrees.core.ExtraTreeTexture; -public class Nursery -{ - public static int slotCaterpillar; +public class Nursery { + public static int slotCaterpillar = 0; - static { - Nursery.slotCaterpillar = 0; - } - - public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine - { + public static class PackageNursery extends ExtraTreeMachine.PackageExtraTreeMachine { public PackageNursery() { super("nursery", ExtraTreeTexture.Nursery.getTexture(), false); } @Override - public void createMachine(final Machine machine) { - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + public void createMachine(Machine machine) { + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); inventory.addSlot(Nursery.slotCaterpillar, "caterpillar"); } @@ -36,7 +26,8 @@ public class Nursery } @Override - public void renderMachine(final Machine machine, final double x, final double y, final double z, final float partialTick, final RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + // ignored } } } diff --git a/src/main/java/binnie/extratrees/machines/Press.java b/src/main/java/binnie/extratrees/machines/Press.java index 615492d0..aa738115 100644 --- a/src/main/java/binnie/extratrees/machines/Press.java +++ b/src/main/java/binnie/extratrees/machines/Press.java @@ -1,44 +1,41 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.ComponentTankContainer; import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.TileEntityMachine; -import net.minecraft.tileentity.TileEntity; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.extratrees.core.ExtraTreesGUID; -import binnie.core.machines.Machine; import binnie.extratrees.core.ExtraTreeTexture; -import binnie.core.craftgui.minecraft.IMachineInformation; -import java.util.HashMap; -import net.minecraftforge.fluids.FluidStack; +import binnie.extratrees.core.ExtraTreesGUID; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidStack; + +import java.util.HashMap; import java.util.Map; -public class Press -{ - public static int slotFruit; - public static int slotCurrent; - public static int tankWater; - private static Map pressRecipes; +public class Press { + public static int slotFruit = 0; + public static int slotCurrent = 1; + public static int tankWater = 0; + private static Map pressRecipes = new HashMap<>(); - public static boolean isInput(final ItemStack itemstack) { + public static boolean isInput(ItemStack itemstack) { return getOutput(itemstack) != null; } - public static FluidStack getOutput(final ItemStack itemstack) { + public static FluidStack getOutput(ItemStack itemstack) { if (itemstack == null) { return null; } - for (final Map.Entry entry : Press.pressRecipes.entrySet()) { + + for (Map.Entry entry : Press.pressRecipes.entrySet()) { if (itemstack.isItemEqual(entry.getKey())) { return entry.getValue(); } @@ -46,40 +43,32 @@ public class Press return null; } - public static void addRecipe(final ItemStack stack, final FluidStack fluid) { + public static void addRecipe(ItemStack stack, FluidStack fluid) { if (getOutput(stack) != null) { return; } Press.pressRecipes.put(stack, fluid); } - static { - Press.slotFruit = 0; - Press.slotCurrent = 1; - Press.tankWater = 0; - Press.pressRecipes = new HashMap(); - } - - public static class PackagePress extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation - { + public static class PackagePress extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public PackagePress() { super("press", ExtraTreeTexture.pressTexture, true); } @Override - public void createMachine(final Machine machine) { + public void createMachine(Machine machine) { new ExtraTreeMachine.ComponentExtraTreeGUI(machine, ExtraTreesGUID.Press); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); inventory.addSlot(Press.slotFruit, "input"); inventory.getSlot(Press.slotFruit).setValidator(new SlotValidatorSqueezable()); inventory.getSlot(Press.slotFruit).forbidExtraction(); inventory.addSlot(Press.slotCurrent, "process"); inventory.getSlot(Press.slotCurrent).setValidator(new SlotValidatorSqueezable()); inventory.getSlot(Press.slotCurrent).forbidInteraction(); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); + ComponentTankContainer tanks = new ComponentTankContainer(machine); tanks.addTank(Press.tankWater, "output", 5000); new ComponentPowerReceptor(machine); - new ComponentInventoryTransfer(machine).addRestock(new int[] { Press.slotFruit }, Press.slotCurrent, 1); + new ComponentInventoryTransfer(machine).addRestock(new int[]{Press.slotFruit}, Press.slotCurrent, 1); new ComponentFruitPressLogic(machine); } @@ -89,18 +78,17 @@ public class Press } } - public static class ComponentFruitPressLogic extends ComponentProcessSetCost implements IProcess - { - int lastProgress; + public static class ComponentFruitPressLogic extends ComponentProcessSetCost implements IProcess { + protected int lastProgress; - public ComponentFruitPressLogic(final Machine machine) { + public ComponentFruitPressLogic(Machine machine) { super(machine, 1000, 50); - this.lastProgress = 0; + lastProgress = 0; } @Override public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(Press.slotCurrent)) { + if (getUtil().isSlotEmpty(Press.slotCurrent)) { return new ErrorState.NoItem("No Fruit", Press.slotCurrent); } return super.canWork(); @@ -108,10 +96,10 @@ public class Press @Override public ErrorState canProgress() { - if (!this.getUtil().spaceInTank(Press.tankWater, 5)) { + if (!getUtil().spaceInTank(Press.tankWater, 5)) { return new ErrorState.TankSpace("No room in tank", Press.tankWater); } - if (this.getUtil().getFluid(Press.tankWater) != null && !this.getUtil().getFluid(Press.tankWater).isFluidEqual(Press.getOutput(this.getUtil().getStack(Press.slotCurrent)))) { + if (getUtil().getFluid(Press.tankWater) != null && !getUtil().getFluid(Press.tankWater).isFluidEqual(Press.getOutput(getUtil().getStack(Press.slotCurrent)))) { return new ErrorState.TankSpace("Different fluid in tank", Press.tankWater); } return super.canProgress(); @@ -119,48 +107,50 @@ public class Press @Override protected void onFinishTask() { - this.getUtil().decreaseStack(Press.slotCurrent, 1); + getUtil().decreaseStack(Press.slotCurrent, 1); } @Override protected void onTickTask() { + // ignored } @Override public void onUpdate() { super.onUpdate(); - final FluidStack output = Press.getOutput(this.getUtil().getStack(Press.slotCurrent)); + FluidStack output = Press.getOutput(getUtil().getStack(Press.slotCurrent)); if (output == null) { return; } - final int newProgress = (int) this.getProgress(); - while (this.lastProgress + 4 <= newProgress) { - final int change = newProgress - this.lastProgress; - final int amount = output.amount * change / 100; - final FluidStack tank = new FluidStack(output, amount); - this.getUtil().fillTank(Press.tankWater, tank); - this.lastProgress += 4; + + int newProgress = (int) getProgress(); + while (lastProgress + 4 <= newProgress) { + int change = newProgress - lastProgress; + int amount = output.amount * change / 100; + FluidStack tank = new FluidStack(output, amount); + getUtil().fillTank(Press.tankWater, tank); + lastProgress += 4; } - if (this.lastProgress > newProgress) { - this.lastProgress = 0; + + if (lastProgress > newProgress) { + lastProgress = 0; } } @Override protected void onStartTask() { super.onStartTask(); - this.lastProgress = 0; + lastProgress = 0; } } - public static class SlotValidatorSqueezable extends SlotValidator - { + public static class SlotValidatorSqueezable extends SlotValidator { public SlotValidatorSqueezable() { super(SlotValidator.IconBlock); } @Override - public boolean isValid(final ItemStack itemStack) { + public boolean isValid(ItemStack itemStack) { return Press.isInput(itemStack); } diff --git a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java index ee059cc9..d86dafce 100644 --- a/src/main/java/binnie/extratrees/machines/TileEntityNursery.java +++ b/src/main/java/binnie/extratrees/machines/TileEntityNursery.java @@ -1,58 +1,47 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; +import binnie.core.machines.TileEntityMachine; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyNursery; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import java.util.HashSet; import java.util.Set; -import forestry.api.core.IErrorState; - -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.biome.BiomeGenBase; - -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.IButterfly; - -import net.minecraft.item.ItemStack; - -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; - -import net.minecraft.world.World; - -import forestry.api.lepidopterology.IButterflyNursery; -import binnie.core.machines.TileEntityMachine; - -public class TileEntityNursery extends TileEntityMachine implements IButterflyNursery -{ - public TileEntityNursery(final Nursery.PackageNursery pack) { +public class TileEntityNursery extends TileEntityMachine implements IButterflyNursery { + public TileEntityNursery(Nursery.PackageNursery pack) { super(pack); } IButterflyNursery getNursery() { - return this.getMachine().getInterface(IButterflyNursery.class); + return getMachine().getInterface(IButterflyNursery.class); } boolean hasNursery() { - return this.getNursery() != null; + return getNursery() != null; } public World getWorld() { - return this.worldObj; + return worldObj; } public int getXCoord() { - return this.xCoord; + return xCoord; } public int getYCoord() { - return this.yCoord; + return yCoord; } public int getZCoord() { - return this.zCoord; + return zCoord; } public EnumTemperature getTemperature() { @@ -63,13 +52,20 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu return null; } - public boolean addProduct(final ItemStack product, final boolean all) { + public boolean addProduct(ItemStack product, boolean all) { return false; } @Override public IButterfly getCaterpillar() { - return this.hasNursery() ? this.getNursery().getCaterpillar() : null; + return hasNursery() ? getNursery().getCaterpillar() : null; + } + + @Override + public void setCaterpillar(IButterfly butterfly) { + if (hasNursery()) { + getNursery().setCaterpillar(butterfly); + } } @Override @@ -78,43 +74,36 @@ public class TileEntityNursery extends TileEntityMachine implements IButterflyNu } @Override - public void setCaterpillar(final IButterfly butterfly) { - if (this.hasNursery()) { - this.getNursery().setCaterpillar(butterfly); - } - } - - @Override - public boolean canNurse(final IButterfly butterfly) { - return this.getCaterpillar() == null; + public boolean canNurse(IButterfly butterfly) { + return getCaterpillar() == null; } public BiomeGenBase getBiome() { - return this.getWorld().getBiomeGenForCoords(this.xCoord, this.zCoord); + return getWorld().getBiomeGenForCoords(xCoord, zCoord); } - public void setErrorState(final IErrorState state) { + public void setErrorState(IErrorState state) { } public IErrorState getErrorState() { return null; } - public boolean setErrorCondition(final boolean condition, final IErrorState errorState) { + public void setErrorState(int state) { + } + + public boolean setErrorCondition(boolean condition, IErrorState errorState) { return false; } public Set getErrorStates() { - return new HashSet(); + return new HashSet<>(); } public int getBiomeId() { return 0; } - public void setErrorState(final int state) { - } - public int getErrorOrdinal() { return 0; } diff --git a/src/main/java/binnie/extratrees/machines/Validators.java b/src/main/java/binnie/extratrees/machines/Validators.java index 1f9f5c3a..1820e682 100644 --- a/src/main/java/binnie/extratrees/machines/Validators.java +++ b/src/main/java/binnie/extratrees/machines/Validators.java @@ -1,55 +1,48 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.machines; -import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorIcon; import binnie.extratrees.ExtraTrees; -import binnie.core.machines.inventory.SlotValidator; +import binnie.extratrees.api.IDesignMaterial; +import net.minecraft.item.ItemStack; -public class Validators -{ - public static class SlotValidatorBeeswax extends SlotValidator - { - DesignerType type; +public class Validators { + public static class SlotValidatorBeeswax extends SlotValidator { + protected DesignerType type; - public SlotValidatorBeeswax(final DesignerType type) { + public SlotValidatorBeeswax(DesignerType type) { super(new ValidatorIcon(ExtraTrees.instance, "validator/polish.0", "validator/polish.1")); this.type = type; } @Override - public boolean isValid(final ItemStack itemStack) { - return this.type.getSystem().getAdhesive().isItemEqual(itemStack); + public boolean isValid(ItemStack itemStack) { + return type.getSystem().getAdhesive().isItemEqual(itemStack); } @Override public String getTooltip() { - return this.type.getSystem().getAdhesive().getDisplayName(); + return type.getSystem().getAdhesive().getDisplayName(); } } - public static class SlotValidatorPlanks extends SlotValidator - { - DesignerType type; + public static class SlotValidatorPlanks extends SlotValidator { + protected DesignerType type; - public SlotValidatorPlanks(final DesignerType type) { + public SlotValidatorPlanks(DesignerType type) { super(SlotValidator.IconBlock); this.type = type; } @Override - public boolean isValid(final ItemStack itemStack) { - final IDesignMaterial mat = this.type.getSystem().getMaterial(itemStack); + public boolean isValid(ItemStack itemStack) { + IDesignMaterial mat = type.getSystem().getMaterial(itemStack); return itemStack != null && mat != null; } @Override public String getTooltip() { - return this.type.getMaterialTooltip(); + return type.getMaterialTooltip(); } } } diff --git a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java index cb112a4f..817d9923 100644 --- a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java +++ b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java @@ -1,11 +1,6 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.proxy; import binnie.core.proxy.IProxyCore; -public interface IExtraTreeProxy extends IProxyCore -{ +public interface IExtraTreeProxy extends IProxyCore { } diff --git a/src/main/java/binnie/extratrees/proxy/Proxy.java b/src/main/java/binnie/extratrees/proxy/Proxy.java index ee0a6557..a1310305 100644 --- a/src/main/java/binnie/extratrees/proxy/Proxy.java +++ b/src/main/java/binnie/extratrees/proxy/Proxy.java @@ -1,14 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.proxy; -import binnie.extratrees.ExtraTrees; import binnie.core.proxy.BinnieModProxy; +import binnie.extratrees.ExtraTrees; -public class Proxy extends BinnieModProxy implements IExtraTreeProxy -{ +public class Proxy extends BinnieModProxy implements IExtraTreeProxy { public Proxy() { super(ExtraTrees.instance); } diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index cdd6e8f8..0f0e3192 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -1,15 +1,9 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.proxy; -import forestry.api.core.IIconProvider; import binnie.extratrees.genetics.FruitSprite; import forestry.api.core.ForestryAPI; -public class ProxyClient extends Proxy implements IExtraTreeProxy -{ +public class ProxyClient extends Proxy implements IExtraTreeProxy { @Override public void init() { ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average); diff --git a/src/main/java/binnie/extratrees/proxy/ProxyServer.java b/src/main/java/binnie/extratrees/proxy/ProxyServer.java index 0fb6ca80..bce8deda 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyServer.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyServer.java @@ -1,9 +1,4 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.proxy; -public class ProxyServer extends Proxy implements IExtraTreeProxy -{ +public class ProxyServer extends Proxy implements IExtraTreeProxy { } diff --git a/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java b/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java index 320a2e2f..e002f462 100644 --- a/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java +++ b/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java @@ -1,52 +1,48 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.village; import forestry.apiculture.worldgen.ComponentVillageBeeHouse; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.StructureComponent; -import java.util.List; import net.minecraft.world.gen.structure.StructureBoundingBox; -import java.util.Random; +import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; -public class ComponentVillageGrove extends StructureVillagePieces.Village -{ +import java.util.List; +import java.util.Random; + +public class ComponentVillageGrove extends StructureVillagePieces.Village { public ComponentVillageGrove() { } - public ComponentVillageGrove(final StructureVillagePieces.Start start, final int p_i2097_2_, final Random p_i2097_3_, final StructureBoundingBox boundingBox, final int coordBaseMode) { - super(start, p_i2097_2_); + public ComponentVillageGrove(StructureVillagePieces.Start start, int type, Random rand, StructureBoundingBox boundingBox, int coordBaseMode) { + super(start, type); this.coordBaseMode = coordBaseMode; this.boundingBox = boundingBox; } - public static StructureBoundingBox func_74904_a(final StructureVillagePieces.Start p_74904_0_, final List p_74904_1_, final Random p_74904_2_, final int p_74904_3_, final int p_74904_4_, final int p_74904_5_, final int p_74904_6_) { - final StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p_74904_3_, p_74904_4_, p_74904_5_, 0, 0, 0, 3, 3, 3, p_74904_6_); - return (StructureComponent.findIntersecting(p_74904_1_, structureboundingbox) != null) ? null : structureboundingbox; + public static StructureBoundingBox func_74904_a(StructureVillagePieces.Start start, List pieces, Random rand, int p_74904_3_, int p_74904_4_, int p_74904_5_, int p_74904_6_) { + StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p_74904_3_, p_74904_4_, p_74904_5_, 0, 0, 0, 3, 3, 3, p_74904_6_); + return (StructureComponent.findIntersecting(pieces, structureboundingbox) != null) ? null : structureboundingbox; + } + + public static ComponentVillageBeeHouse buildComponent(StructureVillagePieces.Start startPiece, List par1List, Random random, int par3, int par4, int par5, int par6, int par7) { + System.out.println("GROVE1"); + StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 9, 10, par6); + return (canVillageGoDeeper(bbox) && StructureComponent.findIntersecting(par1List, bbox) == null) ? new ComponentVillageBeeHouse(startPiece, par7, random, bbox, par6) : null; } @Override - public boolean addComponentParts(final World p_74875_1_, final Random p_74875_2_, final StructureBoundingBox p_74875_3_) { - if (this.field_143015_k < 0) { - this.field_143015_k = this.getAverageGroundLevel(p_74875_1_, p_74875_3_); - if (this.field_143015_k < 0) { + public boolean addComponentParts(World world, Random rand, StructureBoundingBox box) { + if (field_143015_k < 0) { + field_143015_k = getAverageGroundLevel(world, box); + if (field_143015_k < 0) { return true; } - this.boundingBox.offset(0, this.field_143015_k - this.boundingBox.maxY + 4 - 1, 0); + boundingBox.offset(0, field_143015_k - boundingBox.maxY + 4 - 1, 0); } System.out.println("GROVE2"); - this.fillWithBlocks(p_74875_1_, p_74875_3_, 0, 0, 0, 3, 3, 3, Blocks.air, Blocks.air, false); - this.fillWithBlocks(p_74875_1_, p_74875_3_, 0, 0, 0, 3, 3, 3, Blocks.stone, Blocks.stone, true); + fillWithBlocks(world, box, 0, 0, 0, 3, 3, 3, Blocks.air, Blocks.air, false); + fillWithBlocks(world, box, 0, 0, 0, 3, 3, 3, Blocks.stone, Blocks.stone, true); return true; } - - public static ComponentVillageBeeHouse buildComponent(final StructureVillagePieces.Start startPiece, final List par1List, final Random random, final int par3, final int par4, final int par5, final int par6, final int par7) { - System.out.println("GROVE1"); - final StructureBoundingBox bbox = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 9, 10, par6); - return (canVillageGoDeeper(bbox) && StructureComponent.findIntersecting(par1List, bbox) == null) ? new ComponentVillageBeeHouse(startPiece, par7, random, bbox, par6) : null; - } } diff --git a/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java b/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java index 5a10fcf1..5f2576cc 100644 --- a/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java +++ b/src/main/java/binnie/extratrees/village/VillageHandlerExtraTrees.java @@ -1,27 +1,25 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.village; -import java.util.List; -import net.minecraft.util.MathHelper; -import net.minecraft.world.gen.structure.StructureVillagePieces; -import java.util.Random; -import net.minecraft.world.gen.structure.MapGenStructureIO; import cpw.mods.fml.common.registry.VillagerRegistry; +import net.minecraft.util.MathHelper; +import net.minecraft.world.gen.structure.MapGenStructureIO; +import net.minecraft.world.gen.structure.StructureVillagePieces; -public class VillageHandlerExtraTrees implements VillagerRegistry.IVillageCreationHandler -{ +import java.util.List; +import java.util.Random; + +// TODO Unused class? +public class VillageHandlerExtraTrees implements VillagerRegistry.IVillageCreationHandler { public static void registerVillageComponents() { try { MapGenStructureIO.func_143031_a(ComponentVillageGrove.class, "ExtraTrees:Grove"); } catch (Throwable t) { + // ignored } } @Override - public StructureVillagePieces.PieceWeight getVillagePieceWeight(final Random random, final int size) { + public StructureVillagePieces.PieceWeight getVillagePieceWeight(Random random, int size) { return new StructureVillagePieces.PieceWeight(ComponentVillageGrove.class, 505, MathHelper.getRandomIntegerInRange(random, size, 1 + size)); } @@ -31,7 +29,7 @@ public class VillageHandlerExtraTrees implements VillagerRegistry.IVillageCreati } @Override - public Object buildComponent(final StructureVillagePieces.PieceWeight villagePiece, final StructureVillagePieces.Start startPiece, final List pieces, final Random random, final int p1, final int p2, final int p3, final int p4, final int p5) { + public Object buildComponent(StructureVillagePieces.PieceWeight villagePiece, StructureVillagePieces.Start startPiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { return ComponentVillageGrove.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockType.java b/src/main/java/binnie/extratrees/worldgen/BlockType.java index aa9f2d6b..e5502c62 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockType.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockType.java @@ -1,26 +1,20 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; - -import net.minecraft.world.World; import net.minecraft.block.Block; +import net.minecraft.world.World; -public class BlockType -{ - int meta; - Block block; +public class BlockType { + protected int meta; + protected Block block; - public BlockType(final Block block, final int meta) { + public BlockType(Block block, int meta) { this.block = block; this.meta = meta; } - public void setBlock(final World world, final ITreeGenData tree, final int x, final int y, final int z) { - world.setBlock(x, y, z, this.block, this.meta, 0); + public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { + world.setBlock(x, y, z, block, meta, 0); if (world.getTileEntity(x, y, z) != null) { world.removeTileEntity(x, y, z); } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index 653d2338..7212571a 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -1,22 +1,16 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; -import com.mojang.authlib.GameProfile; -import net.minecraft.world.World; import binnie.core.Mods; +import forestry.api.world.ITreeGenData; +import net.minecraft.world.World; -public class BlockTypeLeaf extends BlockType -{ +public class BlockTypeLeaf extends BlockType { public BlockTypeLeaf() { super(Mods.Forestry.block("leaves"), 0); } @Override - public void setBlock(final World world, final ITreeGenData tree, final int x, final int y, final int z) { - tree.setLeaves(world, (GameProfile) null, x, y, z); + public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { + tree.setLeaves(world, null, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java index 31f7ee49..c21b4054 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java @@ -1,25 +1,19 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; - -import net.minecraft.world.World; import binnie.extratrees.block.ILogType; +import forestry.api.world.ITreeGenData; +import net.minecraft.world.World; -public class BlockTypeLog extends BlockType -{ - ILogType log; +public class BlockTypeLog extends BlockType { + protected ILogType log; - public BlockTypeLog(final ILogType log) { + public BlockTypeLog(ILogType log) { super(null, 0); this.log = log; } @Override - public void setBlock(final World world, final ITreeGenData tree, final int x, final int y, final int z) { - this.log.placeBlock(world, x, y, z); + public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { + log.placeBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java index 956ff906..2a912152 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java @@ -1,21 +1,15 @@ -// -// Decompiled by Procyon v0.5.30 -// - package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; - import net.minecraft.world.World; -public class BlockTypeVoid extends BlockType -{ +public class BlockTypeVoid extends BlockType { public BlockTypeVoid() { super(null, 0); } @Override - public void setBlock(final World world, final ITreeGenData tree, final int x, final int y, final int z) { + public void setBlock(World world, ITreeGenData tree, int x, int y, int z) { world.setBlockToAir(x, y, z); if (world.getTileEntity(x, y, z) != null) { world.removeTileEntity(x, y, z); diff --git a/src/main/java/binnie/genetics/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/craftgui/ControlProcessTemporary.java index e01b4067..d06042b4 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/craftgui/ControlProcessTemporary.java @@ -8,7 +8,7 @@ import binnie.core.craftgui.minecraft.control.ControlMachineProgress; // TODO unused class? public class ControlProcessTemporary extends ControlMachineProgress { - public ControlProcessTemporary(final IWidget parent, final int x, final int y, final int width, final int height) { + public ControlProcessTemporary(IWidget parent, int x, int y, int width, int height) { super(parent, x, y, null, null, null); setSize(new IPoint(width, height)); } @@ -16,7 +16,7 @@ public class ControlProcessTemporary extends ControlMachineProgress { @Override public void onRenderBackground() { CraftGUI.Render.solid(getArea(), -4868683); - final float w = getSize().y() * progress / 100.0f; + float w = getSize().y() * progress / 100.0f; CraftGUI.Render.solid(new IArea(getArea().x(), getArea().y(), w, getArea().h()), -65536); } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowGeneProject.java b/src/main/java/binnie/genetics/craftgui/WindowGeneProject.java index 7bda0d16..d840a80f 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGeneProject.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGeneProject.java @@ -9,7 +9,7 @@ import net.minecraft.inventory.IInventory; // TODO unused class? public class WindowGeneProject extends Window { - public WindowGeneProject(final EntityPlayer player, final IInventory inventory, final Side side) { + public WindowGeneProject(EntityPlayer player, IInventory inventory, Side side) { super(100.0f, 100.0f, player, inventory, side); } diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index d8795621..264ab0f0 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -59,7 +59,7 @@ public enum GeneticLiquid implements IFluidType { } @Override - public int getContainerColour() { + public int getContainerColor() { return color; } diff --git a/src/main/java/binnie/genetics/machine/Inoculator.java b/src/main/java/binnie/genetics/machine/Inoculator.java index 6214a571..a190c879 100644 --- a/src/main/java/binnie/genetics/machine/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/Inoculator.java @@ -150,7 +150,7 @@ public class Inoculator { transfer.addStorage(9, Inoculator.slotFinished, new ComponentInventoryTransfer.Condition() { @Override - public boolean fufilled(final ItemStack stack) { + public boolean fufilled(ItemStack stack) { return stack != null && transfer.getMachine().getMachineUtil().getStack(0) != null && transfer.getMachine().getInterface(ComponentInoculatorLogic.class).isValidSerum() != null; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3348618e..7b321e5f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "BinnieCore", "name": "Binnie Core", "description": "Base mod for Binnie's Mods, with lots of common code.", - "version": "2.0-pre15", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], @@ -20,8 +20,8 @@ "modid": "ExtraBees", "name": "Extra Bees", "description": "Adds new bees and products to expand the bee breeding in Forestry.", - "version": "2.0-pre15", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], @@ -34,8 +34,8 @@ "modid": "ExtraTrees", "name": "Extra Trees", "description": "Adds new trees, aesthetic blocks and alcohol production.", - "version": "2.0-pre15", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], @@ -48,8 +48,8 @@ "modid": "Botany", "name": "Botany", "description": "Adds breedable flowers.", - "version": "2.0-pre15", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], @@ -62,8 +62,8 @@ "modid": "Genetics", "name": "Genetics", "description": "Adds genetic manipulation for bees, trees, butterflies and flowers.", - "version": "2.0-pre15", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ],