From 1bd860c52f06827f2069fadc80f8107d48767e22 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Tue, 31 Dec 2013 11:26:08 -0500 Subject: [PATCH] start of the 1.7 update commits --- build.properties | 6 +- .../fmp/ConnectedTexturesMicroMaterial.java | 0 .../fmp/ForgeMultiPart.java | 0 .../fmp/RegisterWithFMP.java | 0 .../minefactoryreloaded/Drinkables.java | 0 .../minefactoryreloaded/GrindableHorse.java | 0 .../HarvestableOreBerry.java | 0 .../minefactoryreloaded/MFRRegister.java | 0 .../MineFactoryReloaded.java | 0 .../nei/NEICompat.java | 0 .../nei/NotEnoughItems.java | 0 .../waila/BasinDataProvider.java | 0 .../waila/CastingChannelDataProvider.java | 0 .../waila/SearedTankDataProvider.java | 0 .../waila/SmelteryDataProvider.java | 0 .../waila/TableDataProvider.java | 0 .../waila/Waila.java | 0 .../waila/WailaRegistrar.java | 0 .../api/FactoryRegistry.java | 512 ------------------ .../api/FarmingRegistry.java | 42 -- .../api/FertilizerType.java | 23 - .../minefactoryreloaded/api/HarvestType.java | 34 -- .../api/IDeepStorageUnit.java | 26 - .../api/IFactoryFertilizable.java | 40 -- .../api/IFactoryFertilizer.java | 33 -- .../api/IFactoryFruit.java | 69 --- .../api/IFactoryGrindable.java | 36 -- .../api/IFactoryHarvestable.java | 71 --- .../api/IFactoryPlantable.java | 67 --- .../api/IFactoryRanchable.java | 28 - .../api/ILiquidDrinkHandler.java | 8 - .../api/IMobEggHandler.java | 18 - .../minefactoryreloaded/api/INeedleAmmo.java | 12 - .../api/IRandomMobProvider.java | 11 - .../api/ISafariNetHandler.java | 28 - .../minefactoryreloaded/api/ISyringe.java | 31 -- .../minefactoryreloaded/api/IToolHammer.java | 9 - .../api/IToolHammerAdvanced.java | 16 - .../minefactoryreloaded/api/MobDrop.java | 21 - .../minefactoryreloaded/api/RanchedItem.java | 68 --- .../minefactoryreloaded/api/RandomMob.java | 21 - .../api/rednet/IConnectableRedNet.java | 86 --- .../api/rednet/IRedNetDecorative.java | 6 - .../api/rednet/IRedNetLogicCircuit.java | 19 - .../api/rednet/IRedNetNetworkContainer.java | 31 -- .../api/rednet/IRedNetNoConnection.java | 6 - .../api/rednet/RedNetConnectionType.java | 65 --- .../java/tconstruct/blocks/BlockLandmine.java | 14 +- .../blocks/CastingChannelBlock.java | 6 +- .../java/tconstruct/blocks/ConveyorBase.java | 14 +- .../java/tconstruct/blocks/DryingRack.java | 8 +- .../java/tconstruct/blocks/EquipBlock.java | 2 +- .../java/tconstruct/blocks/FurnaceSlab.java | 8 +- .../java/tconstruct/blocks/GlassBlock.java | 12 +- .../blocks/GlassBlockConnectedMeta.java | 12 +- .../tconstruct/blocks/GlassBlockStained.java | 8 +- .../tconstruct/blocks/GlassPaneConnected.java | 12 +- .../java/tconstruct/blocks/GravelOre.java | 18 +- .../tconstruct/blocks/LiquidMetalFinite.java | 4 +- .../java/tconstruct/blocks/MultiBrick.java | 8 +- .../tconstruct/blocks/MultiBrickFancy.java | 4 +- src/main/java/tconstruct/blocks/PaneBase.java | 26 +- .../java/tconstruct/blocks/SearedBlock.java | 14 +- .../java/tconstruct/blocks/SearedSlab.java | 18 +- src/main/java/tconstruct/blocks/SlabBase.java | 20 +- .../tconstruct/blocks/SlimeExplosive.java | 13 +- src/main/java/tconstruct/blocks/SlimePad.java | 14 +- .../java/tconstruct/blocks/SmelteryBlock.java | 17 +- .../java/tconstruct/blocks/SoilBlock.java | 5 +- src/main/java/tconstruct/blocks/SoilSlab.java | 16 +- .../java/tconstruct/blocks/SpeedBlock.java | 9 +- .../java/tconstruct/blocks/SpeedSlab.java | 17 +- .../java/tconstruct/blocks/StoneLadder.java | 12 +- .../java/tconstruct/blocks/StoneTorch.java | 16 +- .../tconstruct/blocks/TConstructBlock.java | 22 +- .../tconstruct/blocks/TConstructFluid.java | 18 +- .../java/tconstruct/blocks/TMetalBlock.java | 4 +- .../java/tconstruct/blocks/TankAirBlock.java | 6 +- .../tconstruct/blocks/ToolForgeBlock.java | 15 +- .../tconstruct/blocks/ToolStationBlock.java | 14 +- src/main/java/tconstruct/blocks/WoodRail.java | 18 +- .../blocks/logic/AdaptiveDrainLogic.java | 4 +- .../blocks/logic/LavaTankLogic.java | 4 +- .../tconstruct/blocks/slime/SlimeFluid.java | 12 +- .../tconstruct/blocks/slime/SlimeLeaves.java | 19 +- .../tconstruct/blocks/slime/SlimeSapling.java | 20 +- .../blocks/traps/BarricadeBlock.java | 10 +- .../tconstruct/client/CustomBowRenderer.java | 4 +- .../java/tconstruct/client/TProxyClient.java | 32 +- .../tconstruct/client/ToolCoreRenderer.java | 12 +- .../client/block/BlockSkinRenderHelper.java | 2 +- .../client/block/PaneConnectedRender.java | 8 +- .../tconstruct/client/block/PaneRender.java | 2 +- .../client/block/RenderLandmine.java | 2 +- .../tconstruct/client/block/RenderLiquid.java | 4 +- src/main/java/tconstruct/common/TContent.java | 2 +- .../tconstruct/inventory/SlotArmorCopy.java | 4 +- .../java/tconstruct/items/ArmorPattern.java | 17 +- .../java/tconstruct/items/DiamondApple.java | 16 +- .../java/tconstruct/items/FilledBucket.java | 22 +- .../java/tconstruct/items/GoldenHead.java | 13 +- src/main/java/tconstruct/items/Jerky.java | 8 +- .../java/tconstruct/items/SpecialFood.java | 21 +- src/main/java/tconstruct/items/TitleIcon.java | 18 +- src/main/java/tconstruct/items/ToolPart.java | 11 +- src/main/java/tconstruct/items/ToolShard.java | 23 +- .../tconstruct/items/armor/ArmorBasic.java | 4 +- .../tconstruct/items/armor/ArmorStandard.java | 4 +- .../java/tconstruct/items/armor/Glove.java | 8 +- .../java/tconstruct/items/armor/Knapsack.java | 2 +- .../tconstruct/items/armor/TArmorBase.java | 12 +- .../items/blocks/MetadataItemBlock.java | 5 +- .../items/blocks/SlimeTallGrassItem.java | 10 +- .../items/tools/PotionLauncher.java | 18 +- .../tconstruct/plugins/PluginController.java | 12 +- .../util/config/DimensionBlacklist.java | 2 +- .../tconstruct/util/config/PHConstruct.java | 4 +- .../java/tconstruct/util/landmine/Helper.java | 2 +- 118 files changed, 403 insertions(+), 1837 deletions(-) rename {src/main/java/tconstruct/plugins => returning_eventually}/fmp/ConnectedTexturesMicroMaterial.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/fmp/ForgeMultiPart.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/fmp/RegisterWithFMP.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/minefactoryreloaded/Drinkables.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/minefactoryreloaded/GrindableHorse.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/minefactoryreloaded/HarvestableOreBerry.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/minefactoryreloaded/MFRRegister.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/minefactoryreloaded/MineFactoryReloaded.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/nei/NEICompat.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/nei/NotEnoughItems.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/BasinDataProvider.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/CastingChannelDataProvider.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/SearedTankDataProvider.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/SmelteryDataProvider.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/TableDataProvider.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/Waila.java (100%) rename {src/main/java/tconstruct/plugins => returning_eventually}/waila/WailaRegistrar.java (100%) delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java diff --git a/build.properties b/build.properties index 567ae9bbe84..6c212757b3b 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ -minecraft_version=1.6.4 -forge_version=9.11.1.964 -mantle_version=2e4958 +minecraft_version=1.7.2 +forge_version=10.12.0.977 +mantle_version=2db77d FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.8 diff --git a/src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java b/returning_eventually/fmp/ConnectedTexturesMicroMaterial.java similarity index 100% rename from src/main/java/tconstruct/plugins/fmp/ConnectedTexturesMicroMaterial.java rename to returning_eventually/fmp/ConnectedTexturesMicroMaterial.java diff --git a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java b/returning_eventually/fmp/ForgeMultiPart.java similarity index 100% rename from src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java rename to returning_eventually/fmp/ForgeMultiPart.java diff --git a/src/main/java/tconstruct/plugins/fmp/RegisterWithFMP.java b/returning_eventually/fmp/RegisterWithFMP.java similarity index 100% rename from src/main/java/tconstruct/plugins/fmp/RegisterWithFMP.java rename to returning_eventually/fmp/RegisterWithFMP.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/Drinkables.java b/returning_eventually/minefactoryreloaded/Drinkables.java similarity index 100% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/Drinkables.java rename to returning_eventually/minefactoryreloaded/Drinkables.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/GrindableHorse.java b/returning_eventually/minefactoryreloaded/GrindableHorse.java similarity index 100% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/GrindableHorse.java rename to returning_eventually/minefactoryreloaded/GrindableHorse.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/HarvestableOreBerry.java b/returning_eventually/minefactoryreloaded/HarvestableOreBerry.java similarity index 100% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/HarvestableOreBerry.java rename to returning_eventually/minefactoryreloaded/HarvestableOreBerry.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/MFRRegister.java b/returning_eventually/minefactoryreloaded/MFRRegister.java similarity index 100% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/MFRRegister.java rename to returning_eventually/minefactoryreloaded/MFRRegister.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/returning_eventually/minefactoryreloaded/MineFactoryReloaded.java similarity index 100% rename from src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java rename to returning_eventually/minefactoryreloaded/MineFactoryReloaded.java diff --git a/src/main/java/tconstruct/plugins/nei/NEICompat.java b/returning_eventually/nei/NEICompat.java similarity index 100% rename from src/main/java/tconstruct/plugins/nei/NEICompat.java rename to returning_eventually/nei/NEICompat.java diff --git a/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java b/returning_eventually/nei/NotEnoughItems.java similarity index 100% rename from src/main/java/tconstruct/plugins/nei/NotEnoughItems.java rename to returning_eventually/nei/NotEnoughItems.java diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/returning_eventually/waila/BasinDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/BasinDataProvider.java rename to returning_eventually/waila/BasinDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/returning_eventually/waila/CastingChannelDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java rename to returning_eventually/waila/CastingChannelDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/returning_eventually/waila/SearedTankDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java rename to returning_eventually/waila/SearedTankDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/returning_eventually/waila/SmelteryDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java rename to returning_eventually/waila/SmelteryDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/returning_eventually/waila/TableDataProvider.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/TableDataProvider.java rename to returning_eventually/waila/TableDataProvider.java diff --git a/src/main/java/tconstruct/plugins/waila/Waila.java b/returning_eventually/waila/Waila.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/Waila.java rename to returning_eventually/waila/Waila.java diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/returning_eventually/waila/WailaRegistrar.java similarity index 100% rename from src/main/java/tconstruct/plugins/waila/WailaRegistrar.java rename to returning_eventually/waila/WailaRegistrar.java diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java deleted file mode 100644 index 0384c4317e1..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java +++ /dev/null @@ -1,512 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; - -import java.lang.reflect.Method; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; - -/** - * @author PowerCrystals - * - * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist, but your mod should be set to load - * after MFR or things may not work properly. - * - * To avoid breaking the API, additional FactoryRegistry##s will appear on major MFR versions that contain API additions. On a Minecraft version change, - * these will be rolled back into this class. - * - */ -public class FactoryRegistry -{ - /** - * Registers a plantable object with the Planter. - * - * @param plantable The thing to plant. - */ - public static void registerPlantable(IFactoryPlantable plantable) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerPlantable", IFactoryPlantable.class); - reg.invoke(registry, plantable); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a harvestable block with the Harvester. - * - * @param harvestable The thing to harvest. - */ - public static void registerHarvestable(IFactoryHarvestable harvestable) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerHarvestable", IFactoryHarvestable.class); - reg.invoke(registry, harvestable); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a fertilizable block with the Fertilizer. - * - * @param fertilizable The thing to fertilize. - */ - public static void registerFertilizable(IFactoryFertilizable fertilizable) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerFertilizable", IFactoryFertilizable.class); - reg.invoke(registry, fertilizable); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a fertilizer item Fertilizer. - * - * @param fertilizable The thing to fertilize with. - */ - public static void registerFertilizer(IFactoryFertilizer fertilizer) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerFertilizer", IFactoryFertilizer.class); - reg.invoke(registry, fertilizer); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a ranchable entity with the Rancher. - * - * @param ranchable The entity to ranch. - */ - public static void registerRanchable(IFactoryRanchable ranchable) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerRanchable", IFactoryRanchable.class); - reg.invoke(registry, ranchable); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a grindable entity with the Grinder using the new grinder interface. This method will be renamed to the standard "registerGrindable" - * on MC 1.6. - * - * @param grindable The entity to grind. - */ - public static void registerGrindable(IFactoryGrindable grindable) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerGrindable", IFactoryGrindable.class); - reg.invoke(registry, grindable); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Bans an entity class from being automatically ground by the Grinder - * - * @param blacklistedEntity Class to blacklist - */ - public static void registerGrinderBlacklist(Class ...ungrindables) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerGrinderBlacklist", Class[].class); - reg.invoke(registry, (Object[])ungrindables); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a possible output with the sludge boiler. - * - * @param weight Likelihood that this item will be produced. Lower means rarer. - * @param drop The thing being produced by the sludge boiler. - */ - public static void registerSludgeDrop(int weight, ItemStack drop) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerSludgeDrop", int.class, ItemStack.class); - reg.invoke(registry, weight, drop); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers specific food to use in the Breeder (instead of wheat) for a given mob. - * - * @param entityToBreed Entity this food will be used with. - * @param food The item to use when breeding this entity. - */ - public static void registerBreederFood(Class entityToBreed, ItemStack food) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerBreederFood", Class.class, ItemStack.class); - reg.invoke(registry, entityToBreed, food); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Bans an entity class from being collected by Safari Nets - * - * @param blacklistedEntity Class to blacklist - */ - public static void registerSafariNetBlacklist(Class blacklistedEntity) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerSafariNetBlacklist", Class.class); - reg.invoke(registry, blacklistedEntity); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a Safari Net handler to properly serialize a type of mob. - * - * @param handler The Safari Net handler. - */ - public static void registerSafariNetHandler(ISafariNetHandler handler) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerSafariNetHandler", ISafariNetHandler.class); - reg.invoke(registry, handler); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - - /** - * Registers a mob egg handler, which allows the Safari Net to properly change colors. - * - * @param handler The mob egg handler - */ - public static void registerMobEggHandler(IMobEggHandler handler) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerMobEggHandler", IMobEggHandler.class); - reg.invoke(registry, handler); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Allows Rubber Trees to spawn in the specified biome. - * - * @param biome The biome name. - */ - public static void registerRubberTreeBiome(String biome) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerRubberTreeBiome", String.class); - reg.invoke(registry, biome); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers an entity as a possible output from villager random safari nets. Note that the "id" field must be initialized - * (i.e. with Entity.addEntityID()) for it to work correctly. - * - * @param savedMob A serialized mob that will be unloaded by the safari net - * @param weight The weight of this mob in the random selection - */ - public static void registerVillagerTradeMob(IRandomMobProvider mobProvider) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerVillagerTradeMob", IRandomMobProvider.class); - reg.invoke(registry, mobProvider); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a handler for drinking liquids with the straw. - * - * @param liquidId The liquid id the handler handles. - * @param liquidDrinkHandler The drink handler instance. - */ - @Deprecated - public static void registerLiquidDrinkHandler(int liquidId, ILiquidDrinkHandler liquidDrinkHandler) - { - Fluid fluid = FluidRegistry.getFluid(liquidId); - registerLiquidDrinkHandler(fluid.getName(), liquidDrinkHandler); - } - - /** - * Registers a handler for drinking liquids with the straw. - * - * @param liquidId The liquid string name the handler handles. - * @param liquidDrinkHandler The drink handler instance. - */ - public static void registerLiquidDrinkHandler(String liquidId, ILiquidDrinkHandler liquidDrinkHandler) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerLiquidDrinkHandler", String.class, ILiquidDrinkHandler.class); - reg.invoke(registry, liquidId, liquidDrinkHandler); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a possible output with the laser drill. - * - * @param weight Likelihood that this item will be produced. Lower means rarer. - * @param drop The thing being produced by the laser drill. - */ - public static void registerLaserOre(int weight, ItemStack drop) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerLaserOre", int.class, ItemStack.class); - reg.invoke(registry, weight, drop); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a preferred ore with the laser drill. Focuses with the specified color will make the specified ore more likely. - * Used by MFR itself for vanilla: Black (Coal), Light Blue (Diamond), Lime (Emerald), Yellow (Gold), Brown (Iron), Blue (Lapis), - * Red (Redstone), and White (nether quartz). - * - * This will replace setLaserPreferredOre on MC 1.6. - * - * @param color The color that the preferred ore is being set for. White is 0. - * @param ore The ore that will be preferred by the drill when a focus with the specified color is present. - */ - public static void addLaserPreferredOre(int color, ItemStack ore) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("addLaserPreferredOre", int.class, ItemStack.class); - reg.invoke(registry, color, ore); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a block ID as a fruit tree log. When the Fruit Picker sees this block on the ground, it will - * begin a search in tree mode for any fruit nearby. - * - * @param fruitLogBlockId The block ID to mark as a fruit tree log. - */ - public static void registerFruitLogBlockId(Integer fruitLogBlockId) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerFruitLogBlockId", Integer.class); - reg.invoke(registry, fruitLogBlockId); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers a fruit for the Fruit Picker. - * - * @param fruit The fruit to be picked. - */ - public static void registerFruit(IFactoryFruit fruit) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerFruit", IFactoryFruit.class); - reg.invoke(registry, fruit); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers an entity string as an invalid entry for the autospawner. - * See also: {@link net.minecraft.entity.EntityList}'s classToStringMapping and stringToClassMapping. - * - * @param entityString The entity string to blacklist. - */ - public static void registerAutoSpawnerBlacklist(String entityString) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerAutoSpawnerBlacklist", String.class); - reg.invoke(registry, entityString); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - /** - * Registers logic circuit to be usable in the Programmable RedNet Controller. - * - * @param circuit The circuit to be registered. - */ - public static void registerRedNetLogicCircuit(IRedNetLogicCircuit circuit) - { - try - { - Class registry = Class.forName("powercrystals.minefactoryreloaded.MFRRegistry"); - if(registry != null) - { - Method reg = registry.getMethod("registerRedNetLogicCircuit", IRedNetLogicCircuit.class); - reg.invoke(registry, circuit); - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java deleted file mode 100644 index b4f16603c62..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java +++ /dev/null @@ -1,42 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; - -import net.minecraft.item.ItemStack; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; - -/** - * NO-OP - * @deprecated for FactoryRegistry - */ -@Deprecated -public class FarmingRegistry -{ - private static void alert() - { - FMLLog.severe("%s is using a removed API and may crash the game.", - Loader.instance().activeModContainer().getName()); - new Throwable().printStackTrace(); - } - public static void registerPlantable(IFactoryPlantable plantable) { alert(); } - public static void registerHarvestable(IFactoryHarvestable harvestable) { alert(); } - public static void registerFertilizable(IFactoryFertilizable fertilizable) { alert(); } - public static void registerFertilizer(IFactoryFertilizer fertilizer) { alert(); } - public static void registerRanchable(IFactoryRanchable ranchable) { alert(); } - public static void registerGrindable(IFactoryGrindable grindable) { alert(); } - public static void registerSludgeDrop(int weight, ItemStack drop) { alert(); } - public static void registerBreederFood(Class entityToBreed, ItemStack food) { alert(); } - public static void registerSafariNetHandler(ISafariNetHandler handler) { alert(); } - public static void registerMobEggHandler(IMobEggHandler handler) { alert(); } - public static void registerRubberTreeBiome(String biome) { alert(); } - public static void registerSafariNetBlacklist(Class blacklistedEntity) { alert(); } - public static void registerVillagerTradeMob(IRandomMobProvider mobProvider) { alert(); } - public static void registerLiquidDrinkHandler(int liquidId, ILiquidDrinkHandler liquidDrinkHandler) { alert(); } - public static void registerLaserOre(int weight, ItemStack drop) { alert(); } - public static void setLaserPreferredOre(int color, ItemStack ore) { alert(); } - public static void registerFruitLogBlockId(Integer fruitLogBlockId) { alert(); } - public static void registerFruit(IFactoryFruit fruit) { alert(); } - public static void registerAutoSpawnerBlacklist(String entityString) { alert(); } - public static void registerRedNetLogicCircuit(IRedNetLogicCircuit circuit) { alert(); } -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java b/src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java deleted file mode 100644 index 15e8bfb362b..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java +++ /dev/null @@ -1,23 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * - * Determines what kind of action a given fertilizer can perform. Your IFactoryFertilizable instances should check this before - * performing any action to maintain future compatibility. - */ -public enum FertilizerType -{ - /** - * The fertilizer will fertilize grass. - */ - Grass, - /** - * The fertilizer will grow a plant. - */ - GrowPlant, - /** - * The fertilizer will grow magical crops. - */ - GrowMagicalCrop, -} \ No newline at end of file diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java deleted file mode 100644 index 1552eb57c93..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java +++ /dev/null @@ -1,34 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * - * Determines what algorithm the Harvester uses when it encounters this IFactoryHarvestable in the world. - */ -public enum HarvestType -{ - /** - * Just break the single block - no special action needed. Carrots, flowers, etc. - */ - Normal, - /** - * Search for identical blocks above. - */ - Column, - /** - * Search for identical blocks above but leave this bottom one for the future. Cactus and sugarcane. - */ - LeaveBottom, - /** - * This block is the base of a tree and the harvester should enter tree-cutting mode. - */ - Tree, - /** - * This block is the base of the tree and the harvester should enter tree-cutting mode, but the tree grows upside-down. - */ - TreeFlipped, - /** - * This block is part of a tree as above, but leaves are cut before tree logs so that leaves do not decay more than necessary. - */ - TreeLeaf -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java deleted file mode 100644 index 02d36faec17..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ /dev/null @@ -1,26 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -public interface IDeepStorageUnit -{ - /** - * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize(). - */ - ItemStack getStoredItemType(); - - /** - * Sets the total amount of the item currently being stored, or zero if it wants to remove all items. - */ - void setStoredItemCount(int amount); - - /** - * Sets the type of the stored item and initializes the number of stored items to amount. Will overwrite any existing stored items. - */ - void setStoredItemType(ItemStack type, int amount); - - /** - * @return The maximum number of items the DSU can hold. - */ - int getMaxStoredCount(); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java deleted file mode 100644 index 1374d597c32..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java +++ /dev/null @@ -1,40 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.Random; - -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a fertilizable block, and the process to fertilize it. You can assume that you will never have to check that block ID matches the one returned by - * getFertilizableBlockId(). - */ -public interface IFactoryFertilizable -{ - /** - * @return The block ID this instance is managing. - */ - public int getFertilizableBlockId(); - - /** - * @param world The world this block belongs to. - * @param x The X coordinate of this block. - * @param y The Y coordinate of this block. - * @param z The Z coordinate of this block. - * @param fertilizerType The kind of fertilizer being used. - * @return True if the block at (x,y,z) can be fertilized with the given type of fertilizer. - */ - public boolean canFertilizeBlock(World world, int x, int y, int z, FertilizerType fertilizerType); - - /** - * @param world The world this block belongs to. - * @param rand A Random instance to use when fertilizing, if necessary. - * @param x The X coordinate of this block. - * @param y The Y coordinate of this block. - * @param z The Z coordinate of this block. - * @param fertilizerType The kind of fertilizer being used. - * @return True if fertilization was successful. If false, the Fertilizer will not consume a fertilizer item and will not drain power. - */ - public boolean fertilize(World world, Random rand, int x, int y, int z, FertilizerType fertilizerType); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java deleted file mode 100644 index 08589c121f7..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java +++ /dev/null @@ -1,33 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - * - * Defines a fertilizer item for use in the Fertilizer. - */ -public interface IFactoryFertilizer -{ - /** - * @return The ID of this fertilizer item. - */ - int getFertilizerId(); - - /** - * @return The metadata of this fertilizer item. - */ - int getFertilizerMeta(); - - /** - * @return The type of fertilizer this is. - */ - FertilizerType getFertilizerType(); - - /** - * Called when a fertilization is successful. If you set the ItemStack size to 0, it will be deleted by the fertilizer. - * - * @param fertilizer The ItemStack used to fertilize. - */ - void consume(ItemStack fertilizer); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java deleted file mode 100644 index 65ed9f96b57..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java +++ /dev/null @@ -1,69 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Random; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Defines a fruit entry for the Fruit Picker. - * - * @author powercrystals - * - */ -public interface IFactoryFruit -{ - /** - * @return The block ID this fruit has in the world. - */ - public int getSourceBlockId(); - - /** - * Used to determine if this fruit can be picked (is it ripe yet, etc) - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - * @return True if the fruit can be picked - */ - public boolean canBePicked(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker to determine what block to replace the picked block with. Only ID and meta/damage will be used. - * At the time this method is called, the fruit still exists. Do not pass an item ID as the return value. - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - * @return The block to replace the fruit block with, or null for air. - */ - public ItemStack getReplacementBlock(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker before the fruit is picked. - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public void prePick(World world, int x, int y, int z); - - /** - * Called by the Fruit Picker to determine what drops to generate. At the time this method is called, the fruit still exists. - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public List getDrops(World world, Random rand, int x, int y, int z); - - /** - * Called by the Fruit Picker after the fruit is picked. - * @param world The world where the fruit is being picked - * @param x The x-coordinate of the fruit - * @param y The y-coordinate of the fruit - * @param z The z-coordinate of the fruit - */ - public void postPick(World world, int x, int y, int z); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java deleted file mode 100644 index 88eef0615dc..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java +++ /dev/null @@ -1,36 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a grindable entity for the Grinder. - */ -@SuppressWarnings("deprecation") -public interface IFactoryGrindable -{ - /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLivingBase or the entity will never - * be noticed by the Grinder. - */ - public Class getGrindableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ground. - * @param random A Random instance. - * @return The drops generated when this entity is killed. - */ - public List grind(World world, EntityLivingBase entity, Random random); - - /** - * @param entity The entity instance being ground. - * @return Whether this entity has been fully processed or not. - */ - public boolean processEntity(EntityLivingBase entity); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java deleted file mode 100644 index 63707375a28..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java +++ /dev/null @@ -1,71 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a harvestable block for the Harvester. - */ -public interface IFactoryHarvestable -{ - /** - * @return The block ID this harvestable instance is managing. - */ - public int getPlantId(); - - /** - * @return The type of harvest the Harvester should perform on this block. - */ - public HarvestType getHarvestType(); - - - /** - * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself. - */ - public boolean breakBlock(); - - /** - * @param world The world this block is in. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return True if this block can be harvested. - */ - public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z); - - /** - * @param world The world this block is in. - * @param rand A Random instance to use when generating drops. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient. - */ - public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z); - - /** - * Called before the block is going to be harvested. Usually empty. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void preHarvest(World world, int x, int y, int z); - - /** - * Called after the block is going to be harvested. Used to re-till soil, for example. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void postHarvest(World world, int x, int y, int z); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java deleted file mode 100644 index 29bc7fbc6f5..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java +++ /dev/null @@ -1,67 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a plantable object for use in the Planter. - */ -public interface IFactoryPlantable -{ - /** - * @return The block or item ID this plantable is managing. - */ - public int getSeedId(); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return The block ID that will be placed into the world. - */ - public int getPlantedBlockId(World world, int x, int y, int z, ItemStack stack); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return The block metadata that will be placed into the world. - */ - public int getPlantedBlockMetadata(World world, int x, int y, int z, ItemStack stack); - - /** - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - * @return True if this plantable can be placed at the provided coordinates. - */ - public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack stack); - - /** - * Called before planting is performed. Used to till soil, for example. - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - */ - public void prePlant(World world, int x, int y, int z, ItemStack stack); - - /** - * Called after planting is performed. Usually empty. - * @param world The world instance this block or item will be placed into. - * @param x The destination X coordinate. - * @param y The destination Y coordinate. - * @param z The destination Z coordinate. - * @param stack The stack being planted. - */ - public void postPlant(World world, int x, int y, int z, ItemStack stack); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java deleted file mode 100644 index 36327c53761..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java +++ /dev/null @@ -1,28 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.inventory.IInventory; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a ranchable entity for use in the Rancher. - */ -public interface IFactoryRanchable -{ - /** - * @return The entity being ranched. Must be a subtype of EntityLivingBase. - */ - public Class getRanchableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ranched. - * @param rancher The rancher instance doing the ranching. Used to access the Rancher's inventory when milking cows, for example. - * @return A list of drops. - */ - public List ranch(World world, EntityLivingBase entity, IInventory rancher); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java deleted file mode 100644 index 2ab4a586796..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.player.EntityPlayer; - -public interface ILiquidDrinkHandler -{ - public void onDrink(EntityPlayer player); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java deleted file mode 100644 index a322f923f0b..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityEggInfo; -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - * - * Defines a class that MFR will use to local egg info for a given mob. This is used to color the Safari Net based on the captured mob. - */ -public interface IMobEggHandler -{ - /** - * @param safariNet The Safari Net that is looking for egg info. - * @return An EntityEggInfo, or null if this instance cannot handle this mob. - */ - public EntityEggInfo getEgg(ItemStack safariNet); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java b/src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java deleted file mode 100644 index db061304755..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java +++ /dev/null @@ -1,12 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -public interface INeedleAmmo -{ - public boolean onHitEntity(EntityPlayer owner, Entity hit, double distance); - public void onHitBlock(EntityPlayer owner, World world, int x, int y, int z, int side, double distance); - public float getSpread(); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java deleted file mode 100644 index b03d6f08a3b..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; - -import net.minecraft.world.World; - - -public interface IRandomMobProvider -{ - public List getRandomMobs(World world); -} \ No newline at end of file diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java deleted file mode 100644 index 370017956a2..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java +++ /dev/null @@ -1,28 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - * - * Defines an object that can display information about a captured mob in a Safari net. - */ -public interface ISafariNetHandler -{ - /** - * @return The class of mob that this handler applies to. - */ - public Class validFor(); - - /** - * @param safariNetStack The Safari Net that is requesting information. - * @param player The player holding the Safari Net. - * @param infoList The current list of information strings. Add yours to this. - * @param advancedTooltips True if the advanced tooltips option is on. - */ - @SuppressWarnings("rawtypes") - public void addInformation(ItemStack safariNetStack, EntityPlayer player, List infoList, boolean advancedTooltips); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java deleted file mode 100644 index 75cff08db01..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java +++ /dev/null @@ -1,31 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a syringe for use in the Vet machine. - */ -public interface ISyringe -{ - /** - * Called when the vet is deciding if it should use this syringe. - * @param world The world instance. - * @param entity The entity being injected. - * @param syringe The syringe ItemStack. - * @return True if the entity can be injected by this syringe. - */ - public boolean canInject(World world, EntityLivingBase entity, ItemStack syringe); - - /** - * Called to perform an injection. - * @param world The world instance. - * @param entity The entity being injected. - * @param syringe The syringe ItemStack. - * @return True if injection was successful. - */ - public boolean inject(World world, EntityLivingBase entity, ItemStack syringe); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java deleted file mode 100644 index 09ce777131a..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java +++ /dev/null @@ -1,9 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * Defines a tool that can rotate MFR machines. Implement on an Item class. Requires no additional work on your part. - */ -public interface IToolHammer -{ -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java deleted file mode 100644 index 9c45234952e..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java +++ /dev/null @@ -1,16 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -/** - * @author PowerCrystals - * - * This interface is like IToolHammer, but is for items that change state on a per-stack basis. Implement this - * instead of IToolHammer - not both! - * - * This interface will replace IToolHammer in MC 1.6. - */ -public interface IToolHammerAdvanced -{ - public boolean isActive(ItemStack stack); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java deleted file mode 100644 index c6c6dcb360b..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java +++ /dev/null @@ -1,21 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomItem; - -public class MobDrop extends WeightedRandomItem -{ - private ItemStack _stack; - - public MobDrop(int weight, ItemStack stack) - { - super(weight); - _stack = stack; - } - - public ItemStack getStack() - { - if(_stack == null) return null; - return _stack.copy(); - } -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java b/src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java deleted file mode 100644 index 86791cc5468..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java +++ /dev/null @@ -1,68 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -/** - * @author skyboy026 - * - * Defines an ItemStack or a FluidStack that is the result of an entity being ranched - */ -public final class RanchedItem { - private final ItemStack item; - private final FluidStack fluid; - - public RanchedItem(Block item, int amount, int meta) - { - this(new ItemStack(item, amount, meta)); - } - - public RanchedItem(Block item, int amount) - { - this(new ItemStack(item, amount)); - } - - public RanchedItem(Block item) - { - this(new ItemStack(item)); - } - - public RanchedItem(Item item, int amount, int meta) - { - this(new ItemStack(item, amount, meta)); - } - - public RanchedItem(Item item, int amount) - { - this(new ItemStack(item, amount)); - } - - public RanchedItem(Item item) - { - this(new ItemStack(item)); - } - - public RanchedItem(ItemStack item) - { - this.item = item; - fluid = null; - } - - public RanchedItem(FluidStack fluid) - { - this.fluid = fluid; - item = null; - } - - public boolean hasFluid() - { - return item == null & fluid != null; - } - - public Object getResult() - { - return item == null ? fluid : item; - } -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java b/src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java deleted file mode 100644 index 063699dd6eb..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java +++ /dev/null @@ -1,21 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.Entity; -import net.minecraft.util.WeightedRandomItem; - -public class RandomMob extends WeightedRandomItem -{ - private Entity _mob; - - public RandomMob(Entity savedMob, int weight) - { - super(weight); - _mob = savedMob; - } - - public Entity getMob() - { - if(_mob == null) return null; - return _mob; - } -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java deleted file mode 100644 index 3c8529db96e..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java +++ /dev/null @@ -1,86 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - * Note that when you implement this, the RedNet network makes several assumptions about your code - - * primarily, it will not clamp values to 0 <= x <= 15. This means you must be able to accept any - * possible integer without crashing, even negatives. It will also assume that calling the onInput(s)Changed() - * methods are sufficient, and will not issue block updates. Finally, it will never call the vanilla redstone - * output methods in All mode, and will only query the methods contained in this interface in that case. In Single - * mode, it will call onInputChanged, and will check for strong power (or weak if in Plate mode) through the vanilla - * method calls. - * - * RedNet cables have their subnets indicated to the user by colored bands on the cable. - * The color of a given subnet is the same as the wool with metadata equal to the subnet number. - * For reference: - * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, - * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black - */ -public interface IConnectableRedNet -{ - /** - * Returns the connection type of this Block. "All" types will cause getOutputValues() and onInputsChanged() to be used, - * whereas "Single" types will onInputChanged() to be called for input changes and the normal redstone power output methods - * to be called for output. If this value must be changed while the block is alive, it must perform a block update on any - * adjacent RedNet wires. - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side that connection information is required for. - * @return The connection type. - */ - public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side); - - /** - * Returns the output values of this RedNet node. This array must be 16 elements long. Only called if your block is connected in "All" mode. - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output values are required for. - * @return The output values. - */ - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side); - - /** - * Returns the output value of this RedNet node for a given subnet. Only called if your block is connected in "All" mode. - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output value is required for. - * @param subnet The subnet to get the output value for (0-15). - * @return The output value. - */ - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet); - - /** - * Called when the input values to this block change. Only called if your block is connected in "All" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValues The new set of input values. This array will be 16 elements long. - */ - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues); - - /** - * Called when the input value to this block changes. Only called if your block is connected in "Single" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValue The new input value - */ - public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java deleted file mode 100644 index b670f403bbe..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java +++ /dev/null @@ -1,6 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -public interface IRedNetDecorative -{ - -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java deleted file mode 100644 index 0bbbeeb9b14..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java +++ /dev/null @@ -1,19 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.nbt.NBTTagCompound; - -public interface IRedNetLogicCircuit -{ - public int getInputCount(); - - public int getOutputCount(); - - public int[] recalculateOutputValues(long worldTime, int[] inputValues); - - public String getUnlocalizedName(); - public String getInputPinLabel(int pin); - public String getOutputPinLabel(int pin); - - public void readFromNBT(NBTTagCompound tag); - public void writeToNBT(NBTTagCompound tag); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java deleted file mode 100644 index 5e27b1fe9df..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java +++ /dev/null @@ -1,31 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; - -/** - * - * You should not implement this yourself. Instead, use this to look for cables to notify from your IConnectableRedNet as this does not - * require a block update. This will be implemented on the cable's Block class. - * - */ -public interface IRedNetNetworkContainer -{ - /** - * Tells the network to recalculate all subnets. - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - */ - public void updateNetwork(World world, int x, int y, int z); - - /** - * Tells the network to recalculate a specific subnet. - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - * @param subnet The subnet to recalculate. - */ - public void updateNetwork(World world, int x, int y, int z, int subnet); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java deleted file mode 100644 index 8ff95dd49e0..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java +++ /dev/null @@ -1,6 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -public interface IRedNetNoConnection -{ - -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java deleted file mode 100644 index eb4eba5836c..00000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java +++ /dev/null @@ -1,65 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import java.util.HashMap; -import java.util.Map; - -/** - * Defines how RedNet cable connects to a block - * - * None: RedNet will never connect to this block (if this is all you want: use IRedNetNoConnection) - * - * CableSingle: Connections will use the cable renderer with a single band, best used for whole blocks - * PlateSingle: Connections will use the plate renderer with a single band, used for conveyers and rails - * - * CableAll: Connections permit access to all 16 bands - * PlateAll: Connections permit access to all 16 bands - * - * Forced connection modes are best used for decoration blocks: RedNet will not connect normally, but will if the user forces it - * Typically, IRedNetDecorative is desired for this instead - * - * ForcedCableSingle: Connections permit access to a single band only when the cable is in forced connection mode - * ForcedPlateSingle: Connections permit access to a single band only when the cable is in forced connection mode - * - * ForcedCableAll: Connections permit access to all 16 bands only when the cable is in forced connection mode - * ForcedPlateAll: Connections permit access to all 16 bands only when the cable is in forced connection mode - */ -public enum RedNetConnectionType -{ - None, // 0 - CableSingle, // 11 - PlateSingle, // 13 - CableAll, // 19 - PlateAll, // 21 - ForcedCableSingle, // 43 - ForcedPlateSingle, // 45 - ForcedCableAll, // 51 - ForcedPlateAll; // 53 - - public final boolean isConnected = this.ordinal() != 0; - public final boolean isSingleSubnet = this.name().endsWith("Single"); - public final boolean isAllSubnets = this.name().endsWith("All"); - public final boolean isConnectionForced = this.name().startsWith("Forced"); - public final boolean isPlate = this.name().contains("Plate"); - public final boolean isCable = this.name().contains("Cable"); - public final short flags = toFlags(isConnected, isCable, isPlate, isSingleSubnet, isAllSubnets, isConnectionForced); - - public static final RedNetConnectionType fromFlags(short flags) - { - return connections.get(flags); - } - - private static final short toFlags(boolean ...flags) - { - short ret = 0; - for (int i = flags.length; i --> 0;) - ret |= (flags[i] ? 1 : 0) << i; - return ret; - } - - private static final Map connections = new HashMap(); - - static { - for (RedNetConnectionType type : RedNetConnectionType.values()) - connections.put(type.flags, type); - } -} diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index 51b6088a2a6..71f43ec564d 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -1,12 +1,5 @@ package tconstruct.blocks; -import static net.minecraftforge.common.ForgeDirection.DOWN; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.SOUTH; -import static net.minecraftforge.common.ForgeDirection.UP; -import static net.minecraftforge.common.ForgeDirection.WEST; - import java.util.Iterator; import java.util.List; import java.util.Random; @@ -15,7 +8,7 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.EnumMobType; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -26,12 +19,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import tconstruct.TConstruct; import tconstruct.blocks.logic.LandmineExplodeLogic; import tconstruct.blocks.logic.TileEntityLandmine; @@ -127,7 +119,7 @@ public void onBlockClicked (World par1World, int par2, int par3, int par4, Entit } @Override - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("tinker:Landmine"); } diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index 7e89fbf83c5..a5c3eca1a33 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -2,13 +2,13 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import tconstruct.blocks.logic.CastingChannelLogic; import tconstruct.client.block.BlockRenderCastingChannel; import tconstruct.library.TConstructRegistry; @@ -93,7 +93,7 @@ public int getRenderType () } @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { this.blockIcon = iconRegister.registerIcon("tinker:searedstone"); } diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index 15d2f71f923..72542d0bc2b 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -3,13 +3,13 @@ import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -22,9 +22,9 @@ public class ConveyorBase extends MantleBlock { String texturename; - public ConveyorBase(int ID, Material material, String name) + public ConveyorBase(Material material, String name) { - super(ID, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); setBlockBounds(0f, 0f, 0f, 1f, 0.5f, 1f); texturename = name; @@ -136,10 +136,10 @@ public int getRenderType () } @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { String[] textureNames = new String[] { texturename, texturename + "_flow" }; - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -149,7 +149,7 @@ public void registerIcons (IconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta >= 8) return icons[0]; diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index aad0eb90549..561c9d2c181 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -25,9 +25,9 @@ public class DryingRack extends InventoryBlock { - public DryingRack(int id) + public DryingRack() { - super(id, Material.wood); + super(Material.wood); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(2.0f); setStepSound(soundMetalFootstep); @@ -222,7 +222,7 @@ public String[] getTextureNames () } @Override - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return Block.planks.getIcon(side, 0); } diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 67908695e68..ced51b0048f 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -48,7 +48,7 @@ public Icon getIcon (int side, int meta) } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { //this.blockIcon = par1iconRegister.registerIcon(Block.blockIron.getUnlocalizedName()); } diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 0fe278b0152..80fb0e96dd9 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -1,10 +1,10 @@ package tconstruct.blocks; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; @@ -18,9 +18,9 @@ public class FurnaceSlab extends InventorySlab { - public FurnaceSlab(int id, Material material) + public FurnaceSlab(Material material) { - super(id, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(3.5f); } diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index 863cacb0c26..07be6dc84f5 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -2,18 +2,18 @@ import cpw.mods.fml.relauncher.*; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.*; public class GlassBlock extends TConstructBlock { static String blockTextures[] = { "glass_clear", "soulglass", "soulglass_clear" }; - public GlassBlock(int id) + public GlassBlock() { - super(id, Material.glass, 3f, blockTextures); + super(Material.glass, 3f, blockTextures); } public boolean isOpaqueCube () @@ -63,9 +63,9 @@ public float getExplosionResistance (Entity entity, World world, int x, int y, i @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index 40387ae2398..e4671381ae6 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -4,10 +4,10 @@ import tconstruct.util.config.PHConstruct; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -18,18 +18,18 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected { public String[] textures; - public Icon[][] icons; + public IIcon[][] icons; boolean ignoreMetaForConnectedGlass = PHConstruct.connectedTexturesMode == 2; public GlassBlockConnectedMeta(int par1, String location, boolean hasAlpha, String... textures) { super(par1, location, hasAlpha); this.textures = textures; - this.icons = new Icon[textures.length][16]; + this.icons = new IIcon[textures.length][16]; } @Override - public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public IIcon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { int meta = par1IBlockAccess.getBlockMetadata(par2, par3, par4); if (meta < icons.length) @@ -64,7 +64,7 @@ public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List } @Override - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { for (int i = 0; i < textures.length; i++) { diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java index 25bd9db520d..cdb368c70fe 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/blocks/GlassBlockStained.java @@ -1,8 +1,8 @@ package tconstruct.blocks; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -12,9 +12,9 @@ public class GlassBlockStained extends TConstructBlock static String blockTextures[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; String textureName; - public GlassBlockStained(int id, String tex) + public GlassBlockStained(String tex) { - super(id, Material.glass, 3f, blockTextures); + super(Material.glass, 3f, blockTextures); this.textureName = tex; } diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 0009ed9489d..f2b8c2d9864 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -7,18 +7,18 @@ import tconstruct.client.block.PaneConnectedRender; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class GlassPaneConnected extends GlassBlockConnected { - private Icon theIcon; + private IIcon theIcon; public GlassPaneConnected(int par1, String location, boolean hasAlpha) { @@ -47,7 +47,7 @@ public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, } @Override - public Icon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) + public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) { if (par5 == 0 || par5 == 1) { @@ -672,7 +672,7 @@ public final boolean canThisPaneConnectToThisBlockID (int par1) return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Block.glass.blockID; } - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); this.theIcon = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_side"); diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index dae64425af3..cc3f5026b9c 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -4,19 +4,19 @@ import java.util.Random; import tconstruct.library.TConstructRegistry; - +import net.minecraft.block.Block; import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; public class GravelOre extends BlockSand { public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; - public Icon[] icons; + public IIcon[] icons; public GravelOre(int id) { @@ -25,9 +25,9 @@ public GravelOre(int id) this.setStepSound(soundGravelFootstep); } - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -36,7 +36,7 @@ public void registerIcons (IconRegister iconRegister) } @Override - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta]; } @@ -66,11 +66,11 @@ public int idDropped (int par1, Random par2Random, int par3) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } } diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index 99de57b14c3..30df0b178a4 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -1,11 +1,11 @@ package tconstruct.blocks; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.util.DamageSource; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java index 92c9494c890..3eeb3a633e6 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/blocks/MultiBrick.java @@ -2,10 +2,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -147,9 +147,9 @@ public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int si @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index a8ed4084e2a..7613bbebd3b 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -2,10 +2,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index 2d79c44ae42..dffb65ba38b 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -7,12 +7,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -22,12 +22,12 @@ public class PaneBase extends Block { public String[] textureNames; public String folder; - public Icon[] icons; - public Icon[] sideIcons; + public IIcon[] icons; + public IIcon[] sideIcons; - public PaneBase(int id, Material material, String folder, String[] blockTextures) + public PaneBase(Material material, String folder, String[] blockTextures) { - super(id, material); + super(material); textureNames = blockTextures; this.folder = folder; } @@ -38,17 +38,17 @@ public boolean canConnectTo (int blockID) return Block.opaqueCubeLookup[blockID] || block instanceof PaneBase || block instanceof BlockPane || blockID == Block.glass.blockID; } - public Icon getSideTextureIndex (int meta) + public IIcon getSideTextureIndex (int meta) { return sideIcons[meta]; } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; - this.sideIcons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; + this.sideIcons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -59,17 +59,17 @@ public void registerIcons (IconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta]; } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index b7dbf0ac23c..23be301e6ba 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -1,7 +1,9 @@ package tconstruct.blocks; import java.util.List; + import mantle.blocks.abstracts.InventoryBlock; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -20,18 +22,18 @@ public class SearedBlock extends InventoryBlock { - public SearedBlock(int id) + public SearedBlock() { - super(id, Material.rock); + super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(3F); setResistance(20F); setStepSound(soundMetalFootstep); } - public SearedBlock(int id, String texture) + public SearedBlock(String texture) { - this(id); + this(); this.texturePrefix = texture; } @@ -243,11 +245,11 @@ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, in } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index 1d3f237e9b9..468defe7cb0 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -5,32 +5,34 @@ import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class SearedSlab extends SlabBase { - public SearedSlab(int id) + public SearedSlab() { - super(id, Material.rock); + //TODO material.rock + super(Material.field_151576_e); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(12F); } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8; if (meta == 0) @@ -42,11 +44,11 @@ public Icon getIcon (int side, int meta) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } } diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index f658e0c34a3..dd755d98979 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -5,12 +5,12 @@ import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; @@ -23,15 +23,15 @@ public class SlabBase extends MantleBlock int startingMeta; int totalSize; - public SlabBase(int id, Material material) + public SlabBase(Material material) { - super(id, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); } - public SlabBase(int id, Material material, Block model, int meta, int totalSize) + public SlabBase(Material material, Block model, int meta, int totalSize) { - super(id, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.modelBlock = model; this.startingMeta = meta; @@ -80,24 +80,24 @@ public boolean renderAsNormalBlock () @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8 + startingMeta; return modelBlock.getIcon(side, meta); } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < totalSize; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/SlimeExplosive.java b/src/main/java/tconstruct/blocks/SlimeExplosive.java index aee9cea8683..59809a78489 100644 --- a/src/main/java/tconstruct/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/blocks/SlimeExplosive.java @@ -2,6 +2,7 @@ import java.util.List; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -11,7 +12,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; import tconstruct.entity.item.ExplosivePrimed; @@ -21,9 +22,9 @@ public class SlimeExplosive extends TConstructBlock { - public SlimeExplosive(int id) + public SlimeExplosive() { - super(id, Material.tnt, 0f, getTextureNames()); + super(Material.tnt, 0f, getTextureNames()); } static String[] getTextureNames () @@ -41,17 +42,17 @@ static String[] getTextureNames () @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[(meta / 2) * 3 + getSideTextureIndex(side)]; } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 2; iter++) { - list.add(new ItemStack(id, 1, iter * 2)); + list.add(new ItemStack(b, 1, iter * 2)); } } diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index 22c46bd7766..daa8540ffed 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -3,13 +3,13 @@ import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.client.block.SlimePadRender; @@ -22,9 +22,9 @@ public class SlimePad extends MantleBlock { - public SlimePad(int par1, Material par2Material) + public SlimePad(Material par2Material) { - super(par1, par2Material); + super(par2Material); setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.625F, 0.875F); this.setCreativeTab(TConstructRegistry.blockTab); } @@ -131,17 +131,17 @@ public void registerIcons (IconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return TRepo.slimeGel.getIcon(side, 1); } - public Icon getFluidIcon (int meta) + public IIcon getFluidIcon (int meta) { return TRepo.slimeChannel.getIcon(2, 0); } - public Icon getNubIcon (int meta) + public IIcon getNubIcon (int meta) { return TRepo.slimeGel.getIcon(0, 0); } diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index d579197141b..47062ae51ff 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -31,9 +32,9 @@ public class SmelteryBlock extends InventoryBlock Random rand; String texturePrefix = ""; - public SmelteryBlock(int id) + public SmelteryBlock() { - super(id, Material.rock); + super(Material.rock); setHardness(3F); setResistance(20F); setStepSound(soundMetalFootstep); @@ -42,9 +43,9 @@ public SmelteryBlock(int id) this.setUnlocalizedName("tconstruct.Smeltery"); } - public SmelteryBlock(int id, String prefix) + public SmelteryBlock(String prefix) { - this(id); + this(); texturePrefix = prefix; } @@ -69,7 +70,7 @@ public String[] getTextureNames () return textureNames; } - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta < 2) { @@ -89,7 +90,7 @@ else if (meta == 11) return icons[3 + meta]; } - public Icon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) + public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getBlockTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; @@ -268,12 +269,12 @@ public void breakBlock (World world, int x, int y, int z, int par5, int par6) // }*/ @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 12; iter++) { if (iter != 3) - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/blocks/SoilBlock.java index a7c8f185bec..7dc097000ed 100644 --- a/src/main/java/tconstruct/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/blocks/SoilBlock.java @@ -15,16 +15,15 @@ public class SoilBlock extends TConstructBlock { static String[] soilTypes = new String[] { "slimesand", "grout", "slimesandblue", "graveyardsoil", "consecratedsoil", "slimedirt_blue", "nether_grout" }; - public SoilBlock(int id) + public SoilBlock() { - super(id, Material.ground, 3.0F, soilTypes); + super(Material.ground, 3.0F, soilTypes); } @Override public void onEntityWalking (World world, int x, int y, int z, Entity entity) { if (entity instanceof EntityLivingBase) - { EntityLivingBase living = ((EntityLivingBase) entity); if (living.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD) { diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java index 2e3ee47e7da..235b14962fa 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/blocks/SoilSlab.java @@ -4,10 +4,10 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; import tconstruct.common.TContent; @@ -18,22 +18,22 @@ public class SoilSlab extends SlabBase { - public SoilSlab(int id) + public SoilSlab() { - super(id, Material.ground); + super(Material.ground); this.setCreativeTab(TConstructRegistry.blockTab); } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { this.blockIcon = iconRegister.registerIcon("tinker:grass_top"); } @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { switch (meta % 8) { @@ -49,11 +49,11 @@ public Icon getIcon (int side, int meta) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/SpeedBlock.java b/src/main/java/tconstruct/blocks/SpeedBlock.java index a5a2eca8f7d..facf5613659 100644 --- a/src/main/java/tconstruct/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/blocks/SpeedBlock.java @@ -2,6 +2,7 @@ import java.util.List; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -15,9 +16,9 @@ public class SpeedBlock extends TConstructBlock public static String[] textureNames = new String[] { "brownstone_rough", "brownstone_rough_road", "brownstone_smooth", "brownstone_smooth_brick", "brownstone_smooth_road", "brownstone_smooth_fancy", "brownstone_smooth_chiseled" }; - public SpeedBlock(int id) + public SpeedBlock() { - super(id, Material.rock, 3.0f, textureNames); + super(Material.rock, 3.0f, textureNames); //this.setBlockBounds(0f, 0f, 0f, 1.0f, 0.5f, 1.0f); } @@ -49,11 +50,11 @@ public int damageDropped (int meta) @Override @SideOnly(Side.CLIENT) - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } } diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java index 816f933dfb9..4b28a38168f 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/blocks/SpeedSlab.java @@ -5,45 +5,46 @@ import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class SpeedSlab extends SlabBase { - public SpeedSlab(int id) + public SpeedSlab() { - super(id, Material.rock); + super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(3F); } @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8; return TRepo.speedBlock.getIcon(side, meta); } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 7; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java index e02e2cfb115..099feb7e23a 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/blocks/StoneLadder.java @@ -2,9 +2,9 @@ import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; public class StoneLadder extends BlockLadder { @@ -15,21 +15,21 @@ public class StoneLadder extends BlockLadder private Icon icon; // Use the normally protected constructor - public StoneLadder(int id) + public StoneLadder() { - super(id); + super(); this.setUnlocalizedName("decoration.stoneladder"); this.setCreativeTab(CreativeTabs.tabDecorations); } @Override - public void registerIcons (IconRegister register) + public void registerIcons (IIconRegister register) { icon = register.registerIcon("tinker:ladder_stone"); } @Override - public Icon getIcon (int meta, int side) + public IIcon getIcon (int meta, int side) { return icon; } diff --git a/src/main/java/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/blocks/StoneTorch.java index 90bd0081b8b..6ead85d3ae3 100644 --- a/src/main/java/tconstruct/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/blocks/StoneTorch.java @@ -1,16 +1,16 @@ package tconstruct.blocks; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.SOUTH; -import static net.minecraftforge.common.ForgeDirection.WEST; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.Random; import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; @@ -23,7 +23,7 @@ public class StoneTorch extends MantleBlock { public StoneTorch(int id) { - super(id, Material.circuits); + super(Material.circuits); this.setCreativeTab(CreativeTabs.tabDecorations); setLightValue(0.9375F); } @@ -148,9 +148,9 @@ else if (par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true)) } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon("tinker:torch_stone"); + this.field_149761_L = par1IconRegister.registerIcon("tinker:torch_stone"); } /** diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 04e0bb1a3be..22fb7a501c1 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -7,23 +7,23 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class TConstructBlock extends MantleBlock { public String[] textureNames; - public Icon[] icons; + public IIcon[] icons; - public TConstructBlock(int id, Material material, float hardness, String[] tex) + public TConstructBlock( Material material, float hardness, String[] tex) { - super(id, material); + super( material); setHardness(hardness); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); textureNames = tex; } @@ -35,9 +35,9 @@ public int damageDropped (int meta) @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -47,7 +47,7 @@ public void registerIcons (IconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { return meta < icons.length ? icons[meta] : icons[0]; } @@ -64,11 +64,11 @@ public int getSideTextureIndex (int side) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block block, CreativeTabs tab, List list) { for (int iter = 0; iter < icons.length; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(block, 1, iter)); } } } diff --git a/src/main/java/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/blocks/TConstructFluid.java index b076a9555a3..a37103c21c4 100644 --- a/src/main/java/tconstruct/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/blocks/TConstructFluid.java @@ -1,8 +1,8 @@ package tconstruct.blocks; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import tconstruct.library.TConstructRegistry; @@ -11,14 +11,15 @@ public class TConstructFluid extends BlockFluidClassic { String texture; boolean alpha; - public Icon stillIcon; - public Icon flowIcon; + public IIcon stillIcon; + public IIcon flowIcon; public TConstructFluid(int id, Fluid fluid, Material material, String texture) { super(id, fluid, material); this.texture = texture; - this.setCreativeTab(TConstructRegistry.blockTab); + //TODO setCreativeTab() + this.func_149647_a(TConstructRegistry.blockTab); } public TConstructFluid(int id, Fluid fluid, Material material, String texture, boolean alpha) @@ -32,16 +33,17 @@ public int getRenderBlockPass () { return alpha ? 1 : 0; } - + //TODO registerIcons @Override - public void registerIcons (IconRegister iconRegister) + public void func_149651_a (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); } + //TODO getIcon() @Override - public Icon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { if (side == 0 || side == 1) return stillIcon; diff --git a/src/main/java/tconstruct/blocks/TMetalBlock.java b/src/main/java/tconstruct/blocks/TMetalBlock.java index 33c5443b224..c6df3d3465b 100644 --- a/src/main/java/tconstruct/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/blocks/TMetalBlock.java @@ -10,9 +10,9 @@ public class TMetalBlock extends TConstructBlock static String[] metalTypes = new String[] { "compressed_cobalt", "compressed_ardite", "compressed_manyullyn", "compressed_copper", "compressed_bronze", "compressed_tin", "compressed_aluminum", "compressed_alubrass", "compressed_alumite", "compressed_steel", "compressed_ender" }; - public TMetalBlock(int id, Material material, float hardness) + public TMetalBlock(Material material, float hardness) { - super(id, material, hardness, metalTypes); + super(material, hardness, metalTypes); this.setStepSound(Block.soundMetalFootstep); } diff --git a/src/main/java/tconstruct/blocks/TankAirBlock.java b/src/main/java/tconstruct/blocks/TankAirBlock.java index 0b3acecd258..8c684a697a0 100644 --- a/src/main/java/tconstruct/blocks/TankAirBlock.java +++ b/src/main/java/tconstruct/blocks/TankAirBlock.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +24,7 @@ public class TankAirBlock extends BlockContainer public TankAirBlock(int id, Material material) { - super(id, material); + super(material); } @Override @@ -40,7 +40,7 @@ public int getRenderType () } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { } diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index b9008a211d1..0404082f6b5 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -5,15 +5,14 @@ import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import tconstruct.TConstruct; import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.client.block.TableForgeRender; @@ -24,9 +23,9 @@ public class ToolForgeBlock extends InventoryBlock { - public ToolForgeBlock(int id, Material material) + public ToolForgeBlock(Material material) { - super(id, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); this.setStepSound(Block.soundWoodFootstep); @@ -42,17 +41,17 @@ public String[] getTextureNames () return textureNames; } - Icon textureTop; + IIcon textureTop; @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { super.registerIcons(iconRegister); textureTop = iconRegister.registerIcon("tinker:toolforge_top"); } @Override - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 1) { diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index 9bb219b9c38..b497d5a90ad 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -20,16 +20,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class ToolStationBlock extends InventoryBlock { public ToolStationBlock(int id, Material material) { - super(id, material); + super(material); this.setCreativeTab(TConstructRegistry.blockTab); this.setHardness(2f); this.setStepSound(Block.soundWoodFootstep); @@ -51,7 +51,7 @@ public String[] getTextureNames () } @Override - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta <= 4) { @@ -179,16 +179,16 @@ public Object getModInstance () } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } for (int iter = 10; iter < 14; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/WoodRail.java b/src/main/java/tconstruct/blocks/WoodRail.java index 897674ba8e5..84bd6000f1b 100644 --- a/src/main/java/tconstruct/blocks/WoodRail.java +++ b/src/main/java/tconstruct/blocks/WoodRail.java @@ -5,28 +5,28 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockBaseRailLogic; import net.minecraft.block.BlockRailBase; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; public class WoodRail extends BlockRailBase { @SideOnly(Side.CLIENT) - private Icon theIcon; + private IIcon theIcon; - public WoodRail(int par1) + public WoodRail() { - super(par1, false); + super(false); } @SideOnly(Side.CLIENT) /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public Icon getIcon (int par1, int par2) + public IIcon getIcon (int par1, int par2) { - return par2 >= 6 ? this.theIcon : this.blockIcon; + return par2 >= 6 ? this.theIcon : this.field_149761_L; } @SideOnly(Side.CLIENT) @@ -34,9 +34,9 @@ public Icon getIcon (int par1, int par2) * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { - this.blockIcon = par1IconRegister.registerIcon("tinker:woodrail"); + this.field_149761_L = par1IconRegister.registerIcon("tinker:woodrail"); this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn"); } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 45f67b4182c..84befa25f2b 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -6,11 +6,11 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; +import net.minecraft.network.Packet; import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index 0b123a29c60..e3ba8855cad 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -4,9 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; +import net.minecraft.network.Packet; import net.minecraft.network.packet.Packet132TileEntityData; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index e2e85cb5d2d..a8d09319f3c 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -4,10 +4,10 @@ import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; @@ -17,8 +17,8 @@ public class SlimeFluid extends BlockFluidClassic { - Icon stillIcon; - Icon flowIcon; + IIcon stillIcon; + IIcon flowIcon; public SlimeFluid(int id, Fluid fluid, Material material) { @@ -27,7 +27,7 @@ public SlimeFluid(int id, Fluid fluid, Material material) @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:slime_blue"); flowIcon = iconRegister.registerIcon("tinker:slime_blue_flow"); @@ -35,7 +35,7 @@ public void registerIcons (IconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) return stillIcon; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 4874559e7e8..61e5fcb286d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -3,11 +3,12 @@ import java.util.List; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.common.TContent; @@ -25,9 +26,9 @@ public class SlimeLeaves extends BlockLeaves @SideOnly(Side.CLIENT) private Icon[] fancyIcons; - public SlimeLeaves(int id) + public SlimeLeaves() { - super(id); + super(); setCreativeTab(TConstructRegistry.blockTab); setLightOpacity(1); this.setHardness(0.3f); @@ -53,10 +54,10 @@ public int colorMultiplier (IBlockAccess par1IBlockAccess, int par2, int par3, i @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.fastIcons = new Icon[fastLeaves.length]; - this.fancyIcons = new Icon[fancyLeaves.length]; + this.fastIcons = new IIcon[fastLeaves.length]; + this.fancyIcons = new IIcon[fancyLeaves.length]; for (int i = 0; i < this.fastIcons.length; i++) { @@ -76,11 +77,11 @@ public Icon getIcon (int side, int meta) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Block b, CreativeTabs tab, List list) { for (int iter = 0; iter < fastIcons.length; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(b, 1, iter)); } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 1846d5512ae..f38a79601ee 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -5,11 +5,11 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import tconstruct.common.TContent; @@ -21,12 +21,12 @@ public class SlimeSapling extends BlockSapling { - public Icon[] icons; + public IIcon[] icons; public String[] textureNames = new String[] { "blue" }; - public SlimeSapling(int id) + public SlimeSapling() { - super(id); + super(); float f = 0.4F; setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); this.setHardness(0.0F); @@ -36,9 +36,9 @@ public SlimeSapling(int id) @Override @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -71,7 +71,7 @@ public void updateTick (World world, int x, int y, int z, Random random) @Override @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta % 8]; } @@ -120,9 +120,9 @@ public int damageDropped (int i) @SideOnly(Side.CLIENT) @Override - public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < 1; i++) - par3List.add(new ItemStack(par1, 1, i)); + par3List.add(new ItemStack(b, 1, i)); } } diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 22908adc24f..0fa13f050ca 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -3,11 +3,11 @@ import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -21,9 +21,9 @@ public class BarricadeBlock extends MantleBlock Block modelBlock; int modelMeta; - public BarricadeBlock(int blockID, Block model, int meta) + public BarricadeBlock( Block model, int meta) { - super(blockID, Material.wood); + super(Material.wood); this.modelBlock = model; this.modelMeta = meta; setHardness(4.0F); @@ -36,7 +36,7 @@ public Icon getIcon (int side, int meta) } @Override - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { } diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index dea65be44ca..083aa00813e 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -11,7 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; @@ -53,7 +53,7 @@ public void renderItem (EntityLivingBase living, ItemStack stack, int renderPass block = Block.blocksList[stack.itemID]; } - Icon icon = null; //living.getItemIcon(stack, renderPass); + IIcon icon = null; //living.getItemIcon(stack, renderPass); if (living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 9f05655d426..7b1a1a29659 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -61,7 +61,7 @@ public class TProxyClient extends TProxyCommon { public static SmallFontRenderer smallFontRenderer; - public static Icon metalBall; + public static IIcon metalBall; public static Minecraft mc; public static RenderItem itemRenderer = new RenderItem(); @@ -123,27 +123,27 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -157,27 +157,27 @@ public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, i GL11.glRotatef(60, 1, 0, 0); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -250,12 +250,12 @@ public void registerRenderer () // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, // new PlayerArmorRender()); // <-- Works, woo! - MinecraftForgeClient.registerItemRenderer(TRepo.shortbow.itemID, new CustomBowRenderer()); + MinecraftForgeClient.registerItemRenderer(TRepo.shortbow, new CustomBowRenderer()); VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); ToolCoreRenderer renderer = new ToolCoreRenderer(); - MinecraftForgeClient.registerItemRenderer(TRepo.arrow.itemID, renderer); - MinecraftForgeClient.registerItemRenderer(TRepo.dagger.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TRepo.arrow, renderer); + MinecraftForgeClient.registerItemRenderer(TRepo.dagger, renderer); addRenderMappings(); addToolButtons(); diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index f0057f73a41..be6ea0b2791 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; @@ -54,7 +54,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage()); - Icon[] tempParts = new Icon[iconParts]; + IIcon[] tempParts = new IIcon[iconParts]; label: { if (!isInventory && ent instanceof EntityPlayer) @@ -70,14 +70,14 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) } } for (int i = iconParts; i-- > 0;) - tempParts[i] = tool.getIcon(item, i); + tempParts[i] = tool.getIIcon(item, i); } int count = 0; - Icon[] parts = new Icon[iconParts]; + IIcon[] parts = new IIcon[iconParts]; for (int i = 0; i < iconParts; ++i) { - Icon part = tempParts[i]; + IIcon part = tempParts[i]; if (part == null)// || part == ToolCore.blankSprite | part == ToolCore.emptyIcon) ++count; else @@ -109,7 +109,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) float[] ySub = new float[iconParts]; for (int i = 0; i < iconParts; ++i) { - Icon icon = parts[i]; + IIcon icon = parts[i]; xMin[i] = icon.getMinU(); xMax[i] = icon.getMaxU(); yMin[i] = icon.getMinV(); diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index eccec619711..23ac17fe59e 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; public class BlockSkinRenderHelper diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java index 737595cb973..14fc5f9ac46 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/client/block/PaneConnectedRender.java @@ -1,9 +1,9 @@ package tconstruct.client.block; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.SOUTH; -import static net.minecraftforge.common.ForgeDirection.WEST; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index 430b4e14a08..a2ed47914d3 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/client/block/RenderLandmine.java index bf084466fac..c4e01cd8479 100644 --- a/src/main/java/tconstruct/client/block/RenderLandmine.java +++ b/src/main/java/tconstruct/client/block/RenderLandmine.java @@ -3,7 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index 02caafec7f8..6c0e392fb08 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; /** @@ -1574,7 +1574,7 @@ else if (render.hasOverrideBlockTexture()) return flag; } - static boolean renderFakeBlockWithColorMultiplier (Icon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) + static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Block.stone; render.enableAO = false; diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 46cacf7a4ab..6ee7173a46a 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -23,7 +23,7 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.*; import net.minecraftforge.fluids.*; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidContainerRegistry.*; import net.minecraftforge.oredict.*; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; diff --git a/src/main/java/tconstruct/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/inventory/SlotArmorCopy.java index 90a52ef6150..f60884d022b 100644 --- a/src/main/java/tconstruct/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/inventory/SlotArmorCopy.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,7 +51,7 @@ public boolean isItemValid (ItemStack par1ItemStack) /** * Returns the icon index on items.png that is used as background image of the slot. */ - public Icon getBackgroundIconIndex () + public IIcon getBackgroundIconIndex () { return ItemArmor.func_94602_b(this.armorType); } diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java index 6f9a1ed5592..650b8dfba3b 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -6,19 +6,20 @@ import tconstruct.library.ItemBlocklike; import tconstruct.library.TConstructRegistry; import mantle.items.abstracts.CraftingItem; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; public class ArmorPattern extends CraftingItem implements ItemBlocklike { - private Icon baseIcon; + private IIcon baseIcon; public ArmorPattern(int id, String patternType, String folder) { - super(id, patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab); + super( patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); @@ -33,14 +34,14 @@ protected static String[] getPatternNames (String partType) return names; } - public Icon getBaseIcon () + public IIcon getBaseIcon () { return baseIcon; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { super.registerIcons(iconRegister); baseIcon = iconRegister.registerIcon("tinker:" + folder + "armor_cast"); @@ -48,11 +49,11 @@ public void registerIcons (IconRegister iconRegister) private static final String[] patternName = new String[] { "helmet", "chestplate", "leggings", "boots" }; - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block block, CreativeTabs tab, List list) { for (int i = 0; i < patternName.length; i++) { - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(block, 1, i)); } } diff --git a/src/main/java/tconstruct/items/DiamondApple.java b/src/main/java/tconstruct/items/DiamondApple.java index 7f88dc95c27..bc352a6ccd9 100644 --- a/src/main/java/tconstruct/items/DiamondApple.java +++ b/src/main/java/tconstruct/items/DiamondApple.java @@ -1,25 +1,25 @@ package tconstruct.items; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class DiamondApple extends ItemFood { - public Icon[] icons; + public IIcon[] icons; public String[] textureNames = new String[] { "food/apple_diamond" }; public String[] itemNames = new String[] { "apple.diamond" }; - public DiamondApple(int id) + public DiamondApple() { - super(id, 4, 2.0F, false); + super(4, 2.0F, false); setHasSubtypes(true); setMaxDamage(0); this.setAlwaysEdible(); @@ -56,16 +56,16 @@ protected void onFoodEaten (ItemStack stack, World world, EntityPlayer player) @SideOnly(Side.CLIENT) @Override - public Icon getIconFromDamage (int meta) + public IIcon getIconFromDamage (int meta) { return icons[meta]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index e129c68f063..05f2acfd0ce 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -6,15 +6,15 @@ import tconstruct.TConstruct; import tconstruct.blocks.logic.LiquidTextureLogic; import tconstruct.common.TRepo; - -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.block.Block; +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.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumMovingObjectType; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -24,9 +24,9 @@ public class FilledBucket extends ItemBucket { - public FilledBucket(int id) + public FilledBucket(Block b) { - super(id, 0); + super(b); //setTextureFile(TRepo.craftingTexture); //setIconIndex(224); setUnlocalizedName("tconstruct.bucket"); @@ -155,24 +155,24 @@ public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int } @Override - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block b, CreativeTabs tab, List list) { for (int i = 0; i < icons.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); } - public Icon[] icons; + public IIcon[] icons; @SideOnly(Side.CLIENT) - public Icon getIconFromDamage (int meta) + public IIcon getIconFromDamage (int meta) { return icons[meta]; } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java index 0e7b3ee2875..9dda116b549 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/items/GoldenHead.java @@ -2,7 +2,8 @@ import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -17,9 +18,9 @@ public class GoldenHead extends ItemFood { - public GoldenHead(int par1, int par2, float par3, boolean par4) + public GoldenHead(int par2, float par3, boolean par4) { - super(par1, par2, par3, par4); + super(par2, par3, par4); this.setHasSubtypes(true); } @@ -59,14 +60,14 @@ protected void onFoodEaten (ItemStack par1ItemStack, World par2World, EntityPlay /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ - public void getSubItems (int par1, CreativeTabs par2CreativeTabs, List par3List) + public void getSubItems (Block b, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 0)); + par3List.add(new ItemStack(b, 1, 0)); } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { this.itemIcon = iconRegister.registerIcon("tinker:skull_char_gold"); } diff --git a/src/main/java/tconstruct/items/Jerky.java b/src/main/java/tconstruct/items/Jerky.java index eda0c911f38..6bb25429e19 100644 --- a/src/main/java/tconstruct/items/Jerky.java +++ b/src/main/java/tconstruct/items/Jerky.java @@ -2,12 +2,12 @@ import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -30,9 +30,9 @@ public Jerky(int id, boolean hungerOverhaul) @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[iconNames.length]; + this.icons = new IIcon[iconNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/items/SpecialFood.java b/src/main/java/tconstruct/items/SpecialFood.java index aae42b5d228..53973461a34 100644 --- a/src/main/java/tconstruct/items/SpecialFood.java +++ b/src/main/java/tconstruct/items/SpecialFood.java @@ -2,12 +2,13 @@ import java.util.List; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -21,9 +22,9 @@ public class SpecialFood extends ItemFood String[] iconNames; Icon[] icons; - public SpecialFood(int id, int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) + public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, String[] iconNames) { - super(id, 0, 0, false); + super(0, 0, false); this.hunger = hunger; this.saturation = saturation; this.unlocalizedNames = textureNames; @@ -42,16 +43,16 @@ public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) } @SideOnly(Side.CLIENT) - public Icon getIconFromDamage (int meta) + public IIcon getIconFromDamage (int meta) { - return icons[0]; + return iicons[0]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[iconNames.length]; + this.icons = new IIcon[iconNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -65,9 +66,9 @@ public String getUnlocalizedName (ItemStack stack) return getUnlocalizedName() + "." + unlocalizedNames[arr]; } - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block b, CreativeTabs tab, List list) { for (int i = 0; i < unlocalizedNames.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); } } diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java index 95b12dfd1e4..f1bc135190e 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/items/TitleIcon.java @@ -3,7 +3,7 @@ import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -12,7 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Facing; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.client.TProxyClient; @@ -29,16 +29,16 @@ public class TitleIcon extends Item String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" }; String[] achievementIconNames = new String[] { "tinkerer", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience" }; - Icon[] achievementIcons = new Icon[achievementIconNames.length]; + IIcon[] achievementIcons = new IIcon[achievementIconNames.length]; - public TitleIcon(int par1) + public TitleIcon() { - super(par1); + super(); this.setCreativeTab(CreativeTabs.tabMisc); } @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { ToolCore.blankSprite = iconRegister.registerIcon("tinker:blanksprite"); TProxyClient.metalBall = iconRegister.registerIcon("tinker:metalball"); @@ -56,7 +56,7 @@ public boolean requiresMultipleRenderPasses () } @SideOnly(Side.CLIENT) - public Icon getIconFromDamageForRenderPass (int par1, int par2) + public IIcon getIconFromDamageForRenderPass (int par1, int par2) { if (par1 == 255) return itemIcon; @@ -97,10 +97,10 @@ public String getItemDisplayName (ItemStack par1ItemStack) } @Override - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block b, CreativeTabs tab, List list) { for (int i = 0; i < mobNames.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index dfeb8a43f48..68e482412f9 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -3,6 +3,7 @@ import java.util.List; import mantle.items.abstracts.CraftingItem; +import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -15,9 +16,9 @@ public class ToolPart extends CraftingItem implements IToolPart { public String partName; - public ToolPart(int id, String textureType, String name) + public ToolPart(String textureType, String name) { - super(id, toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.materialTab); + super(toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); this.partName = name; @@ -67,13 +68,13 @@ private static String[] buildTextureNames (String textureType) "copper", "bronze", "alumite", "steel", "blueslime", "pigiron", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; @Override - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block b, CreativeTabs tab, List list) { for (int i = 0; i < 19; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); if (TRepo.thaumcraftAvailable) - list.add(new ItemStack(id, 1, 31)); + list.add(new ItemStack(b, 1, 31)); } @Override diff --git a/src/main/java/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/items/ToolShard.java index 3601ff80f2d..e52fcd5157e 100644 --- a/src/main/java/tconstruct/items/ToolShard.java +++ b/src/main/java/tconstruct/items/ToolShard.java @@ -4,19 +4,20 @@ import tconstruct.common.TContent; import tconstruct.common.TRepo; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ToolShard extends ToolPart { - public ToolShard(int id, String tex) + public ToolShard(String tex) { - super(id, tex, "ToolShard"); + super(tex, "ToolShard"); this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -33,9 +34,9 @@ private static String[] buildTextureNames (String textureType) } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < 5; ++i) { @@ -54,16 +55,16 @@ public void registerIcons (IconRegister iconRegister) } } - public void getSubItems (int id, CreativeTabs tab, List list) + public void getSubItems (Block b, CreativeTabs tab, List list) { for (int i = 1; i < 5; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); for (int i = 6; i < 9; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); for (int i = 10; i < 19; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(b, 1, i)); if (TRepo.thaumcraftAvailable) - list.add(new ItemStack(id, 1, 31)); + list.add(new ItemStack(b, 1, 31)); } } diff --git a/src/main/java/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/items/armor/ArmorBasic.java index 05c3caf4b6b..07542ac9798 100644 --- a/src/main/java/tconstruct/items/armor/ArmorBasic.java +++ b/src/main/java/tconstruct/items/armor/ArmorBasic.java @@ -1,6 +1,6 @@ package tconstruct.items.armor; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.*; @@ -16,7 +16,7 @@ public ArmorBasic(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, S } @Override - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon("tinker:armor/" + textureName + "_" + (this.armorType == 0 ? "helmet" : this.armorType == 1 ? "chestplate" : this.armorType == 2 ? "leggings" : this.armorType == 3 ? "boots" : "helmet")); diff --git a/src/main/java/tconstruct/items/armor/ArmorStandard.java b/src/main/java/tconstruct/items/armor/ArmorStandard.java index ed0cece12fb..c3daa63229d 100644 --- a/src/main/java/tconstruct/items/armor/ArmorStandard.java +++ b/src/main/java/tconstruct/items/armor/ArmorStandard.java @@ -3,7 +3,7 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import tconstruct.library.armor.*; public class ArmorStandard extends ArmorCore @@ -15,7 +15,7 @@ public ArmorStandard(int par1, int baseProtection, EnumArmorPart armorPart) } @Override - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { this.itemIcon = par1IconRegister.registerIcon("tinker:armor/wood_helmet"); } diff --git a/src/main/java/tconstruct/items/armor/Glove.java b/src/main/java/tconstruct/items/armor/Glove.java index d7d873b51cb..57c7554e6c0 100644 --- a/src/main/java/tconstruct/items/armor/Glove.java +++ b/src/main/java/tconstruct/items/armor/Glove.java @@ -1,19 +1,19 @@ package tconstruct.items.armor; import tconstruct.library.TConstructRegistry; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; public class Glove extends Item { - public Glove(int par1) + public Glove() { - super(par1); + super(); this.setCreativeTab(TConstructRegistry.materialTab); } @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { itemIcon = iconRegister.registerIcon("tinker:armor/dirthand"); } diff --git a/src/main/java/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/items/armor/Knapsack.java index 03852f4888e..daa2ff62c6d 100644 --- a/src/main/java/tconstruct/items/armor/Knapsack.java +++ b/src/main/java/tconstruct/items/armor/Knapsack.java @@ -20,7 +20,7 @@ public class Knapsack extends CraftingItem public Knapsack(int id) { - super(id, new String[] { "knapsack" }, new String[] { "knapsack" }, "armor/", "tinker", TConstructRegistry.materialTab); + super(new String[] { "knapsack" }, new String[] { "knapsack" }, "armor/", "tinker", TConstructRegistry.materialTab); this.setMaxStackSize(10); } diff --git a/src/main/java/tconstruct/items/armor/TArmorBase.java b/src/main/java/tconstruct/items/armor/TArmorBase.java index 7a9bf99e913..d53da0b75e4 100644 --- a/src/main/java/tconstruct/items/armor/TArmorBase.java +++ b/src/main/java/tconstruct/items/armor/TArmorBase.java @@ -1,7 +1,7 @@ package tconstruct.items.armor; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -9,7 +9,7 @@ import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +17,7 @@ public class TArmorBase extends ItemArmor //implements ISpecialArmor { - Icon[] icons; + IIcon[] icons; String[] iconNames = { "wood_boots" }; //static Minecraft mc = Minecraft.getMinecraft(); @@ -84,16 +84,16 @@ public boolean requiresMultipleRenderPasses () @SideOnly(Side.CLIENT) @Override - public Icon getIconFromDamage (int meta) + public IIcon getIconFromDamage (int meta) { return icons[0]; } @SideOnly(Side.CLIENT) @Override - public void registerIcons (IconRegister iconRegister) + public void registerIcons (IIconRegister iconRegister) { - this.icons = new Icon[iconNames.length]; + this.icons = new IIcon[iconNames.length]; for (int i = 0; i < this.icons.length; ++i) { diff --git a/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java b/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java index 5d5abc9426a..7cd2c9d1e2c 100644 --- a/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java @@ -1,12 +1,13 @@ package tconstruct.items.blocks; +import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; public class MetadataItemBlock extends ItemBlock { - public MetadataItemBlock(int id) + public MetadataItemBlock(Block b) { - super(id); + super(b); setMaxDamage(0); setHasSubtypes(true); } diff --git a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java index ea6267d57cc..45bf4074dd0 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java @@ -1,8 +1,8 @@ package tconstruct.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; - -import net.minecraft.util.Icon; +import net.minecraft.block.Block; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; @@ -12,16 +12,16 @@ public class SlimeTallGrassItem extends MultiItemBlock { public static final String blockTypes[] = { "tallgrass", "tallgrass.fern" }; - public SlimeTallGrassItem(int id) + public SlimeTallGrassItem(Block b) { - super(id,"block.slime", blockTypes ); + super(b,"block.slime", blockTypes ); setMaxDamage(0); setHasSubtypes(true); } @SideOnly(Side.CLIENT) - public Icon getIconFromDamage (int meta) + public IIcon getIconFromDamage (int meta) { int arr = MathHelper.clamp_int(meta, 0, this.blockType.length); return TRepo.slimeTallGrass.getIcon(0, arr); diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 43af273de28..ccf61efff93 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -4,7 +4,7 @@ import tconstruct.entity.projectile.LaunchedPotion; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +13,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -22,12 +22,12 @@ public class PotionLauncher extends Item { @SideOnly(Side.CLIENT) - private Icon[] icons; + private IIcon[] icons; public static final String[] textureNames = new String[] { "potionlauncher" }; - public PotionLauncher(int par1) + public PotionLauncher() { - super(par1); + super(); this.maxStackSize = 1; this.setCreativeTab(CreativeTabs.tabCombat); this.setMaxDamage(3); @@ -93,9 +93,9 @@ public EnumAction getItemUseAction (ItemStack stack) } @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) + public void registerIcons (IIconRegister par1IconRegister) { - this.icons = new Icon[textureNames.length]; + this.icons = new IIcon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) { @@ -110,9 +110,9 @@ public Icon getIconFromDamage (int meta) } @Override - public void getSubItems (int id, CreativeTabs tabs, List list) + public void getSubItems (Block b, CreativeTabs tabs, List list) { - ItemStack stack = new ItemStack(id, 1, 0); + ItemStack stack = new ItemStack(b, 1, 0); NBTTagCompound compound = new NBTTagCompound(); NBTTagCompound tags = new NBTTagCompound(); compound.setCompoundTag("InfiTool", tags); diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java index 27cd6fdc2e0..9bd6fae8dd6 100644 --- a/src/main/java/tconstruct/plugins/PluginController.java +++ b/src/main/java/tconstruct/plugins/PluginController.java @@ -3,15 +3,11 @@ import cpw.mods.fml.common.Loader; import net.minecraftforge.common.Configuration; import tconstruct.TConstruct; -import tconstruct.plugins.fmp.ForgeMultiPart; import tconstruct.plugins.ic2.IC2; import tconstruct.plugins.imc.AppEng; import tconstruct.plugins.imc.BuildcraftTransport; import tconstruct.plugins.imc.Mystcraft; import tconstruct.plugins.imc.Thaumcraft; -import tconstruct.plugins.minefactoryreloaded.MineFactoryReloaded; -import tconstruct.plugins.nei.NotEnoughItems; -import tconstruct.plugins.waila.Waila; import java.io.File; import java.util.*; @@ -112,12 +108,12 @@ public void registerBuiltins() registerPlugin(new AppEng()); registerPlugin(new BuildcraftTransport()); - registerPlugin(new ForgeMultiPart()); + //registerPlugin(new ForgeMultiPart()); registerPlugin(new IC2()); - registerPlugin(new MineFactoryReloaded()); - registerPlugin(new NotEnoughItems()); + // registerPlugin(new MineFactoryReloaded()); + //registerPlugin(new NotEnoughItems()); registerPlugin(new Thaumcraft()); - registerPlugin(new Waila()); + // registerPlugin(new Waila()); } } diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index 1aeffcd9911..89768f55084 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -1,7 +1,7 @@ package tconstruct.util.config; import cpw.mods.fml.common.Loader; -import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.config.Configuration; import tconstruct.TConstruct; import java.io.File; diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 658f32436b8..dfff198d0a6 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -4,8 +4,8 @@ import java.io.IOException; import cpw.mods.fml.common.Loader; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.Property; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; diff --git a/src/main/java/tconstruct/util/landmine/Helper.java b/src/main/java/tconstruct/util/landmine/Helper.java index fce9048b639..47b5eb1fa84 100644 --- a/src/main/java/tconstruct/util/landmine/Helper.java +++ b/src/main/java/tconstruct/util/landmine/Helper.java @@ -3,7 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; /** *