From c607243491e19111ae93d98696a86177f20dd2fe Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:04:12 +0300 Subject: add battery --- src/main/java/gregtech/api/enums/ItemList.java | 1 + .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 51aa28c15f..e9c26962d7 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,6 +628,7 @@ public enum ItemList implements IItemContainer { MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, + Energy_Module, Maximum_Battery, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 8f491ac5e0..23f8d9d088 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -438,17 +438,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0]), null, 1600, 2); GT_Values.RA.addCannerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 32L), ItemList.Battery_Hull_HV.get(1L, new Object[0]), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0]), null, 1600, 2); - ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_LapotronicOrb.set(addItem(tLastID = 597, "Lapotronic Energy Orb", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 100000000L, GT_Values.V[5], 5L, -3L, true); - ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + ItemList.ZPM.set(addItem(tLastID = 598, "Zero Point Module", "Single use battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); setElectricStats(32000 + tLastID, 2000000000000L, GT_Values.V[7], 7L, -2L, true); - ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_LapotronicOrb2.set(addItem(tLastID = 599, "Lapotronic Energy Orb Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 1000000000L, GT_Values.V[6], 6L, -3L, true); - ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); - setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); + ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)})); ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); @@ -770,6 +769,14 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { GregTech_API.registerCover(ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)}), new GT_Cover_NeedMaintainance()); GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), 600, 24); + ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); + + ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); + + ItemList.Maximum_Battery.set(addItem(tLastID = 737, "Maximum Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[9], 9L, -3L, true); } -- cgit From 733d77481757b6b1619408ea6f4766f770b45419 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:07:31 +0300 Subject: add icon battery --- .../gregtech/textures/items/gt.metaitem.01/736.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/736/1.png | Bin 0 -> 328 bytes .../gregtech/textures/items/gt.metaitem.01/736/2.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/3.png | Bin 0 -> 323 bytes .../gregtech/textures/items/gt.metaitem.01/736/4.png | Bin 0 -> 319 bytes .../gregtech/textures/items/gt.metaitem.01/736/5.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/6.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/7.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/736/8.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/737.png | Bin 0 -> 2312 bytes .../gregtech/textures/items/gt.metaitem.01/737/1.png | Bin 0 -> 2361 bytes .../gregtech/textures/items/gt.metaitem.01/737/2.png | Bin 0 -> 2374 bytes .../gregtech/textures/items/gt.metaitem.01/737/3.png | Bin 0 -> 2359 bytes .../gregtech/textures/items/gt.metaitem.01/737/4.png | Bin 0 -> 2360 bytes .../gregtech/textures/items/gt.metaitem.01/737/5.png | Bin 0 -> 2350 bytes .../gregtech/textures/items/gt.metaitem.01/737/6.png | Bin 0 -> 2378 bytes .../gregtech/textures/items/gt.metaitem.01/737/7.png | Bin 0 -> 2305 bytes .../gregtech/textures/items/gt.metaitem.01/737/8.png | Bin 0 -> 2312 bytes 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png (limited to 'src/main') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png new file mode 100644 index 0000000000..e58b3c1383 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png new file mode 100644 index 0000000000..a53f18ee61 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png new file mode 100644 index 0000000000..c0d57c7df8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png new file mode 100644 index 0000000000..68d9520021 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png new file mode 100644 index 0000000000..97c4936411 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png new file mode 100644 index 0000000000..007d7ce4ec Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png new file mode 100644 index 0000000000..39faa3ce2e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png new file mode 100644 index 0000000000..62327c4be8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png new file mode 100644 index 0000000000..e58b3c1383 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png new file mode 100644 index 0000000000..4644bf59c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png new file mode 100644 index 0000000000..57b21c4991 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png new file mode 100644 index 0000000000..e215a3750d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png new file mode 100644 index 0000000000..a7490e93c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png new file mode 100644 index 0000000000..165b6a3133 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png new file mode 100644 index 0000000000..7d393914d6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png new file mode 100644 index 0000000000..2757c27c4a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png new file mode 100644 index 0000000000..94b7336ed4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png new file mode 100644 index 0000000000..4644bf59c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png differ -- cgit From e2017c72c30c4eac9fff231482da660b7eccd370 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:10:59 +0300 Subject: add recipe --- .../loaders/postload/GT_MachineRecipeLoader.java | 61 +++++++++++++++++----- 1 file changed, 48 insertions(+), 13 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ea7781c7fb..d68f5ba874 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2129,22 +2129,57 @@ if(Loader.isModLoaded("Railcraft")){ }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), + ItemList.Circuit_Wetwarecomputer.get(1,o), ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), - ItemList.Field_Generator_UV.get(2,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + ItemList.Field_Generator_LuV.get(2,o), + ItemList.Circuit_Wafer_SoC2.get(64,o), + ItemList.Circuit_Wafer_SoC2.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(8,o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), }, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.ZPM2.get(1,o), 2000, 300000); - + GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Module.get(1,o), 2000, 100000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Circuit_Wetwaresupercomputer.get(1,o), + ItemList.Energy_Module.get(8L, new Object[0]), + ItemList.Field_Generator_ZPM.get(2,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Wafer_HPIC.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.ZPM2.get(1,o), 2000, 200000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.ZPM2.get(1,o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.Circuit_Wetwaremainframe.get(1,o), + ItemList.ZPM2.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2,o), + ItemList.Circuit_Neuroprocessor.get(64,o), + ItemList.Circuit_Neuroprocessor.get(64,o), + ItemList.Circuit_Parts_DiodeSMD.get(16,o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + Materials.Naquadria.getMolten(1152) + }, ItemList.Maximum_Battery.get(1,o), 2000, 300000); + GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), ItemList.Circuit_Quantummainframe.get(1,o), -- cgit From 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:12:20 +0300 Subject: add achievements --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 8 +++++++- src/main/resources/assets/gregtech/lang/en_US.lang | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 7d560f0a96..acd78f5906 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -207,7 +207,9 @@ public class GT_Achievements { registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); - registerAchievement("whatnow", 4, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("whatnow", 10, 10, ItemList.ZPM2.get(1, new Object[]{}), "zpmage", false); + registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("whattheend", 12, 10, ItemList.Maximum_Battery.get(1, new Object[]{}), "whatnow", false); // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -597,6 +599,10 @@ public class GT_Achievements { issueAchievement(player, "filterregulate"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32605")) { issueAchievement(player, "whatnow"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { + issueAchievement(player, "zpmage"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { + issueAchievement(player, "whattheend"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32030")) { issueAchievement(player, "gtmonosilicon"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 970e5fd07c..7f8489d589 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,8 +408,12 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium +achievement.zpmage=Welcome to ZPM Energy Age +achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery +achievement.whattheend=The End? +achievement.whattheend.desc=Craft a Maximum Battery achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -490,6 +494,10 @@ achievement.gt.metaitem.01.32605=Ultimate Battery achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32736=Energy Module +achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32737=Maximum Battery +achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI -- cgit From 612cece6299ed698146d041d1277b52fa6e65df1 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sun, 9 Jul 2017 19:36:23 +0300 Subject: update change --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 6 +++--- .../java/gregtech/loaders/misc/GT_Achievements.java | 6 +++--- .../loaders/postload/GT_MachineRecipeLoader.java | 8 ++++---- src/main/resources/assets/gregtech/lang/en_US.lang | 4 ++-- .../gregtech/textures/items/gt.metaitem.01/737.png | Bin 2312 -> 319 bytes .../gregtech/textures/items/gt.metaitem.01/737/1.png | Bin 2361 -> 325 bytes .../gregtech/textures/items/gt.metaitem.01/737/2.png | Bin 2374 -> 317 bytes .../gregtech/textures/items/gt.metaitem.01/737/3.png | Bin 2359 -> 313 bytes .../gregtech/textures/items/gt.metaitem.01/737/4.png | Bin 2360 -> 310 bytes .../gregtech/textures/items/gt.metaitem.01/737/5.png | Bin 2350 -> 313 bytes .../gregtech/textures/items/gt.metaitem.01/737/6.png | Bin 2378 -> 315 bytes .../gregtech/textures/items/gt.metaitem.01/737/7.png | Bin 2305 -> 321 bytes .../gregtech/textures/items/gt.metaitem.01/737/8.png | Bin 2312 -> 319 bytes 14 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index e9c26962d7..6763328cf2 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -628,7 +628,7 @@ public enum ItemList implements IItemContainer { MagicEnergyAbsorber_LV, MagicEnergyAbsorber_MV, MagicEnergyAbsorber_HV, MagicEnergyAbsorber_EV, Depleted_Thorium_1, Depleted_Thorium_2, Depleted_Thorium_4, Processing_Array, Distillation_Tower, Energy_LapotronicOrb2, - Energy_Module, Maximum_Battery, + Energy_Module, Energy_Cluster, ZPM2, Quantum_Tank_LV, Quantum_Tank_MV, Quantum_Tank_HV, Quantum_Tank_EV, Quantum_Tank_IV, Quantum_Chest_LV, Quantum_Chest_MV, Quantum_Chest_HV, Quantum_Chest_EV, Quantum_Chest_IV, NULL, Cover_RedstoneTransmitterExternal, Cover_RedstoneTransmitterInternal, Cover_RedstoneReceiverExternal, Cover_RedstoneReceiverInternal, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 23f8d9d088..05f71ba210 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -772,11 +772,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); - ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), OrePrefixes.battery.get(Materials.Ultimate)})); + ItemList.Energy_Cluster.set(addItem(tLastID = 737, "Energy Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); - ItemList.Maximum_Battery.set(addItem(tLastID = 737, "Maximum Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); - setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[9], 9L, -3L, true); + ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); } diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index acd78f5906..2266673e40 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -207,9 +207,9 @@ public class GT_Achievements { registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); - registerAchievement("whatnow", 10, 10, ItemList.ZPM2.get(1, new Object[]{}), "zpmage", false); registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); - registerAchievement("whattheend", 12, 10, ItemList.Maximum_Battery.get(1, new Object[]{}), "whatnow", false); + registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false); + registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false); // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -602,7 +602,7 @@ public class GT_Achievements { } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { issueAchievement(player, "zpmage"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { - issueAchievement(player, "whattheend"); + issueAchievement(player, "uvage"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32030")) { issueAchievement(player, "gtmonosilicon"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) { diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d68f5ba874..101aaafee8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2160,15 +2160,15 @@ if(Loader.isModLoaded("Railcraft")){ }, new FluidStack[]{ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.ZPM2.get(1,o), 2000, 200000); + }, ItemList.Energy_Cluster.get(1,o), 2000, 200000); - GT_Values.RA.addAssemblylineRecipe(ItemList.ZPM2.get(1,o), 288000, new ItemStack[]{ + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1,o), 288000, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.ZPM2.get(8L, new Object[0]), + ItemList.Energy_Cluster.get(8L, new Object[0]), ItemList.Field_Generator_UV.get(2,o), ItemList.Circuit_Neuroprocessor.get(64,o), ItemList.Circuit_Neuroprocessor.get(64,o), @@ -2178,7 +2178,7 @@ if(Loader.isModLoaded("Railcraft")){ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), Materials.Naquadria.getMolten(1152) - }, ItemList.Maximum_Battery.get(1,o), 2000, 300000); + }, ItemList.ZPM2.get(1,o), 2000, 300000); GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 7f8489d589..b5f598fe2e 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -412,8 +412,8 @@ achievement.zpmage=Welcome to ZPM Energy Age achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.whattheend=The End? -achievement.whattheend.desc=Craft a Maximum Battery +achievement.uvage=Welcome to UV Energy Age +achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png index 4644bf59c8..b1068d091c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png index 57b21c4991..38cbdcf448 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png index e215a3750d..e6deaf2343 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png index a7490e93c8..2f25838028 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png index 165b6a3133..a42c8d0544 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png index 7d393914d6..d0a89ed910 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png index 2757c27c4a..f6fadbe522 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png index 94b7336ed4..799981d620 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png index 4644bf59c8..b1068d091c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png differ -- cgit From 820b335d831f60e1936c462d0cb8e7dba3c13fae Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Mon, 17 Jul 2017 12:56:37 +0300 Subject: add config EnableZPMandUVBatteries default false --- .../common/items/GT_MetaGenerated_Item_01.java | 6 + .../gregtech/loaders/misc/GT_Achievements.java | 4 + .../loaders/postload/GT_MachineRecipeLoader.java | 122 ++++++++++++--------- src/main/resources/assets/gregtech/lang/en_US.lang | 6 +- 4 files changed, 81 insertions(+), 57 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 05f71ba210..75d911de0f 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -449,6 +449,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { + ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate)})); + setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); + + ItemList.Energy_Cluster.set(addItem(tLastID = 737, "Energy Cluster", "Reusable battery", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L)})); + setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); + ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)})); ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); ItemList.Electric_Motor_HV.set(addItem(tLastID = 602, "Electric Motor (HV)", "", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L)})); diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 2266673e40..d2bf8a7392 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -617,6 +617,10 @@ public class GT_Achievements { issueAchievement(player, "gtwetware"); } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) { issueAchievement(player, "gtwetmain"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) { + issueAchievement(player, "zpmage"); + } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) { + issueAchievement(player, "uvage"); } } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) { issueAchievement(player, "newfuel"); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 101aaafee8..fe7e04825b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2127,59 +2127,77 @@ if(Loader.isModLoaded("Railcraft")){ Materials.SolderingAlloy.getMolten(2880), GregTech_API.mIC2Classic ? Materials.Water.getFluid(10000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) }, ItemList.Circuit_Wetwaremainframe.get(1,o), 2000, 300000); - - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Circuit_Wetwarecomputer.get(1,o), - ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), - ItemList.Field_Generator_LuV.get(2,o), - ItemList.Circuit_Wafer_SoC2.get(64,o), - ItemList.Circuit_Wafer_SoC2.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(8,o), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.Energy_Module.get(1,o), 2000, 100000); - - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Circuit_Wetwaresupercomputer.get(1,o), - ItemList.Energy_Module.get(8L, new Object[0]), - ItemList.Field_Generator_ZPM.get(2,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Wafer_HPIC.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - }, ItemList.Energy_Cluster.get(1,o), 2000, 200000); - - GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1,o), 288000, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Circuit_Wetwaremainframe.get(1,o), - ItemList.Energy_Cluster.get(8L, new Object[0]), - ItemList.Field_Generator_UV.get(2,o), - ItemList.Circuit_Neuroprocessor.get(64,o), - ItemList.Circuit_Neuroprocessor.get(64,o), - ItemList.Circuit_Parts_DiodeSMD.get(16,o), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880), - GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), - Materials.Naquadria.getMolten(1152) - }, ItemList.ZPM2.get(1,o), 2000, 300000); + if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) { + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Circuit_Wetwarecomputer.get(1, o), + ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), + ItemList.Field_Generator_LuV.get(2, o), + ItemList.Circuit_Wafer_SoC2.get(64, o), + ItemList.Circuit_Wafer_SoC2.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(8, o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(8000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Module.get(1, o), 2000, 100000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Module.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 16L), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Circuit_Wetwaresupercomputer.get(1, o), + ItemList.Energy_Module.get(8L, new Object[0]), + ItemList.Field_Generator_ZPM.get(2, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.Energy_Cluster.get(1, o), 2000, 200000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_Cluster.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Energy_Cluster.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2, o), + ItemList.Circuit_Neuroprocessor.get(64, o), + ItemList.Circuit_Neuroprocessor.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), + Materials.Naquadria.getMolten(1152) + }, ItemList.ZPM2.get(1, o), 2000, 300000); + }else { + GT_Values.RA.addAssemblylineRecipe(ItemList.Energy_LapotronicOrb2.get(1, o), 288000, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16L), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Circuit_Wetwaremainframe.get(1, o), + ItemList.Energy_LapotronicOrb2.get(8L, new Object[0]), + ItemList.Field_Generator_UV.get(2, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Wafer_HPIC.get(64, o), + ItemList.Circuit_Parts_DiodeSMD.get(16, o), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 32), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + GregTech_API.mIC2Classic ? Materials.Water.getFluid(16000) : new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) + }, ItemList.ZPM2.get(1, o), 2000, 300000); + } GT_Values.RA.addAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1), 144000, new ItemStack[]{ ItemList.Casing_Fusion_Coil.get(1,o), ItemList.Circuit_Quantummainframe.get(1,o), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b5f598fe2e..08dba5530f 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,12 +408,8 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium -achievement.zpmage=Welcome to ZPM Energy Age -achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.uvage=Welcome to UV Energy Age -achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -496,7 +492,7 @@ achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32736=Energy Module achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32737=Maximum Battery +achievement.gt.metaitem.01.32737=Energy Cluster achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet -- cgit From 848a57291a2145680e0a87f7178b416e03f1ffaa Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Sat, 22 Jul 2017 16:02:44 +0800 Subject: Correct description The cost is actually tripled at: https://github.com/Blood-Asp/GT5-Unofficial/blob/unstable/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java#L95 --- .../common/tileentities/automation/GT_MetaTileEntity_Regulator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java index aa2d6e7304..cfb1b757df 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_Regulator "Filters up to 9 different Items", "Allows Item-specific output stack size", "Allows Item-specific output slot", - "Consumes 1EU per moved Item"}); + "Consumes 3EU per moved Item"}); } public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) { -- cgit From 2482504b5020741d2498cfa825b25c0caf6932b7 Mon Sep 17 00:00:00 2001 From: Dimach Date: Fri, 28 Jul 2017 16:12:40 +0300 Subject: Added new function to GT scanner - print voltage and amperage of electric cable at last second. --- src/main/java/gregtech/api/util/GT_Utility.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/main') diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index ec4db394e0..acc5c9dac5 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -14,6 +14,7 @@ import gregtech.api.interfaces.IProjectileItem; import gregtech.api.interfaces.tileentity.*; import gregtech.api.items.GT_EnergyArmor_Item; import gregtech.api.items.GT_Generic_Item; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.net.GT_Packet_Sound; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.ItemData; @@ -1732,6 +1733,15 @@ public class GT_Utility { } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); } + try { + if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable) { + GT_MetaPipeEntity_Cable c = (GT_MetaPipeEntity_Cable) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); + tList.add("Max voltage last second " + c.mTransferredVoltageLast20); + tList.add("Max amperage last second " + c.mTransferredAmperageLast20); + } + } catch (Throwable e) { + if (D1) e.printStackTrace(GT_Log.err); + } try { if (tTileEntity instanceof IBasicEnergyContainer && ((IBasicEnergyContainer) tTileEntity).getEUCapacity() > 0) { tList.add(trans("179","Max IN: ") + ((IBasicEnergyContainer) tTileEntity).getInputVoltage() + trans("180"," EU")); -- cgit From c09f6b5bdd47e51c3d5ec41d9947f1f94bfb0267 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Wed, 16 Aug 2017 13:14:23 +0800 Subject: Fix Tooltip of Pump Add the missing bracket --- .../common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index 1cc9635f1f..c4fa8d7397 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -34,7 +34,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { public Block mPumpedBlock2 = null; public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 3, new String[]{"The best way to empty Oceans!", "Pumping Area: " + (10 * ((int) Math.pow(1.6, aTier))) * 2 + 1 + "x" + (10 * ((int) Math.pow(1.6, aTier))) * 2 + 1}); + super(aID, aName, aNameRegional, aTier, 3, new String[]{"The best way to empty Oceans!", "Pumping Area: " + ((10 * ((int) Math.pow(1.6, aTier))) * 2 + 1) + "x" + ((10 * ((int) Math.pow(1.6, aTier))) * 2 + 1)}); } public GT_MetaTileEntity_Pump(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { -- cgit From 4b36ca77be9997df93074353820ac6ec66af6643 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Wed, 16 Aug 2017 16:23:08 +0800 Subject: Fix the Generated Item Pipes Correct the factor. --- src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index e88cc69741..208983860d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1629,7 +1629,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.pipeHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 2, "GT_Pipe_" + displayName + "_Huge", "Huge " + displayName +" Item Pipe", 1.00F, aMaterial, baseInvSlots * 4, 8192 / baseInvSlots, aBoolConst_0).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveMedium.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 3, "GT_Pipe_Restrictive_" + displayName, "Restrictive " + displayName + " Item Pipe", 0.50F, aMaterial, baseInvSlots, 3276800 / baseInvSlots, true).getStackForm(1L)); GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveLarge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 4, "GT_Pipe_Restrictive_" + displayName + "_Large","Large Restrictive " + displayName + " Item Pipe", 0.75F, aMaterial, baseInvSlots * 2, 1638400 / baseInvSlots, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 5, "GT_Pipe_Restrictive_" + displayName + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", 0.875F, aMaterial, baseInvSlots * 2, 819200 / baseInvSlots, true).getStackForm(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.pipeRestrictiveHuge.get(aMaterial), new GT_MetaPipeEntity_Item(startID + 5, "GT_Pipe_Restrictive_" + displayName + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", 0.875F, aMaterial, baseInvSlots * 4, 819200 / baseInvSlots, true).getStackForm(1L)); } -- cgit From 6691f1e86c91aa524f40f01ba7406410728825fc Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Thu, 17 Aug 2017 14:51:45 +0800 Subject: Update GT_Cover_FluidRegulator.java Improve the screwdriver-rightclick behavior. --- src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index fd8e13504c..0e6d19ebe7 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -61,9 +61,9 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehavior { public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ)[0] >= 0.5F) { - aCoverVariable += 16; + aCoverVariable += aPlayer.isSneaking() ? 256 : 16; } else { - aCoverVariable -= 16; + aCoverVariable -= aPlayer.isSneaking() ? 256 : 16; } if (aCoverVariable > mTransferRate) { aCoverVariable = mTransferRate; -- cgit From ec0767d4fd84c149baebf17c1fd0a405357e8b2d Mon Sep 17 00:00:00 2001 From: Techlone Date: Sat, 19 Aug 2017 03:17:14 +0500 Subject: Fix inconsistent worldgen --- .../java/gregtech/common/GT_Worldgenerator.java | 33 ++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index 2b63f337c3..9036d1f642 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -47,11 +47,10 @@ public class GT_Worldgenerator implements IWorldGenerator { if (tempDimensionId != -1 && tempDimensionId != 1 && !aChunkGenerator.getClass().getName().contains("galacticraft")) { tempDimensionId = 0; } - new WorldGenContainer(new XSTR(aRandom.nextInt()), aX * 16, aZ * 16, tempDimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName).run(); + new WorldGenContainer(aX * 16, aZ * 16, tempDimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName).run(); } public static class WorldGenContainer implements Runnable { - public final Random mRandom; public int mX; public int mZ; public final int mDimensionType; @@ -61,8 +60,7 @@ public class GT_Worldgenerator implements IWorldGenerator { public final String mBiome; public static HashSet mGenerated = new HashSet<>(2000); - public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) { - this.mRandom = aRandom; + public WorldGenContainer(int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider, String aBiome) { this.mX = aX; this.mZ = aZ; this.mDimensionType = aDimensionType; @@ -82,22 +80,35 @@ public class GT_Worldgenerator implements IWorldGenerator { return mWorld.checkChunksExist(xCenter - 16, 0, zCenter - 16, xCenter + 16, 0, zCenter + 16); } + public Random getRandom(int xChunk, int zChunk) { + long worldSeed = mWorld.getSeed(); + Random fmlRandom = new Random(worldSeed); + long xSeed = fmlRandom.nextLong() >> 2 + 1L; + long zSeed = fmlRandom.nextLong() >> 2 + 1L; + long chunkSeed = (xSeed * xChunk + zSeed * zChunk) ^ worldSeed; + fmlRandom.setSeed(chunkSeed); + return new XSTR(fmlRandom.nextInt()); + } + public void run() { - int xCenter = getVeinCenterCoordinate(mX >> 4) << 4; - int zCenter = getVeinCenterCoordinate(mZ >> 4) << 4; + int xCenter = getVeinCenterCoordinate(mX >> 4); + int zCenter = getVeinCenterCoordinate(mZ >> 4); + Random random