From b83f5219ea361ca08d0acb1838bd0d537ad497d8 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 10 Dec 2021 20:03:40 +0800 Subject: mojor fix --- .../blocks/tileEntity/LargeEssentiaGenerator.java | 4 +- src/main/java/goodgenerator/items/MyMaterial.java | 14 +- .../items/nuclear/IsotopeMaterial.java | 2 + .../items/nuclear/IsotopeMaterialLoader.java | 161 +++++++++++++++++++++ .../loader/NaquadahReworkRecipeLoader.java | 91 ++++-------- .../loader/NeutronActivatorLoader.java | 2 +- .../java/goodgenerator/loader/RecipeLoader.java | 13 +- .../java/goodgenerator/main/GoodGenerator.java | 2 +- .../resources/assets/goodgenerator/lang/en_US.lang | 2 +- .../textures/items/icons/isotope/stable1.png | Bin 456 -> 475 bytes .../textures/items/icons/isotope/stable1tiny.png | Bin 577 -> 606 bytes .../textures/items/icons/isotope/unstable1.png | Bin 500 -> 605 bytes .../textures/items/icons/isotope/unstable1tiny.png | Bin 634 -> 763 bytes 13 files changed, 222 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index 6acbb86ed1..8a1e2a9805 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -310,10 +310,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM long baseValue = LargeEssentiaEnergyData.getAspectFuelValue(aspect); double ceoOutput = 0; int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 2; - if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { + if (depleteInput(Materials.SuperCoolant.getFluid(ceoInput))) { ceoOutput = 9.0D; } - else if (depleteInput(Materials.SuperCoolant.getFluid(ceoInput))) { + else if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { ceoOutput = 5.0D; } else if (depleteInput(FluidRegistry.getFluidStack("ic2coolant", ceoInput))) { diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 5e2a5e2a0d..bd7489a593 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -983,7 +983,7 @@ public class MyMaterial implements Runnable { new short[]{0xa4,0x8f,0x8b}, "Incoloy-903", subscriptNumbers("Fe12Ni10Co8Ti4Mo2Al"), - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700).setGas(true), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 6), OffsetID + 83, @@ -1000,7 +1000,7 @@ public class MyMaterial implements Runnable { new short[]{0xa0,0xa0,0xa0}, "Adamantium Alloy", subscriptNumbers("Ad5Nq2La3"), - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000).setGas(true), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 3), OffsetID + 84, @@ -1010,6 +1010,16 @@ public class MyMaterial implements Runnable { new Pair<>(Lanthanum, 3) ); + public static final Werkstoff ethanolGasoline = new Werkstoff( + new short[]{0xe4,0xc6,0x61}, + "Ethanol Gasoline", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + OffsetID + 85, + TextureSet.SET_FLUID + ); + @Override public void run() { } } diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java index 407c41114b..fe32af17d9 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java @@ -22,6 +22,8 @@ public class IsotopeMaterial { public final NuclearTextures mTexture; public IsotopeMaterial(int aID, String aName, String aMaterialName, String aLocalizedName, NuclearTextures aTexture, int aR, int aG, int aB, int aNeutron) { + if (mIDMap.get(aID) != null) + throw new UnsupportedOperationException("ID:" + aID + " is already used!"); this.mID = aID; this.mNeutron = aNeutron; this.mName = aName; diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java index 75c2dba39c..5e6efeea26 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java @@ -11,6 +11,167 @@ public class IsotopeMaterialLoader implements Runnable { 232 ); + public static final IsotopeMaterial Thorium230 = new IsotopeMaterial( + OffsetID + 1, + "Thorium232", "Thorium", "Thorium-230", + NuclearTextures.STABLE2, 59, 59, 59, + 230 + ); + + public static final IsotopeMaterial Uranium233 = new IsotopeMaterial( + OffsetID + 2, + "Uranium233", "Uranium", "Uranium-233", + NuclearTextures.UNSTABLE4, 60, 167, 85, + 233 + ); + + public static final IsotopeMaterial Uranium235 = new IsotopeMaterial( + OffsetID + 3, + "Uranium235", "Uranium", "Uranium-235", + NuclearTextures.UNSTABLE3, 60, 167, 85, + 235 + ); + + public static final IsotopeMaterial Uranium238 = new IsotopeMaterial( + OffsetID + 4, + "Uranium238", "Uranium", "Uranium-238", + NuclearTextures.STABLE2, 60, 167, 85, + 238 + ); + + public static final IsotopeMaterial Neptunium236 = new IsotopeMaterial( + OffsetID + 5, + "Neptunium236", "Neptunium", "Neptunium-236", + NuclearTextures.UNSTABLE1, 60, 170, 176, + 236 + ); + + public static final IsotopeMaterial Neptunium237 = new IsotopeMaterial( + OffsetID + 6, + "Neptunium237", "Neptunium", "Neptunium-237", + NuclearTextures.STABLE2, 60, 170, 176, + 237 + ); + + public static final IsotopeMaterial Plutonium238 = new IsotopeMaterial( + OffsetID + 7, + "Plutonium238", "Plutonium", "Plutonium-238", + NuclearTextures.STABLE1, 169, 169, 169, + 238 + ); + + public static final IsotopeMaterial Plutonium239 = new IsotopeMaterial( + OffsetID + 8, + "Plutonium239", "Plutonium", "Plutonium-239", + NuclearTextures.UNSTABLE1, 169, 169, 169, + 239 + ); + + public static final IsotopeMaterial Plutonium241 = new IsotopeMaterial( + OffsetID + 9, + "Plutonium241", "Plutonium", "Plutonium-241", + NuclearTextures.UNSTABLE2, 169, 169, 169, + 241 + ); + + public static final IsotopeMaterial Plutonium242 = new IsotopeMaterial( + OffsetID + 10, + "Plutonium242", "Plutonium", "Plutonium-242", + NuclearTextures.STABLE2, 169, 169, 169, + 242 + ); + + public static final IsotopeMaterial Americium241 = new IsotopeMaterial( + OffsetID + 11, + "Americium241", "Americium", "Americium-241", + NuclearTextures.STABLE1, 150, 120, 22, + 241 + ); + + public static final IsotopeMaterial Americium242 = new IsotopeMaterial( + OffsetID + 12, + "Americium242", "Americium", "Americium-242", + NuclearTextures.UNSTABLE4, 150, 120, 22, + 242 + ); + + public static final IsotopeMaterial Americium243 = new IsotopeMaterial( + OffsetID + 13, + "Americium243", "Americium", "Americium-243", + NuclearTextures.STABLE2, 150, 120, 22, + 243 + ); + + public static final IsotopeMaterial Curium243 = new IsotopeMaterial( + OffsetID + 14, + "Curium243", "Curium", "Curium-243", + NuclearTextures.UNSTABLE1, 107, 6, 105, + 243 + ); + + public static final IsotopeMaterial Curium245 = new IsotopeMaterial( + OffsetID + 15, + "Curium245", "Curium", "Curium-245", + NuclearTextures.UNSTABLE3, 107, 6, 105, + 245 + ); + + public static final IsotopeMaterial Curium246 = new IsotopeMaterial( + OffsetID + 16, + "Curium246", "Curium", "Curium-246", + NuclearTextures.STABLE2, 107, 6, 105, + 246 + ); + + public static final IsotopeMaterial Curium247 = new IsotopeMaterial( + OffsetID + 17, + "Curium247", "Curium", "Curium-247", + NuclearTextures.UNSTABLE4, 107, 6, 105, + 247 + ); + + public static final IsotopeMaterial Berkelium247 = new IsotopeMaterial( + OffsetID + 18, + "Berkelium247", "Berkelium", "Berkelium-247", + NuclearTextures.STABLE2, 130, 54, 29, + 247 + ); + + public static final IsotopeMaterial Berkelium248 = new IsotopeMaterial( + OffsetID + 19, + "Berkelium248", "Berkelium", "Berkelium-248", + NuclearTextures.UNSTABLE1, 130, 54, 29, + 248 + ); + + public static final IsotopeMaterial Californium249 = new IsotopeMaterial( + OffsetID + 20, + "Californium249", "Californium", "Californium-249", + NuclearTextures.UNSTABLE2, 186, 55, 11, + 249 + ); + + public static final IsotopeMaterial Californium250 = new IsotopeMaterial( + OffsetID + 21, + "Californium250", "Californium", "Californium-250", + NuclearTextures.STABLE1, 186, 55, 11, + 250 + ); + + public static final IsotopeMaterial Californium251 = new IsotopeMaterial( + OffsetID + 22, + "Californium251", "Californium", "Californium-251", + NuclearTextures.UNSTABLE4, 186, 55, 11, + 251 + ); + + public static final IsotopeMaterial Californium252 = new IsotopeMaterial( + OffsetID + 23, + "Californium252", "Californium", "Californium-252", + NuclearTextures.UNSTABLE1, 186, 55, 11, + 252 + ); + @Override public void run() { } } diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 7c3361eac4..ed2635e0f5 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -64,18 +64,12 @@ public class NaquadahReworkRecipeLoader { 2000 ); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)) - }, - new FluidStack[]{ - Materials.Hydrogen.getGas(8000), - FluidRegistry.getFluidStack("seedoil", 3000) - }, - new FluidStack[]{ - towEthyl1Hexanol.getFluidOrGas(1000) - }, - null, + GT_Values.RA.addChemicalRecipe( + GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), + Materials.Hydrogen.getCells(8), + FluidRegistry.getFluidStack("seedoil", 3000), + towEthyl1Hexanol.getFluidOrGas(1000), + ItemList.Cell_Empty.get(8), 400, 480 ); @@ -97,34 +91,23 @@ public class NaquadahReworkRecipeLoader { 1920 ); - GT_Values.RA.addMultiblockChemicalRecipe( - null, - new FluidStack[]{ - P507.getFluidOrGas(4000), - lowQualityNaquadahSolution.getFluidOrGas(36000), - }, - new FluidStack[]{ - fluorineRichWasteLiquid.getFluidOrGas(6000), - naquadahAdamantiumSolution.getFluidOrGas(30000) - }, + GT_Values.RA.addChemicalRecipe( + lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), + P507.get(OrePrefixes.cell, 4), null, + fluorineRichWasteLiquid.getFluidOrGas(6000), + naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), + ItemList.Cell_Empty.get(10), 4000, 1920 ); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 60), - }, - new FluidStack[]{ - fluorineRichWasteLiquid.getFluidOrGas(1500) - }, - new FluidStack[]{ - wasteLiquid.getFluidOrGas(1000) - }, - new ItemStack[]{ - WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60) - }, + GT_Values.RA.addChemicalRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 60), + null, + fluorineRichWasteLiquid.getFluidOrGas(1500), + wasteLiquid.getFluidOrGas(1000), + WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60), 1000, 120 ); @@ -304,19 +287,13 @@ public class NaquadahReworkRecipeLoader { 30 ); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10), - }, - new FluidStack[]{ - Materials.SulfuricAcid.getFluid(30000) - }, - new FluidStack[]{ - naquadriaRichSolution.getFluidOrGas(9000) - }, - new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), - }, + GT_Values.RA.addChemicalRecipe( + lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10), + Materials.SulfuricAcid.getCells(30), + null, + naquadriaRichSolution.getFluidOrGas(9000), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), + ItemList.Cell_Empty.get(30), 1000, 7680 ); @@ -336,18 +313,12 @@ public class NaquadahReworkRecipeLoader { 1050 ); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3), - }, - new FluidStack[]{ - Materials.Water.getFluid(3000), - P507.getFluidOrGas(500) - }, - new FluidStack[]{ - lowQualityNaquadriaSolution.getFluidOrGas(3500) - }, - null, + GT_Values.RA.addChemicalRecipe( + lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3), + Materials.Water.getCells(3), + P507.getFluidOrGas(500), + lowQualityNaquadriaSolution.getFluidOrGas(3500), + ItemList.Cell_Empty.get(3), 500, 1920 ); diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java index 176976d77b..b68d62edb2 100644 --- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java +++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java @@ -16,7 +16,7 @@ public class NeutronActivatorLoader { thoriumBasedLiquidFuelDepleted.getFluidOrGas(200) }, null, - 20000, + 10000, 700, 500 ); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 297f43c3d2..f98a44a6b9 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -679,8 +679,17 @@ public class RecipeLoader { 120 ); - GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell),GT_OreDictUnificator.get(OrePrefixes.cell,Materials.Empty,1),537,0); - GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell),null,537,1); + GT_Values.RA.addChemicalRecipe( + Materials.GasolineRaw.getCells(9), + Materials.Ethanol.getCells(1), + MyMaterial.ethanolGasoline.get(OrePrefixes.cell, 10), + 15, + 120 + ); + + GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 0); + GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 1); + GT_Values.RA.addFuel(MyMaterial.ethanolGasoline.get(OrePrefixes.cell), null, 750, 0); GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index e9cde96edc..57a0357084 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -47,7 +47,7 @@ public final class GoodGenerator { public static void preInit(FMLPreInitializationEvent event) { GG_Config_Loader.run(); WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial()); - WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader()); + //WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader()); Loaders.preInitLoad(); proxy.preInit(event); } diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang index e8a511828e..319fa069f5 100644 --- a/src/main/resources/assets/goodgenerator/lang/en_US.lang +++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang @@ -310,7 +310,7 @@ research.ESSENTIA_UPGRADE_AIR.page.0=This kind of Essentia has a high affinity f research.ESSENTIA_UPGRADE_AIR.page.1=Acceptable Aspects:

