diff options
| author | Blood-Asp <Blood@Asp> | 2015-05-16 02:51:56 +0200 | 
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-05-16 02:51:56 +0200 | 
| commit | 1209f95bc278f81de4143a619696048c655313e8 (patch) | |
| tree | c8f348649814938a38d90756c96a1d6b9c3e260b /main/java/gregtech/loaders | |
| parent | 277e3ddfd28fcee2d1c9774870daf1c3e21a6c0f (diff) | |
| download | GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.tar.gz GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.tar.bz2 GT5-Unofficial-1209f95bc278f81de4143a619696048c655313e8.zip | |
update 5.08.13
Turbine items and achievements
Diffstat (limited to 'main/java/gregtech/loaders')
7 files changed, 584 insertions, 25 deletions
| diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java new file mode 100644 index 0000000000..bdc340b255 --- /dev/null +++ b/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -0,0 +1,469 @@ +package gregtech.loaders.misc; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; +import gregtech.GT_Mod; +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gregtech.common.blocks.GT_Block_Casings1; +import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.items.GT_MetaGenerated_Item_01; +import gregtech.common.items.GT_MetaGenerated_Tool_01; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; +import net.minecraft.stats.StatBase; +import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fluids.FluidStack; + +public class GT_Achievements { + +	public HashMap<String, Achievement> achievementList; +public int adjX = 5; +public int adjY = 9; +	 +	public GT_Achievements() { +		this.achievementList = new HashMap(); +		for (int i = 0; i < oreList.size(); i++) { +			if (GT_Values.D1 && this.achievementList.get(oreList.get(i).name()) == null) { +				GT_Log.out.println("achievement." + oreList.get(i).name() + "=Find " + oreList.get(i).name() + " Ore"); +				GT_Log.out.println("achievement." + oreList.get(i).name() + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: "+ (oreStats.get(i)[2]) + ", " + (oreStats.get(i)[3] == 1 ? "Overworld" : "") + "/" + (oreStats.get(i)[4] == 1 ? "Nether" : "") + "/"+ (oreStats.get(i)[5] == 1 ? "End" : "")); +			} +			registerOreAchievement(oreList.get(i)); +		} +		registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); +		registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); +		registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1, new Object[] {}), "crops", false); +		registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1, new Object[] {}), "crops", false); +		registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1, new Object[] {}), "crops", false); +		registerAchievement("havestoil", -4, -4, ItemList.Crop_Drop_OilBerry.get(1, new Object[] {}), "crops", false); +		registerAchievement("havestiron", -2, -3, ItemList.Crop_Drop_Ferru.get(1, new Object[] {}), "crops", false); +		registerAchievement("havestgold", -2, -6, ItemList.Crop_Drop_Aurelia.get(1, new Object[] {}), "havestiron", false); +		registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1, new Object[] {}), "havestiron", false); +		registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[] {}), "havestgold", false); + +		registerAchievement("tools", 0, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(12, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); +		registerAchievement("driltime", 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(100, 1, Materials.BlueSteel, Materials.StainlessSteel, null),"tools", false); +		registerAchievement("brrrr", 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(110, 1, Materials.BlueSteel, Materials.StainlessSteel, null),"driltime", false); +		registerAchievement("highpowerdrill", 3, 5,GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(104, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "driltime", false); +		registerAchievement("hammertime", 3, 7,GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(130, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "highpowerdrill", false); +		registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1, new Object[] {}), "highpowerdrill", false); + +		registerAchievement("unitool", -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(32, 1, Materials.Steel, Materials.Iron, null), "tools", false); +		registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1, new Object[] {}), "unitool", false); + +		registerAchievement("crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); +		registerAchievement("cleandust", 0, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), "crushed", false); +		registerAchievement("washing", -2, 6, GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), "crushed", false); +		registerAchievement("spinit", -4, 6, GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), "crushed", false); +		registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1, new Object[] {}), "spinit", false); +		registerAchievement("newmetal", -4, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), "newfuel", false); +		registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1, new Object[] {}), "newfuel", false); + +		registerAchievement("bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false); +		registerAchievement("simplyeco", 2, 2, ItemList.Machine_Bronze_Boiler_Solar.get(1, new Object[] {}), "bronze", false); +		registerAchievement("firststeam", 2, -2, ItemList.Machine_Bronze_Boiler.get(1, new Object[] {}), "bronze", false); +		registerAchievement("alloysmelter", 2, -4, ItemList.Machine_Bronze_AlloySmelter.get(1, new Object[] {}), "firststeam", false); +		registerAchievement("macerator", 0, -2, ItemList.Machine_Bronze_Macerator.get(1, new Object[] {}), "firststeam", false); +		registerAchievement("extract", 0, -4, ItemList.Machine_Bronze_Extractor.get(1, new Object[] {}), "alloysmelter", false); + +		registerAchievement("smallparts", 0, -8, ItemList.Circuit_Primitive.get(1, new Object[] {}), "extract", false); +		registerAchievement("bettercircuits", 0, -10, ItemList.Circuit_Good.get(1, new Object[] {}), "smallparts", false); +		registerAchievement("stepforward", -2, -10, ItemList.Circuit_Advanced.get(1, new Object[] {}), "bettercircuits", false); +		registerAchievement("energyflow", -4, -10, ItemList.Circuit_Master.get(1, new Object[] {}), "stepforward", false); +		registerAchievement("orbs", -6, -10, ItemList.Energy_LapotronicOrb.get(1, new Object[] {}), "energyflow", false); +		registerAchievement("thatspower", -8, -10, ItemList.Energy_LapotronicOrb2.get(1, new Object[] {}), "orbs", false); +		registerAchievement("datasaving", -2, -12, ItemList.Tool_DataOrb.get(1, new Object[] {}), "stepforward", false); +		registerAchievement("superbuffer", 0, -12, ItemList.Automation_SuperBuffer_LV.get(1, new Object[] {}), "datasaving", false); +		registerAchievement("newstorage", -2, -14, ItemList.Quantum_Chest_HV.get(1, new Object[] {}), "superbuffer", false); +		registerAchievement("whereistheocean", 2, -14, ItemList.Quantum_Tank_IV.get(1, new Object[] {}), "superbuffer", false); +		registerAchievement("luck", 2, -6, ItemList.ZPM.get(1, new Object[] {}), "", false); +		 +		registerAchievement("steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false); +		registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1, new Object[] {}), "steel", false); +		registerAchievement("extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1, new Object[] {}), "highpressure", false); +		registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1, new Object[] {}), "steel", false); +		registerAchievement("complexalloys", 6, 3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L), "cheapermac", false); +		 +		registerAchievement("magneticiron", 4, -2, GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), "steel", false); +		registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1, new Object[] {}), "magneticiron", false); +		registerAchievement("pump", 2, -8, ItemList.Electric_Pump_LV.get(1, new Object[] {}), "lvmotor", false); +		registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1, new Object[] {}), "pump", false); +		registerAchievement("slurp", 2, -12, ItemList.Pump_HV.get(1, new Object[] {}), "closeit", false); +		registerAchievement("transport", 4, -10, ItemList.Conveyor_Module_LV.get(1, new Object[] {}), "lvmotor", false); +		registerAchievement("manipulation", 4, -12, ItemList.Cover_Controller.get(1, new Object[] {}), "transport", false); +		registerAchievement("buffer", 4, -14, ItemList.Automation_ChestBuffer_LV.get(1, new Object[] {}), "manipulation", false); +		registerAchievement("complexmachines", 6, -9, ItemList.Robot_Arm_LV.get(1, new Object[] {}), "lvmotor", false); +		registerAchievement("avengers", 8, -11, ItemList.Machine_LV_Assembler.get(1, new Object[] {}), "complexmachines", false); +		registerAchievement("filterregulate", 10, -11, ItemList.Component_Filter.get(1, new Object[] {}), "avengers", false); +		 +		registerAchievement("steampower", 6, -6, ItemList.Generator_Steam_Turbine_LV.get(1, new Object[] {}), "lvmotor", false); +		registerAchievement("batterys", 6, -4, ItemList.Battery_Buffer_2by2_MV.get(1, new Object[] {}), "steampower", false); +		registerAchievement("badweather", 6, -8, ItemList.Casing_FireHazard.get(1, new Object[] {}), "steampower", false); +		registerAchievement("electricproblems", 7, -7, ItemList.Casing_ExplosionHazard.get(1, new Object[] {}), "steampower", false); +		registerAchievement("ebf", 8, -6, ItemList.Machine_Multi_BlastFurnace.get(1, new Object[] {}), "steampower", false); +		registerAchievement("energyhatch", 12, -6, ItemList.Hatch_Energy_LV.get(1, new Object[] {}), "ebf", false); +		 +		registerAchievement("aluminium", 8, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L), "steel", false); +		registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1, new Object[] {}), "aluminium", false); +		registerAchievement("oilplant", 8, 4, ItemList.Distillation_Tower.get(1, new Object[] {}), "highpowersmelt", false); +		registerAchievement("factory", 8, 6, ItemList.Processing_Array.get(1, new Object[] {}), "oilplant", false); +		registerAchievement("upgradeebf", 8, -2, ItemList.Hatch_Energy_MV.get(1, new Object[] {}), "aluminium", false); +		registerAchievement("maintainance", 10, -2, ItemList.Hatch_Maintenance.get(1, new Object[] {}), "upgradeebf", false); +		 +		registerAchievement("titan", 10, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "aluminium", false); +		registerAchievement("magic", 10, 4, ItemList.MagicEnergyConverter_LV.get(1, new Object[] {}), "titan", false); +		registerAchievement("highmage", 10, 6, ItemList.MagicEnergyAbsorber_HV.get(1, new Object[] {}), "magic", false); +		registerAchievement("artificaldia", 11, 2, ItemList.IC2_Industrial_Diamond.get(1, new Object[] {}), "titan", false); +		registerAchievement("muchsteam", 12, 1, ItemList.LargeTurbine.get(1, new Object[] {}), "titan", false); +		registerAchievement("efficientsteam", 12, 3, ItemList.LargeTurbine.get(1, new Object[] {}), "muchsteam", false); +		 +		registerAchievement("upgrade", 14, 0, ItemList.Casing_Coil_Kanthal.get(1, new Object[] {}), "titan", false); +		registerAchievement("tungsten", 16, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L), "upgrade", false); +		registerAchievement("hightech", 15, -1, ItemList.Field_Generator_LV.get(1, new Object[] {}), "tungsten", false); +		registerAchievement("amplifier", 17, -3, ItemList.Machine_LV_Amplifab.get(1, new Object[] {}), "hightech", false); +		registerAchievement("scanning", 13, -2, ItemList.Machine_HV_Scanner.get(1, new Object[] {}), "hightech", false); +		registerAchievement("alienpower", 14, -4, ItemList.Generator_Naquadah_Mark_I.get(1, new Object[] {}), "hightech", false); +		registerAchievement("universal", 15, -6, ItemList.Machine_LV_Massfab.get(1, new Object[] {}), "hightech", false); +		registerAchievement("replication", 17, -6, ItemList.Machine_LV_Replicator.get(1, new Object[] {}), "universal", false); +		 +		registerAchievement("upgrade2", 16, 6, ItemList.Casing_Coil_Nichrome.get(1, new Object[] {}), "tungsten", false); +		registerAchievement("tungstensteel", 14, 6, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), "upgrade2", false); +		registerAchievement("conducting", 12, 6, ItemList.Casing_Coil_Superconductor.get(1, new Object[] {}), "tungstensteel", false); +		registerAchievement("fusion", 14, 8, ItemList.FusionComputer_LuV.get(1, new Object[] {}), "tungstensteel", false); +		registerAchievement("higherefficency", 14, 10, ItemList.Generator_Plasma_IV.get(1, new Object[] {}), "fusion", false); +		registerAchievement("advancing", 12, 8, ItemList.FusionComputer_ZPMV.get(1, new Object[] {}), "fusion", false); +		registerAchievement("tothelimit", 12, 10, ItemList.Generator_Plasma_LuV.get(1, new Object[] {}), "advancing", false); +		registerAchievement("denseaspossible", 10, 10, ItemList.FusionComputer_UV.get(1, new Object[] {}), "tothelimit", false); +		registerAchievement("fullefficiency", 10, 12, ItemList.Generator_Plasma_ZPMV.get(1, new Object[] {}), "denseaspossible", false); +		registerAchievement("whatnow", 8, 10, GT_OreDictUnificator.get(OrePrefixes.battery, Materials.Ultimate, 1L), "denseaspossible", false); +		 +		AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray( +				new Achievement[this.achievementList.size()]))); +		MinecraftForge.EVENT_BUS.register(this); +		FMLCommonHandler.instance().bus().register(this); +	} + +	public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { +		Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY+y, icon, requirement); +		if (special) { +			achievement.setSpecial(); +		} +		achievement.registerStat(); +		if (GT_Values.D2) { +			GT_Log.out.println("achievement." + textId + "="); +			GT_Log.out.println("achievement." + textId + ".desc="); +		} +		this.achievementList.put(textId, achievement); +		return achievement; +	} + +	public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement, boolean special) { +		Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY+y, icon, getAchievement(requirement)); +		if (special) { +			achievement.setSpecial(); +		} +		achievement.registerStat(); +		if (GT_Values.D2) { +			GT_Log.out.println("achievement." + textId + "="); +			GT_Log.out.println("achievement." + textId + ".desc="); +		} +		this.achievementList.put(textId, achievement); +		return achievement; +	} + +	public static List<Materials> oreList = new ArrayList<Materials>(); +	public static List<Integer[]> oreStats = new ArrayList<Integer[]>(); + +	public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { +		if (aMaterial != Materials._NULL) { +			oreList.add(aMaterial); +		} +		oreStats.add(new Integer[] { min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0 }); +	} + +	public static int oreReg = -1; + +	public Achievement registerOreAchievement(Materials aMaterial) { +		if (this.achievementList.get(aMaterial.name()) == null) { +			oreReg++; +			return registerAchievement(aMaterial.name(), -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, +					aMaterial.mMetaItemSubID), AchievementList.openInventory, false); +		} +		return null; +	} + +	public void issueAchievement(EntityPlayer entityplayer, String textId) { +		if(entityplayer==null){ +			return; +		} +		if (this.achievementList.containsKey(textId)) { +			entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId)); +		} +	} + +	public Achievement getAchievement(String textId) { +		if (this.achievementList.containsKey(textId)) { +			return (Achievement) this.achievementList.get(textId); +		} +		return null; +	} +	 +	public void issueAchivementHatch(EntityPlayer player, ItemStack stack){ +		if (player == null||stack==null) { +			return; +		} +		ItemData data = GT_OreDictUnificator.getItemData(stack); +		 +		if (data != null) { +			if (data.mPrefix == OrePrefixes.ingot) { +				if(data.mMaterial.mMaterial==Materials.Aluminium){ +					issueAchievement(player, "aluminium"); +				}else if(data.mMaterial.mMaterial==Materials.Titanium){ +					issueAchievement(player, "titan"); +				}else if(data.mMaterial.mMaterial==Materials.BlueSteel){ +					issueAchievement(player, "complexalloys"); +				}else if(data.mMaterial.mMaterial==Materials.Tungsten){ +					issueAchievement(player, "tungsten"); +				}else if(data.mMaterial.mMaterial==Materials.TungstenSteel){ +					issueAchievement(player, "tungstensteel"); +				} +				 +				 +			}} +		if(stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")){ +			issueAchievement(player, "artificaldia"); +		} +	} +	 +	public void issueAchivementHatchFluid(EntityPlayer player, FluidStack fluid){ +		System.out.println("fluid!"); +		if (player == null||fluid==null) { +			return; +		} +		if(fluid.getFluid().getUnlocalizedName().equals("plasma.helium")){ +			issueAchievement(player, "fusion"); +		}else if(fluid.getFluid().getUnlocalizedName().equals("molten.europium")){ +			issueAchievement(player, "advancing"); +		}else if(fluid.getFluid().getUnlocalizedName().equals("molten.americum")){ +			issueAchievement(player, "tothelimit"); +		}else if(fluid.getFluid().getUnlocalizedName().equals("molten.neutronium")){ +			issueAchievement(player, "denseaspossible"); +		}else if(fluid.getFluid().getUnlocalizedName().equals("plasma.nitrogen")){ +			issueAchievement(player, "higherefficency"); +		} +	} + +	@SubscribeEvent +	public void onCrafting(ItemCraftedEvent event) { +		System.out.println("crafting"); +		EntityPlayer player = event.player; +		ItemStack stack = event.crafting; +		if (player == null||stack==null) { +			return; +		} +		System.out.println(stack.getUnlocalizedName()); +		if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ +			if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ +				issueAchievement(player, "bronze"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ +				issueAchievement(player, "bronze"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32700")){ +				issueAchievement(player, "smallparts"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.23354")){ +				issueAchievement(player, "magneticiron"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32600")){ +				issueAchievement(player, "lvmotor"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32610")){ +				issueAchievement(player, "pump"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32630")){ +				issueAchievement(player, "transport"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32650")){ +				issueAchievement(player, "complexmachines"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32670")){ +				issueAchievement(player, "hightech"); +			} +		}else if(stack.getUnlocalizedName().equals("ic2.blockCrop")){ +			issueAchievement(player, "crops"); +		}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.")){ +			if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")){ +				issueAchievement(player, "recycling"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ +				issueAchievement(player, "repair"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.solar")){ +				issueAchievement(player, "simplyeco"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.bronze")){ +				issueAchievement(player, "firststeam"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.boiler.steel")){ +				issueAchievement(player, "highpressure"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.macerator")){ +				issueAchievement(player, "macerator"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter")){ +				issueAchievement(player, "alloysmelter"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.extractor")){ +				issueAchievement(player, "extract"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ +				issueAchievement(player, "repair"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.superbuffer.tier.")){ +				issueAchievement(player, "superbuffer"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.tank.tier.")){ +				issueAchievement(player, "whereistheocean"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")){ +				issueAchievement(player, "repair"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.chest.tier.")){ +				issueAchievement(player, "newstorage"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.hammer.tier.")){ +				issueAchievement(player, "cheapermac"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.")){ +				issueAchievement(player, "buffer"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")){ +				issueAchievement(player, "steampower"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.pump.tier.")){ +				issueAchievement(player, "slurp"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.assembler.tier.")){ +				issueAchievement(player, "avengers"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.blastfurnace")){ +				issueAchievement(player, "ebf"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.batterybuffer.")){ +				issueAchievement(player, "batterys"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.02")){ +				issueAchievement(player, "upgradeebf"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.multifurnace")){ +				issueAchievement(player, "highpowersmelt"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.01")){ +				issueAchievement(player, "energyhatch"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")){ +				issueAchievement(player, "factory"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")){ +				issueAchievement(player, "magic"); +			}else if(stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")){ +				issueAchievement(player, "highmage"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")){ +				issueAchievement(player, "amplifier"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")){ +				issueAchievement(player, "universal"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")){ +				issueAchievement(player, "alienpower"); +			}else if(stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.replicator.tier.")){ +				issueAchievement(player, "replication"); +			} +		}else if(stack.getUnlocalizedName().equals("gt.Thoriumcell")){ +			issueAchievement(player, "newfuel"); +		}else if(stack.getUnlocalizedName().equals("gt.neutronreflector")){ +			issueAchievement(player, "reflect"); +		}else if(stack.getUnlocalizedName().equals("gt.blockcasings.13")){ +			issueAchievement(player, "upgrade"); +		}else if(stack.getUnlocalizedName().equals("gt.blockcasings.14")){ +			issueAchievement(player, "upgrade2"); +		}else if(stack.getUnlocalizedName().equals("gt.blockcasings.15")){ +			issueAchievement(player, "conducting"); +		} +		 +	} + +	@SubscribeEvent +	public void onSmelting(ItemSmeltedEvent event) { +		EntityPlayer player = event.player; +		ItemStack stack = event.smelting; +		if (player == null||stack==null) { +			return; +		} +		if (stack.getItem() == Items.bread) { +			event.player.triggerAchievement(AchievementList.makeBread); +		} +	} + +	@SubscribeEvent +	public void onItemPickup(EntityItemPickupEvent event) { +		EntityPlayer player = event.entityPlayer; +		ItemStack stack = event.item.getEntityItem(); +		if (player == null||stack==null) { +			return; +		} +		ItemData data = GT_OreDictUnificator.getItemData(stack); +		if (data != null) { +			if (data.mPrefix == OrePrefixes.dust) { +				if(data.mMaterial.mMaterial == Materials.Lutetium){ +					issueAchievement(player, "newmetal"); +				} +				issueAchievement(player, "cleandust"); +			} else if (data.mPrefix == OrePrefixes.ore || data.mPrefix == OrePrefixes.oreBlackgranite || data.mPrefix == OrePrefixes.oreEndstone +					|| data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) { +				for (int i = 0; i < data.getAllMaterialStacks().size(); i++) { +					issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name()); +					 +				}return; +			}else if(data.mPrefix == OrePrefixes.crushed){ +				issueAchievement(player, "crushed"); +			}else if(data.mPrefix == OrePrefixes.crushedPurified){ +				issueAchievement(player, "washing"); +			}else if(data.mPrefix == OrePrefixes.crushedCentrifuged){ +				issueAchievement(player, "spinit"); +			} +		} +		System.out.println(stack.getUnlocalizedName()); +		if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ +			if(stack.getUnlocalizedName().equals("gt.metaitem.02.32500")){ +				issueAchievement(player, "havestlead"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32501")){ +				issueAchievement(player, "havestsilver"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32503")){ +				issueAchievement(player, "havestiron"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32504")){ +				issueAchievement(player, "havestgold"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32530")){ +				issueAchievement(player, "havestcopper"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32540")){ +				issueAchievement(player, "havesttin"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32510")){ +				issueAchievement(player, "havestoil"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.02.32511")){ +				issueAchievement(player, "havestemeralds"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32706")){ +				issueAchievement(player, "energyflow"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32702")){ +				issueAchievement(player, "bettercircuits"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32707")){ +				issueAchievement(player, "datasaving"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32597")){ +				issueAchievement(player, "orbs"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32599")){ +				issueAchievement(player, "thatspower"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32598")){ +				issueAchievement(player, "luck"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32749")){ +				issueAchievement(player, "closeit"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32730")){ +				issueAchievement(player, "manipulation"); +			}else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32729")){ +				issueAchievement(player, "filterregulate"); +			} +		}else if(stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")){ +			issueAchievement(player, "stepforward"); +		} +	} +} diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java index 53c944d2c4..88f121b51f 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java @@ -4,6 +4,7 @@  /*    */ import gregtech.api.enums.GT_Values;  /*    */ import gregtech.api.enums.Materials;  /*    */ import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SubTag;  /*    */ import gregtech.api.interfaces.internal.IGT_RecipeAdder;  /*    */ import gregtech.api.util.GT_ModHandler;  /*    */ import gregtech.api.util.GT_OreDictUnificator; @@ -22,7 +23,6 @@  /* 22 */     GT_ModHandler.removeRecipeByOutput(aStack);  /*    */       /* 24 */     GregTech_API.registerCover(aStack, new gregtech.api.objects.GT_RenderedTexture(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); -/*    */       /* 26 */     if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) {  /* 27 */       GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(2L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L), (int)Math.max(aMaterial.getMass() * 2L, 1L), 96);  /*    */     } @@ -33,10 +33,4 @@  /* 33 */       GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 2L), gregtech.api.enums.ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), Materials.Glue.getFluid(10L), GT_Utility.copyAmount(1L, new Object[] { aStack }), 64, 8);  /*    */     }  /*    */   } -/*    */ } - - -/* Location:              F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingPlate2.class - * Java compiler version: 6 (50.0) - * JD-Core Version:       0.7.1-SNAPSHOT-20140817 - */
\ No newline at end of file +/*    */ }
\ No newline at end of file diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java index 6a101dd00d..5a89aed13c 100644 --- a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java +++ b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java @@ -1,12 +1,15 @@  /*    */ package gregtech.loaders.oreprocessing;  /*    */   /*    */ import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values;  import gregtech.api.enums.ItemList;  /*    */ import gregtech.api.enums.Materials;  /*    */ import gregtech.api.enums.OrePrefixes;  /*    */ import gregtech.api.enums.SubTag;  /*    */ import gregtech.api.interfaces.IOreRecipeRegistrator;  /*    */ import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility;  /*    */ import gregtech.api.util.GT_ModHandler.RecipeBits;  /*    */ import gregtech.common.items.GT_MetaGenerated_Tool_01;  /*    */ import net.minecraft.init.Blocks; @@ -36,13 +39,15 @@ import gregtech.api.enums.ItemList;  /* 35 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(34, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });  /* 36 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(36, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });  /*    */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(160, 1, aMaterial, Materials.Rubber, new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.Rubber),'S',OrePrefixes.stick.get(Materials.Iron),'L',ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]) }); -/*    */       } +/*    */        +//				GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L,OrePrefixes.turbineBlade.get(aMaterial)), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "B", "B", "B", 'S', OrePrefixes.screw.get(aMaterial), 'B', OrePrefixes.plate.get(aMaterial) });      +				 +				    +				GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(170, 1, aMaterial, aMaterial, null),   160, 100); +				GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 8L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(172, 1, aMaterial, aMaterial, null),   320, 400); +     			GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 12L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(174, 1, aMaterial, aMaterial, null),  640, 1600); +     			GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 16L),GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Americium, 1L),GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null),  1280, 6400);         +}  /*    */     }  /*    */   } -/*    */ } - - -/* Location:              F:\Torrent\minecraft\jdgui test\gregtech_1.7.10-5.07.07-dev.jar!\gregtech\loaders\oreprocessing\ProcessingToolHeadHammer.class - * Java compiler version: 6 (50.0) - * JD-Core Version:       0.7.1-SNAPSHOT-20140817 - */
\ No newline at end of file +/*    */ }
\ No newline at end of file diff --git a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index a619e9c114..9b6e2091dd 100644 --- a/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -20,8 +20,10 @@ import gregtech.common.GT_Proxy;  import java.io.PrintStream; +import cpw.mods.fml.common.Loader;  import net.minecraft.init.Blocks;  import net.minecraft.init.Items; +import net.minecraft.item.Item;  import net.minecraft.item.ItemStack;  public class GT_CraftingRecipeLoader @@ -492,8 +494,90 @@ public class GT_CraftingRecipeLoader      GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { OrePrefixes.dust.get(Materials.Potassium), OrePrefixes.cell.get(Materials.Nitrogen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen) });      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("carbonFiber", 1L)); -     -    GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "EDE", "GGG", Character.valueOf('G'), new ItemStack(Blocks.glass, 1, 32767), Character.valueOf('D'), OrePrefixes.dust.get(Materials.Silver), Character.valueOf('E'), ItemList.IC2_Energium_Dust.get(1L, new Object[0]) }); +    if(GT_Mod.gregtechproxy.mDisableIC2Cables){ +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("copperCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("goldCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("tinCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ironCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("detectorCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("splitterCableItem", 1L)); +    	GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("electrolyzer", 1L)); + +    	if(Loader.isModLoaded("NotEnoughItems")){ +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("copperCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("goldCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("tinCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("ironCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("detectorCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("splitterCableItem", 1L)); +    		codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("electrolyzer", 1L)); +    	} +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("batBox", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("batBox", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "PCP","BBB","PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("mfeUnit", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("mfeUnit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CEC","EME","CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', OrePrefixes.battery.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("machine", 1L)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("lvTransformer", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("lvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "PCP","POP","PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin),'O', GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("mvTransformer", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("mvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper),'M', GT_ModHandler.getIC2Item("machine", 1L)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("hvTransformer", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("hvTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","IMB"," C ",'C', OrePrefixes.cableGt01.get(Materials.Gold),'M', GT_ModHandler.getIC2Item("mvTransformer", 1L),'I', OrePrefixes.circuit.get(Materials.Basic),'B', OrePrefixes.battery.get(Materials.Advanced)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("evTransformer", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("evTransformer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","IMB"," C ",'C', OrePrefixes.cableGt01.get(Materials.Aluminium),'M', GT_ModHandler.getIC2Item("hvTransformer", 1L),'I', OrePrefixes.circuit.get(Materials.Advanced),'B', OrePrefixes.battery.get(Materials.Master)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("cesuUnit", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("cesuUnit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PCP","BBB","PPP",'C', OrePrefixes.cableGt01.get(Materials.Copper),'P', OrePrefixes.plate.get(Materials.Bronze),'B', OrePrefixes.battery.get(Materials.Advanced)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("luminator", 1L)); +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("teleporter", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("teleporter", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"GFG","CMC","GDG",'C', OrePrefixes.cableGt01.get(Materials.Platinum),'G', OrePrefixes.circuit.get(Materials.Advanced),'D', OrePrefixes.gem.get(Materials.Diamond), 'M', GT_ModHandler.getIC2Item("machine", 1L), 'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("energyOMat", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("energyOMat", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"RBR","CMC",'C', OrePrefixes.cableGt01.get(Materials.Copper),'R', OrePrefixes.dust.get(Materials.Redstone),'B', OrePrefixes.battery.get(Materials.Basic), 'M', GT_ModHandler.getIC2Item("machine", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("advBattery", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("advBattery", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CTC","TST","TLT",'C', OrePrefixes.cableGt01.get(Materials.Copper),'S', OrePrefixes.dust.get(Materials.Sulfur),'L', OrePrefixes.dust.get(Materials.Lead), 'T', GT_ModHandler.getIC2Item("casingbronze", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("boatElectric", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("boatElectric", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","XWX","XXX",'C', OrePrefixes.cableGt01.get(Materials.Copper),'X', OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("cropnalyzer", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("cropnalyzer", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CC ","RGR","RIR",'C', OrePrefixes.cableGt01.get(Materials.Copper),'R', OrePrefixes.dust.get(Materials.Redstone),'G', OrePrefixes.block.get(Materials.Glass), 'I', OrePrefixes.circuit.get(Materials.Basic)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("coil", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("coil", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","CXC","CCC",'C', OrePrefixes.wireGt01.get(Materials.Copper),'X', OrePrefixes.ingot.get(Materials.AnyIron)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("powerunit", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("powerunit", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"BCA","BIM","BCA",'C', OrePrefixes.cableGt01.get(Materials.Copper),'B', OrePrefixes.battery.get(Materials.Basic),'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', OrePrefixes.circuit.get(Materials.Basic),'M', GT_ModHandler.getIC2Item("elemotor", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("powerunitsmall", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("powerunitsmall", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" CA","BIM"," CA",'C', OrePrefixes.cableGt01.get(Materials.Copper),'B', OrePrefixes.battery.get(Materials.Basic),'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', OrePrefixes.circuit.get(Materials.Basic),'M', GT_ModHandler.getIC2Item("elemotor", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("remote", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("remote", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" C ","TLT"," F ",'C', OrePrefixes.cableGt01.get(Materials.Copper),'L', OrePrefixes.dust.get(Materials.Lapis),'T', GT_ModHandler.getIC2Item("casingtin", 1L),'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("odScanner", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("odScanner", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PGP","CBC","WWW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'G', OrePrefixes.dust.get(Materials.Glowstone),'B', OrePrefixes.battery.get(Materials.Advanced),'C', OrePrefixes.circuit.get(Materials.Advanced),'P', GT_ModHandler.getIC2Item("casinggold", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ovScanner", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ovScanner", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PDP","GCG","WSW",'W', OrePrefixes.cableGt01.get(Materials.Gold),'G', OrePrefixes.dust.get(Materials.Glowstone),'D', OrePrefixes.battery.get(Materials.Elite),'C', OrePrefixes.circuit.get(Materials.Advanced),'P', GT_ModHandler.getIC2Item("casinggold", 1L),'S', GT_ModHandler.getIC2Item("odScanner", 1L)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("solarHelmet", 1L)); +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("staticBoots", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("staticBoots", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"I I","IWI","CCC",'C', OrePrefixes.cableGt01.get(Materials.Copper),'I', OrePrefixes.ingot.get(Materials.Iron),'W', new ItemStack(Blocks.wool)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ecMeter", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ecMeter", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {" G ","CIC","C C",'C', OrePrefixes.cableGt01.get(Materials.Copper),'G', OrePrefixes.dust.get(Materials.Glowstone),'I', OrePrefixes.circuit.get(Materials.Basic)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("obscurator", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("obscurator", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"RER","CAC","RRR",'C', OrePrefixes.cableGt01.get(Materials.Gold),'R', OrePrefixes.dust.get(Materials.Redstone),'E', OrePrefixes.battery.get(Materials.Advanced), 'A', OrePrefixes.circuit.get(Materials.Advanced)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"CCC","WEW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'C', GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L), 'E', OrePrefixes.circuit.get(Materials.Basic)});    +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("transformerUpgrade", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("transformerUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"GGG","WTW","GEG",'W', OrePrefixes.cableGt01.get(Materials.Gold),'T', GT_ModHandler.getIC2Item("mvTransformer", 1L),'E', OrePrefixes.circuit.get(Materials.Basic),'G', OrePrefixes.block.get(Materials.Glass)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PPP","WBW","PEP",'W', OrePrefixes.cableGt01.get(Materials.Copper),'E', OrePrefixes.circuit.get(Materials.Basic),'P', OrePrefixes.plank.get(Materials.Wood),'B', OrePrefixes.battery.get(Materials.Basic)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("ejectorUpgrade", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"PHP","WEW",'W', OrePrefixes.cableGt01.get(Materials.Copper),'E', OrePrefixes.circuit.get(Materials.Basic),'P', new ItemStack(Blocks.piston),'H', new ItemStack(Blocks.hopper)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("suBattery", 1L)); +      GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("suBattery", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] {"W","C","R",'W', OrePrefixes.cableGt01.get(Materials.Copper),'C', OrePrefixes.dust.get(Materials.HydratedCoal),'R', OrePrefixes.dust.get(Materials.Redstone)});   +      GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("frequencyTransmitter", 1L)); +       }else{GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "EDE", "GGG", Character.valueOf('G'), new ItemStack(Blocks.glass, 1, 32767), Character.valueOf('D'), OrePrefixes.dust.get(Materials.Silver), Character.valueOf('E'), ItemList.IC2_Energium_Dust.get(1L, new Object[0]) });}      GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Energium_Dust.get(1L, new Object[0]));      if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.gregtechrecipes, "energycrystalruby", true)) { diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index e1a21303fe..d7241b9296 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,5 +1,6 @@  package gregtech.loaders.postload; +import gregtech.GT_Mod;  import gregtech.api.GregTech_API;  import gregtech.api.enums.ConfigCategories;  import gregtech.api.enums.ConfigCategories.Recipes; @@ -46,7 +47,7 @@ public class GT_MachineRecipeLoader        GT_Utility.removeSimpleIC2MachineRecipe(GT_Values.NI, ic2.api.recipe.Recipes.metalformerExtruding.getRecipes(), ItemList.Cell_Empty.get(3L, new Object[0]));        GT_Utility.removeSimpleIC2MachineRecipe(ItemList.IC2_Energium_Dust.get(1L, new Object[0]), ic2.api.recipe.Recipes.compressor.getRecipes(), GT_Values.NI);        GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Items.gunpowder), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); -      GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); +      GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI);           }      catch (Throwable e) {}      GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(5L), 10000, 32, 2); @@ -838,12 +839,13 @@ public class GT_MachineRecipeLoader      GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), ItemList.Shape_Mold_Credit.get(0L, new Object[0]), ItemList.Credit_Iron.get(4L, new Object[0]), 100, 16);      GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), ItemList.Shape_Mold_Credit.get(0L, new Object[0]), ItemList.Credit_Iron.get(4L, new Object[0]), 100, 16); +    if(!GT_Mod.gregtechproxy.mDisableIC2Cables){      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1L), GT_ModHandler.getIC2Item("copperCableItem", 3L), 100, 2);      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L), GT_ModHandler.getIC2Item("copperCableItem", 3L), 100, 2);      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L), GT_ModHandler.getIC2Item("tinCableItem", 4L), 150, 1);      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_ModHandler.getIC2Item("ironCableItem", 6L), 200, 2);      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_ModHandler.getIC2Item("ironCableItem", 6L), 200, 2); -    GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getIC2Item("goldCableItem", 6L), 200, 1); +    GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), GT_ModHandler.getIC2Item("goldCableItem", 6L), 200, 1);}      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 8L), GT_ModHandler.getIC2Item("carbonFiber", 1L), 400, 2);      GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Graphene, 1L), 400, 2);      if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { @@ -957,11 +959,12 @@ public class GT_MachineRecipeLoader      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new ItemStack(Blocks.torch, 6), 400, 1);      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), ItemList.IC2_Resin.get(1L, new Object[0]), new ItemStack(Blocks.torch, 6), 400, 1);      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8L), new ItemStack(Items.flint, 1), ItemList.IC2_Compressed_Coal_Ball.get(1L, new Object[0]), 400, 4); +    if(!GT_Mod.gregtechproxy.mDisableIC2Cables){      GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("tinCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), GT_ModHandler.getIC2Item("insulatedTinCableItem", 1L), 100, 2);      GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("copperCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L), 100, 2);      GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("goldCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L), GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L), 200, 2);      GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("ironCableItem", 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 3L), GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L), 300, 2); -     +    }      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.wooden_sword, 1), 100, 16);      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.stone_sword, 1), 100, 16);      GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), new ItemStack(Items.iron_sword, 1), 100, 16); diff --git a/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java b/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java index 4d32ce3074..b916886abe 100644 --- a/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java +++ b/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java @@ -1,12 +1,15 @@  /*  1:   */ package gregtech.loaders.postload;
  /*  2:   */ 
 -/*  3:   */ import gregtech.api.enums.ItemList;
 +/*  3:   */ import gregtech.GT_Mod;
 +import gregtech.api.enums.ItemList;
  /*  4:   */ import gregtech.api.enums.Materials;
  /*  5:   */ import gregtech.api.enums.OrePrefixes;
  /*  6:   */ import gregtech.api.util.GT_Log;
  /*  7:   */ import gregtech.api.util.GT_ModHandler;
  /*  8:   */ import gregtech.api.util.GT_OreDictUnificator;
 +
  /*  9:   */ import java.io.PrintStream;
 +
  /* 10:   */ import net.minecraft.init.Blocks;
  /* 11:   */ import net.minecraft.init.Items;
  /* 12:   */ import net.minecraft.item.ItemStack;
 @@ -57,8 +60,9 @@  /* 57:54 */     GT_ModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L, new Object[0]));
  /* 58:55 */     GT_ModHandler.addScrapboxDrop(0.4F, ItemList.Circuit_Board_Advanced.get(1L, new Object[0]));
  /* 59:56 */     GT_ModHandler.addScrapboxDrop(0.2F, ItemList.Circuit_Board_Elite.get(1L, new Object[0]));
 +				if(!GT_Mod.gregtechproxy.mDisableIC2Cables){
  /* 60:57 */     GT_ModHandler.addScrapboxDrop(2.0F, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L));
 -/* 61:58 */     GT_ModHandler.addScrapboxDrop(0.4F, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L));
 +/* 61:58 */     GT_ModHandler.addScrapboxDrop(0.4F, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L));}
  /* 62:59 */     GT_ModHandler.addScrapboxDrop(0.9F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L));
  /* 63:60 */     GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L));
  /* 64:61 */     GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L));
 diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index af525f8c00..78264f6284 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1046,12 +1046,12 @@ import net.minecraftforge.oredict.OreDictionary;  /* 1024: 962 */     makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, gregtech.api.enums.GT_Values.V[0], true, false);
  /* 1025:     */     
  /* 1026: 964 */     makeWires(Materials.Superconductor, 2020, 1L, 1L, 4L, gregtech.api.enums.GT_Values.V[9], false, true);
 -/* 1027:     */     
 +/* 1027:     */     if(!GT_Mod.gregtechproxy.mDisableIC2Cables){
  /* 1028: 966 */     GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("copperCableItem", 2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.AnyCopper) });
  /* 1029: 967 */     GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("goldCableItem", 4L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Gold) });
  /* 1030: 968 */     GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("ironCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.AnyIron) });
  /* 1031: 969 */     GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("tinCableItem", 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xP", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Tin) });
 -/* 1032:     */     
 +/* 1032:     */     }
  /* 1033:     */ 
  /* 1034:     */ 
  /* 1035: 973 */     GT_OreDictUnificator.registerOre(OrePrefixes.pipeSmall.get(Materials.Wood), new GT_MetaPipeEntity_Fluid(5101, "GT_Pipe_Wood_Small", "Small Wooden Fluid Pipe", 0.375F, Materials.Wood, 10, 350, false).getStackForm(1L));
 | 
