diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
50 files changed, 135 insertions, 4499 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index c44620e5da..e1b1d53b45 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bartcrops.crops.Crop_Force; import gtPlusPlus.xmod.bartcrops.crops.Crop_Hemp; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; @@ -46,11 +45,10 @@ public class LoaderOfTheCrops { return new LoaderOfTheCrops(cropObj, ItemUtils.getItemStackOfAmountFromOreDict("crop" + cropObj.name(), 0)); } - public static final List<LoaderOfTheCrops> cropLoader() { + public static List<LoaderOfTheCrops> cropLoader() { List<LoaderOfTheCrops> p = new ArrayList<LoaderOfTheCrops>(); p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3))); - p.add(new LoaderOfTheCrops(new Crop_Force(), new ItemStack(Item.getItemById(111), 3))); return p; } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java deleted file mode 100644 index da29ca7f50..0000000000 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java +++ /dev/null @@ -1,61 +0,0 @@ -package gtPlusPlus.xmod.bartcrops.crops; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.material.ELEMENT.STANDALONE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop; -import ic2.api.crops.ICropTile; - -public class Crop_Force extends BaseAestheticCrop { - - @Override - public int tier() { - return 4; - } - - @Override - public String name() { - return "Force"; - } - - @Override - public String discoveredBy() { - return "Alkalus"; - } - - @Override - public int growthDuration(ICropTile crop) { - int ret = 800; - - /* - * if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { ret = 225; } - */ - - if (CORE_Preloader.DEBUG_MODE) { - ret = 1; - } - - return ret; - } - - @Override - public String[] attributes() { - return new String[] { "Power", "Soil", "Yellow", "Gold" }; - } - - @Override - public ItemStack getGain(ICropTile crop) { - ItemStack ret = this.getDisplayItem(); - if (MathUtils.randInt(0, 10) > 8) { - ret = STANDALONE.FORCE.getNugget(MathUtils.randInt(4, 8)); - } - return ret; - } - - @Override - public ItemStack getDisplayItem() { - return STANDALONE.FORCE.getNugget(0); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java index 66f0d19fd2..f5bf252edb 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java @@ -1,11 +1,9 @@ package gtPlusPlus.xmod.bartcrops.crops; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.bartcrops.abstracts.BaseAestheticCrop; import ic2.api.crops.ICropTile; @@ -22,23 +20,8 @@ public class Crop_Hemp extends BaseAestheticCrop { } @Override - public String discoveredBy() { - return "Alkalus"; - } - - @Override public int growthDuration(ICropTile crop) { - int ret = 550; - - /* - * if (crop.isBlockBelow(Blocks.dirt) || crop.isBlockBelow(Blocks.flowing_water)) { ret = 225; } - */ - - if (CORE_Preloader.DEBUG_MODE) { - ret = 1; - } - - return ret; + return 550; } @Override @@ -48,17 +31,11 @@ public class Crop_Hemp extends BaseAestheticCrop { @Override public ItemStack getGain(ICropTile crop) { - - ItemStack ret = this.getDisplayItem(); - if (MathUtils.randInt(0, 10) > 8) { - ret = ItemUtils.getSimpleStack(ModItems.itemRope, MathUtils.randInt(1, 3)); - } - - return ret; + return new ItemStack(Items.string, MathUtils.randInt(1, 3), 0); } @Override public ItemStack getDisplayItem() { - return ItemUtils.getSimpleStack(ModItems.itemRope, 0); + return new ItemStack(Items.string, 1, 0); } } diff --git a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java deleted file mode 100644 index 1c13f16a4b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.cofh; - -import static gregtech.api.enums.Mods.COFHCore; - -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.general.RF2EU_Battery; - -public class HANDLER_COFH { - - public static void initItems() { - if (COFHCore.isModLoaded()) { - ModItems.RfEuBattery = new RF2EU_Battery(); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java deleted file mode 100644 index caa49973d7..0000000000 --- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ /dev/null @@ -1,76 +0,0 @@ -package gtPlusPlus.xmod.eio.handler; - -import static gregtech.api.enums.Mods.EnderIO; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; - -import java.lang.reflect.Field; - -import net.minecraft.item.Item; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.enums.Materials; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.eio.material.MaterialEIO; - -public class HandlerTooltip_EIO { - - private static Item mIngot; - Class oMainClass; - Class oIngotClass; - - @SubscribeEvent - public void onItemTooltip(ItemTooltipEvent event) { - // Is EIO loaded? - if (!disableEnderIOIngotTooltips && EnderIO.isModLoaded()) { - - // Is the EIO Ingot Item null? - // If it is, reflect in. - if (mIngot == null) { - try { - oMainClass = ReflectionUtils.getClass("crazypants.enderio.EnderIO"); - oIngotClass = ReflectionUtils.getClass("crazypants.enderio.material.ItemAlloy"); - if (oMainClass != null && oIngotClass != null) { - Field oAlloyField = ReflectionUtils.getField(oMainClass, "itemAlloy"); - Object oAlloy = oAlloyField.get(oMainClass); - if (oAlloy != null) { - if (oIngotClass.isInstance(oAlloy) || Item.class.isInstance(oAlloy)) { - mIngot = (Item) oAlloy; - } - } - } - } catch (Throwable e) {} - } - - if (mIngot != null) { - // If the Item is an instance of ItemAlloy.class then proceed - if (event.itemStack.getItem() == mIngot || oIngotClass.isInstance(event.itemStack.getItem()) - || event.itemStack.getUnlocalizedName().toLowerCase().contains("item.itemAlloy")) { - - // If stacks match, add a tooltip. - if (mIngot != null) { - if (event.itemStack.getItem() == mIngot) { - if (event.itemStack.getItemDamage() == 0) { - event.toolTip.add(MaterialEIO.ELECTRICAL_STEEL.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 1) { - event.toolTip.add(MaterialEIO.ENERGETIC_ALLOY.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 2) { - event.toolTip.add(MaterialEIO.VIBRANT_ALLOY.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 3) { - event.toolTip.add(MaterialEIO.REDSTONE_ALLOY.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 4) { - event.toolTip.add(MaterialEIO.CONDUCTIVE_IRON.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 5) { - event.toolTip.add(MaterialEIO.PULSATING_IRON.vChemicalFormula); - } else if (event.itemStack.getItemDamage() == 6) { - event.toolTip.add(Materials.DarkSteel.mChemicalFormula); - } else if (event.itemStack.getItemDamage() == 7) { - event.toolTip.add(MaterialEIO.SOULARIUM.vChemicalFormula); - } - } - } - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java deleted file mode 100644 index 0d07901310..0000000000 --- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ /dev/null @@ -1,109 +0,0 @@ -package gtPlusPlus.xmod.eio.material; - -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.NONMATERIAL; -import gtPlusPlus.core.material.state.MaterialState; - -public class MaterialEIO { - - public static final Material SOULARIUM = new Material( - "Soularium", // Material Name - MaterialState.SOLID, // State - new short[] { 95, 90, 54, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - false, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1), - new MaterialStack(NONMATERIAL.SOULSAND, 1) }); - - public static final Material CONDUCTIVE_IRON = new Material( - "Conductive Iron", // Material Name - MaterialState.SOLID, // State - new short[] { 164, 109, 100, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - false, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1), - new MaterialStack(NONMATERIAL.REDSTONE, 1) }); - - public static final Material PULSATING_IRON = new Material( - "Pulsating Iron", // Material Name - MaterialState.SOLID, // State - new short[] { 50, 91, 21, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - false, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1), - new MaterialStack(NONMATERIAL.ENDERPEARL, 1) }); - - public static final Material ELECTRICAL_STEEL = new Material( - "Electrical Steel", // Material Name - MaterialState.SOLID, // State - new short[] { 194, 194, 194, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - true, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 3), - new MaterialStack(ELEMENT.getInstance().SILICON, 1) }); - - public static final Material ENERGETIC_ALLOY = new Material( - "Energetic Alloy", // Material Name - MaterialState.SOLID, // State - new short[] { 252, 151, 45, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - true, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1), - new MaterialStack(NONMATERIAL.REDSTONE, 1), new MaterialStack(NONMATERIAL.GLOWSTONE, 1) }); - - public static final Material VIBRANT_ALLOY = new Material( - "Vibrant Alloy", // Material Name - MaterialState.SOLID, // State - new short[] { 204, 242, 142, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - true, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ENERGETIC_ALLOY, 1), - new MaterialStack(NONMATERIAL.ENDERPEARL, 1) }); - - public static final Material REDSTONE_ALLOY = new Material( - "Redstone Alloy", // Material Name - MaterialState.SOLID, // State - new short[] { 178, 34, 34, 0 }, // Material Colour - 10, // Melting Point in C - 10, - 10, - 10, - false, // Uses Blast furnace? - false, // Generates a cell - // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 1), - new MaterialStack(NONMATERIAL.REDSTONE, 1) }); -} diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index ee3d8d05ef..6fea628473 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -14,7 +14,7 @@ import java.util.Locale; import java.util.function.Consumer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.BiomeDictionary.Type; +import net.minecraftforge.common.BiomeDictionary; import org.apache.commons.lang3.text.WordUtils; @@ -85,7 +85,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation("STEEL", "GOLD", 10); tMutation.restrictHumidity(ARID); - tMutation.restrictBiomeType(Type.HOT); + tMutation.restrictBiomeType(BiomeDictionary.Type.HOT); }),; private final GTPP_BranchDefinition branch; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 370b286957..977eb8a2c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -24,7 +24,6 @@ import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; @@ -41,7 +40,6 @@ import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngleGrinder; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricButcherKnife; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricLighter; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips; -import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer; @@ -74,18 +72,12 @@ public class HANDLER_GT { // Register Tile Entities COMPAT_HANDLER.registerGregtechMachines(); - // Only loads if the config option is true (default: true) - if (CORE.ConfigSwitches.enableSkookumChoochers) { - sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); - } + sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); } public static void postInit() { // Only loads if the config option is true (default: true) - if (CORE.ConfigSwitches.enableSkookumChoochers) { - new ProcessingToolHeadChoocher().run(); - } new ProcessingAngleGrinder().run(); new ProcessingElectricSnips().run(); new ProcessingElectricButcherKnife().run(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index f7fc2712ce..90fd1e2358 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -31,35 +31,27 @@ public enum GregtechItemList implements GregtechItemContainer { Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, - Electric_Motor_MAX, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, - Electric_Pump_MAX, Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, - Conveyor_Module_MAX, Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, - Electric_Piston_MAX, Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, - Robot_Arm_MAX, Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, - Field_Generator_MAX, Emitter_LuV, Emitter_ZPM, Emitter_UV, - Emitter_MAX, Sensor_LuV, Sensor_ZPM, Sensor_UV, - Sensor_MAX, // ULV Components Electric_Motor_ULV, @@ -179,10 +171,6 @@ public enum GregtechItemList implements GregtechItemContainer { Compressed_Fusion_Reactor, // Carbon Materials - NanoTube_Base_Substrate, - NanoTube_Finished, - Carbyne_Tube_Finished, - Carbyne_Sheet_Finished, // End Game Laser Engraver Lens Laser_Lens_WoodsGlass, @@ -198,13 +186,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Pellet Mold Pellet_Mold, - // Charged Items for Tree Farms - Farm_Processor_EV, - Farm_Processor_IV, - Farm_Processor_LuV, - Farm_Processor_ZPM, - Farm_Processor_UV, - // Upgrade chip for Distillus Distillus_Upgrade_Chip, Maceration_Upgrade_Chip, @@ -532,9 +513,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Standard Turbine Rotor Hatch Hatch_Input_TurbineHousing, - // Control Core - Hatch_Control_Core, - // Milling Ball Bus Bus_Milling_Balls, @@ -555,9 +533,6 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_Input_Elemental_Duplicator, // RTG Hatch - Hatch_RTG_LV, - Hatch_RTG_MV, |