Aer: 10000EU Coefficient:x1.0

Motus: 20000EU Coefficient:x0.5

Volatus: 56000EU Coefficient:x2.0

Auram: 42000EU Coefficient:x2.7

Required Liquid:

Air: Efficiency:x1.0

Liquid Air: Efficiency:x1.5 research.ESSENTIA_UPGRADE_THERMAL.page.0=The energy from this kind of Essentia cannot be fully converted into electricity, and some of it is converted into heat that heats up the diffusion cell.

Coolants are needed to keep the generator running steadily and better coolants allow Essentia to release more energy safely.

The basic consuming speed is 40L/sec. research.ESSENTIA_UPGRADE_THERMAL.page.1=Acceptable Aspects:

Ignis: 16000EU Coefficient:x1.0

Custom1: 300000EU Coefficient:x7.0

Volatus: 56000EU Coefficient:x2.0

Infernus: 35700EU Coefficient:x3.0

Ira: 82600EU Coefficient:x5.0 -research.ESSENTIA_UPGRADE_THERMAL.page.2=Required Liquid:

Water: Efficiency:x0.5

Distilled Water: Efficiency:x1.0

Crushed Ice: Efficiency:x1.2

IC2 Coolant: Efficiency:x1.5

Super Coolant: Efficiency:x5.0

Cryotheum: Efficiency:x9.0 +research.ESSENTIA_UPGRADE_THERMAL.page.2=Required Liquid:

Water: Efficiency:x0.5

Distilled Water: Efficiency:x1.0

Crushed Ice: Efficiency:x1.2

IC2 Coolant: Efficiency:x1.5

Cryotheum: Efficiency:x5.0

Super Coolant: Efficiency:x9.0 research.ESSENTIA_UPGRADE_UNSTABLE.page.0=This kind of Essentia tends to damage the diffusion cell or reacts with air easily.

Inert gases are needed to protect the diffusion cell.

The more inert the gas, the more energy can be safely released from the Essentia.

The basic consuming speed is 80L/sec. research.ESSENTIA_UPGRADE_UNSTABLE.page.1=Acceptable Aspects:

Perditio: 4500EU Coefficient:x1.0

Vacuos: 8200EU Coefficient:x1.5

Venenum: 17000EU Coefficient:x2.0

Telum: 14200EU Coefficient:x2.5

Terminus: 300000EU Coefficient:x10.0 research.ESSENTIA_UPGRADE_UNSTABLE.page.2=Required Liquid:

Nitrogen: Efficiency:x1.0

Helium: Efficiency:x2.0

Neon: Efficiency:x2.2

Argon: Efficiency:x2.5

Krypton: Efficiency:x3.0

Xenon: Efficiency:x4.0 diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png index b31aa41fd0..2e4cc7f714 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png and b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png index 89d09ea4f4..594bee8e1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png and b/src/main/resources/assets/gregtech/textures/items/icons/isotope/stable1tiny.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png index 695afd0b8a..f2bab94320 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png and b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png index 543ee6db73..b35ada27f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png and b/src/main/resources/assets/gregtech/textures/items/icons/isotope/unstable1tiny.png differ -- cgit