From 07fed711fef52ada5d0ae1df42b3deb76760469c Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 13 Aug 2017 09:04:00 +0200 Subject: Add deps --- libs/GT-PlusPlus-1.5.6-Pre-release.jar | Bin 0 -> 2921830 bytes libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar | Bin 0 -> 3349776 bytes libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar | Bin 0 -> 506974 bytes libs/forestry_1.7.10-4.2.10.58-api.jar | Bin 0 -> 284651 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 libs/GT-PlusPlus-1.5.6-Pre-release.jar create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar create mode 100644 libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar create mode 100644 libs/forestry_1.7.10-4.2.10.58-api.jar (limited to 'libs') diff --git a/libs/GT-PlusPlus-1.5.6-Pre-release.jar b/libs/GT-PlusPlus-1.5.6-Pre-release.jar new file mode 100644 index 0000000000..13ae18b160 Binary files /dev/null and b/libs/GT-PlusPlus-1.5.6-Pre-release.jar differ diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar new file mode 100644 index 0000000000..5dd3da618b Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar differ diff --git a/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar b/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar new file mode 100644 index 0000000000..0bb0483e3b Binary files /dev/null and b/libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar differ diff --git a/libs/forestry_1.7.10-4.2.10.58-api.jar b/libs/forestry_1.7.10-4.2.10.58-api.jar new file mode 100644 index 0000000000..e45cbd8ead Binary files /dev/null and b/libs/forestry_1.7.10-4.2.10.58-api.jar differ -- cgit From e579dd50ec098a383d6116a4ace64768bb73f097 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 13 Aug 2017 09:41:40 +0200 Subject: update core mod --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar | Bin 3349776 -> 0 bytes libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar | Bin 0 -> 3350211 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar deleted file mode 100644 index 5dd3da618b..0000000000 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.2.jar and /dev/null differ diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar new file mode 100644 index 0000000000..e769afe990 Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar differ -- cgit From 4833349e98659ace5e7c0198e6630a62fe3d0397 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 13 Aug 2017 11:31:19 +0200 Subject: update dependencies core mod --- build.properties | 2 +- libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar | Bin 3350211 -> 3350189 bytes 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'libs') diff --git a/build.properties b/build.properties index ddbeac129b..fa210f8eb4 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=746 +gregtech.jenkinsbuild=749 gregtech.version=5.09.31.25 cofhcore.cf=2246/920 cofhcore.version=[1.7.10]3.0.3-303-dev diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar index e769afe990..5aa5452499 100644 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar differ -- cgit From d0b0f98ee22b6ac567cdf35fa79a985866662753 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 19 Aug 2017 15:08:03 +0200 Subject: remove old core mod --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar | Bin 3350189 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar deleted file mode 100644 index 5aa5452499..0000000000 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.3.jar and /dev/null differ -- cgit From 934670c38078a757f8add1cca4da3caa5ba8cbf0 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 19 Aug 2017 15:20:38 +0200 Subject: New coremod --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar | Bin 0 -> 3275269 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar new file mode 100644 index 0000000000..934c1cec13 Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar differ -- cgit From 3a9731858faac3f05d72c776ae1b03d2bbdebdb8 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 9 Sep 2017 20:54:51 +0200 Subject: update recipes and add newest core mod version --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar | Bin 3275269 -> 0 bytes libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar | Bin 0 -> 3287958 bytes .../dreamcraft/DreamCraftRecipeLoader.java | 35 +++++++++++---------- 3 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar deleted file mode 100644 index 934c1cec13..0000000000 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.4.jar and /dev/null differ diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar new file mode 100644 index 0000000000..d2f6c79715 Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar differ diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 14e24b92eb..52153a96f1 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -212,13 +212,14 @@ public class DreamCraftRecipeLoader implements Runnable { //region multiblocks - //Microwave Grinder todo HV recipe + //Microwave Grinder GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ - com.dreammaster.gthandler.CustomItemList.WetTransformer_ZPM_LuV.get(1, o), - com.dreammaster.gthandler.CustomItemList.HighEnergyFlowCircuit.get(1, o), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), - ItemList.Circuit_Chip_UHPIC.get(2, o), - }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 400, 500, true); + ItemList.Machine_HV_Microwave.get(1,o), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), + ItemList.Upgrade_Overclocker.get(4, o), + }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 800, 480, true); //Active Transformer GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -328,7 +329,7 @@ public class DreamCraftRecipeLoader implements Runnable { Materials.Void.getMolten(2592), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), - }, CustomItemList.Machine_Multi_EssentiaToEM.get(1), 24000, 400000); + }, CustomItemList.Machine_Multi_EssentiaToEM.get(1), 24000, 500000); //Essentia DeQuantizer TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_EMToMatter.get(1), @@ -343,22 +344,24 @@ public class DreamCraftRecipeLoader implements Runnable { Materials.Void.getMolten(2592), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), Materials.Osmium.getMolten(1296), - }, CustomItemList.Machine_Multi_EMToEssentia.get(1), 24000, 400000); + }, CustomItemList.Machine_Multi_EMToEssentia.get(1), 24000, 500000); - //EM Scanner todo ItemStack[] FluidStack[] + //EM Scanner TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_Research.get(1), 150000,128, 500000, 16, new ItemStack[]{ CustomItemList.Machine_Multi_EMjunction.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 4), - ItemList.Sensor_UV.get(2), - ItemList.Circuit_Wetwaresupercomputer.get(1), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 2), + CustomItemList.eM_Computer_Bus.get(4), + ItemList.Field_Generator_UV.get(4), + ItemList.Sensor_UV.get(4), + com.dreammaster.gthandler.CustomItemList.NanoCircuit.get(4), + com.dreammaster.gthandler.CustomItemList.MysteriousCrystalLens.get(4), + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 4), }, new FluidStack[]{ Materials.UUMatter.getFluid(2000), - Materials.Iridium.getMolten(2592), + Materials.Neutronium.getMolten(2592), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - Materials.Osmium.getMolten(1296), - }, CustomItemList.Machine_Multi_Scanner.get(1), 24000, 400000); + Materials.Osmiridium.getMolten(1296), + }, CustomItemList.Machine_Multi_Scanner.get(1), 24000, 500000); //endregion } } -- cgit From d7c922418e0419cce73b6583ea411ddefeb2f99e Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 27 Sep 2017 18:58:34 +0200 Subject: Change recipes a bit, update GT++ and coremod --- build.properties | 4 ++-- libs/GT-PlusPlus-1.5.6-Pre-release.jar | Bin 2921830 -> 0 bytes libs/GT-PlusPlus-1.6.02-release-dev.jar | Bin 0 -> 2914991 bytes libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar | Bin 3287958 -> 0 bytes libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar | Bin 0 -> 3287712 bytes .../dreamcraft/DreamCraftRecipeLoader.java | 18 +++++++++--------- .../github/technus/tectech/loader/RecipeLoader.java | 17 ++++++++++++++++- 7 files changed, 27 insertions(+), 12 deletions(-) delete mode 100644 libs/GT-PlusPlus-1.5.6-Pre-release.jar create mode 100644 libs/GT-PlusPlus-1.6.02-release-dev.jar delete mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar (limited to 'libs') diff --git a/build.properties b/build.properties index 94fb5918d1..0635e9681a 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=786 -gregtech.version=5.09.32.00 +gregtech.jenkinsbuild=851 +gregtech.version=5.09.32.04 cofhcore.cf=2246/920 cofhcore.version=[1.7.10]3.0.3-303-dev cofhlib.cf=2246/918 diff --git a/libs/GT-PlusPlus-1.5.6-Pre-release.jar b/libs/GT-PlusPlus-1.5.6-Pre-release.jar deleted file mode 100644 index 13ae18b160..0000000000 Binary files a/libs/GT-PlusPlus-1.5.6-Pre-release.jar and /dev/null differ diff --git a/libs/GT-PlusPlus-1.6.02-release-dev.jar b/libs/GT-PlusPlus-1.6.02-release-dev.jar new file mode 100644 index 0000000000..82ff78add3 Binary files /dev/null and b/libs/GT-PlusPlus-1.6.02-release-dev.jar differ diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar deleted file mode 100644 index d2f6c79715..0000000000 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar and /dev/null differ diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar new file mode 100644 index 0000000000..09bcdc7dae Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar differ diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 52153a96f1..06e6d472af 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -24,7 +24,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Containment.get(1, o), GT_ModHandler.getIC2Item("reinforcedGlass", 1L) - }, Materials.Trinium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000, true); + }, Materials.Trinium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000); //BLUEprint GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1), @@ -52,7 +52,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1, o), 100, 30720, true); + }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1, o), 100, 30720); //Computer Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -60,7 +60,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1, o), 200, 122880, true); + }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1, o), 200, 122880); //Computer Vent Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), @@ -69,7 +69,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1) - }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1, o), 100, 1920, true); + }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1, o), 100, 1920); //Advanced Computer Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1, o), @@ -87,7 +87,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), ItemList.Field_Generator_IV.get(1, o) - }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1, o), 800, 500000, true); + }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1, o), 800, 500000); //endregion @@ -175,7 +175,7 @@ public class DreamCraftRecipeLoader implements Runnable { CustomItemList.DATApipe.get(4, o), ItemList.Cover_Screen.get(1, o ), new ItemStack(Blocks.stone_button, 16), - }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1, o), 800, 122880, true); + }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1, o), 800, 122880); //Uncertainty GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1, o), @@ -219,7 +219,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), ItemList.Upgrade_Overclocker.get(4, o), - }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 800, 480, true); + }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 800, 480); //Active Transformer GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -227,7 +227,7 @@ public class DreamCraftRecipeLoader implements Runnable { com.dreammaster.gthandler.CustomItemList.HighEnergyFlowCircuit.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), ItemList.Circuit_Chip_UHPIC.get(2, o), - }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1, o), 400, 30720, true); + }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1, o), 400, 30720); //Network Switch GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -236,7 +236,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), CustomItemList.DATApipe.get(4, o), - }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1, o), 800, 122880, true); + }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1, o), 800, 122880); //Quantum Computer GT_Values.RA.addAssemblylineRecipe(ItemList.Tool_DataOrb.get(1), 20000, new ItemStack[]{ diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java index 5c32328889..aab236b7dc 100644 --- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java @@ -2,7 +2,17 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader; import com.github.technus.tectech.elementalMatter.definitions.complex.dAtomDefinition; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; +import com.github.technus.tectech.thing.casing.GT_Block_HintTT; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; import cpw.mods.fml.common.Loader; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import net.minecraft.item.ItemStack; + +import static gregtech.api.enums.GT_Values.RA; /** * Created by danie_000 on 16.11.2016. @@ -15,7 +25,12 @@ public class RecipeLoader implements Runnable { // Recipes init - common goes here rest goes into methods below // =================================================================================================== - + for(int i=0;i<=15;i++) + RA.addAssemblerRecipe(new ItemStack[]{ + GT_Utility.getIntegratedCircuit(i), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Cobalt,1)}, + Materials.Aluminium.getMolten(864), + new ItemStack(TT_Container_Casings.sHintCasingsTT, 1,i),32,120); if (Loader.isModLoaded("dreamcraft")) new DreamCraftRecipeLoader().run();//TODO init recipes for GTNH version else new BloodyRecipeLoader().run();//TODO init recipes for NON-GTNH version -- cgit From 775384832144830707bfdd7df77e77a1d98fbbaf Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 12 Dec 2017 22:05:08 +0100 Subject: IAEA first draft complete --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar | Bin 3287712 -> 0 bytes .../core/cElementalInstanceStackMap.java | 27 +- .../core/cElementalMutableDefinitionStackMap.java | 25 +- .../definitions/complex/dAtomDefinition.java | 352 +++++++++++++-------- .../definitions/complex/dHadronDefinition.java | 3 +- .../definitions/complex/iaea/iaeaNuclide.java | 19 +- .../definitions/primitive/eBosonDefinition.java | 1 + 7 files changed, 280 insertions(+), 147 deletions(-) delete mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar deleted file mode 100644 index 09bcdc7dae..0000000000 Binary files a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar and /dev/null differ diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java index cd5735405e..5891d4e252 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java @@ -7,6 +7,7 @@ import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalD import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; +import java.util.Iterator; import java.util.Map; import java.util.TreeMap; @@ -16,7 +17,7 @@ import static com.github.technus.tectech.elementalMatter.definitions.primitive.c * Created by danie_000 on 22.01.2017. */ public final class cElementalInstanceStackMap implements Comparable { - private TreeMap map; + TreeMap map; //Constructors public cElementalInstanceStackMap() { @@ -190,11 +191,31 @@ public final class cElementalInstanceStackMap implements Comparable> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(true, entry.getValue()); + } + if (testOnly || !test) return test; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + removeAmount(false, entry.getValue()); + } + return true; } public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) { - return removeAllAmounts(testOnly, container.values()); + boolean test=true; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(true, entry.getValue()); + } + if (testOnly || !test) return test; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(false, entry.getValue()); + } + return true; } //Remove overflow diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java index ab1e53ac41..846a1cf410 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java @@ -6,6 +6,7 @@ import com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefi import com.github.technus.tectech.elementalMatter.core.interfaces.iHasElementalDefinition; import net.minecraft.nbt.NBTTagCompound; +import java.util.Iterator; import java.util.Map; import java.util.TreeMap; @@ -162,11 +163,31 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa } public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) { - return removeAllAmounts(testOnly, container.values()); + boolean test=true; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(true, entry.getValue()); + } + if (testOnly || !test) return test; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + removeAmount(false, entry.getValue()); + } + return true; } public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) { - return removeAllAmounts(testOnly, container.values()); + boolean test=true; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(true, entry.getValue()); + } + if (testOnly || !test) return test; + for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { + Map.Entry entry = entries.next(); + test &= removeAmount(false, entry.getValue()); + } + return true; } //Put replace diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java index f3042b95ac..92ba693889 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java @@ -348,17 +348,16 @@ public final class dAtomDefinition extends cElementalDefinition { @Override public cElementalDecay[] getDecayArray() { ArrayList decaysList=new ArrayList<>(4); - return getDecayArray(decaysList,decayMode); + return getDecayArray(decaysList,decayMode,true); } - private cElementalDecay[] getDecayArray(ArrayList decaysList,int decayMode) { + private cElementalDecay[] getDecayArray(ArrayList decaysList,int decayMode,boolean tryAnti) { if (this.type == 1) { switch (decayMode) { - case -3: - if(ElectronCapture(decaysList)) - return decaysList.toArray(new cElementalDecay[decaysList.size()]); case -2: - if(PbetaDecay(decaysList)) + if(TecTech.Rnd.nextBoolean() && ElectronCapture(decaysList)) + return decaysList.toArray(new cElementalDecay[decaysList.size()]); + else if(PbetaDecay(decaysList)) return decaysList.toArray(new cElementalDecay[decaysList.size()]); break; case -1: @@ -381,11 +380,15 @@ public final class dAtomDefinition extends cElementalDefinition { if(decayMode>8){ if(iaeaDecay(decaysList,0)) return decaysList.toArray(new cElementalDecay[decaysList.size()]); - return getDecayArray(decaysList,decayMode-BYTE_OFFSET); + return getDecayArray(decaysList,decayMode-BYTE_OFFSET,false); } } + return cElementalDecay.noDecay; + }else if(this.type==-1){ + dAtomDefinition anti=getAnti(); + if(anti!=null) return anti.getDecayArray(decaysList,decayMode,false); } - return cElementalDecay.noDecay; + return getNaturalDecayInstant(); } private boolean iaeaDecay(ArrayList decaysList,long energy){ @@ -403,7 +406,7 @@ public final class dAtomDefinition extends cElementalDefinition { } private boolean getDecay(ArrayList decaysList,iaeaNuclide.iaeaDecay decay){ - cElementalMutableDefinitionStackMap withThis=elementalStacks.toMutable(),additional=new cElementalMutableDefinitionStackMap(); + cElementalMutableDefinitionStackMap withThis=elementalStacks.toMutable(),newStuff=new cElementalMutableDefinitionStackMap(); switch (decay.decayName){ case "D": { if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){ @@ -435,10 +438,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "14C": { if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){ - additional.putReplace(carbon_14); + newStuff.putReplace(carbon_14); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -447,10 +450,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "24NE": { if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){ - additional.putReplace(neon_24); + newStuff.putReplace(neon_24); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -459,10 +462,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "34SI": { if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){ - additional.putReplace(silicon_34); + newStuff.putReplace(silicon_34); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -470,11 +473,11 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "A": case "A?": { - if (withThis.removeAllAmounts(false, alpha.definition.getSubParticles())){ - additional.putReplace(alpha); + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){ + newStuff.putReplace(alpha); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -484,11 +487,11 @@ public final class dAtomDefinition extends cElementalDefinition { case "B+": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){ withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eLeptonDefinition.lepton_e_1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -498,11 +501,11 @@ public final class dAtomDefinition extends cElementalDefinition { case "2B+": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){ withThis.putUnify(dHadronDefinition.hadron_n2); - additional.putReplace(eLeptonDefinition.lepton_e_2); - additional.putReplace(eNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(eLeptonDefinition.lepton_e_2); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -512,11 +515,11 @@ public final class dAtomDefinition extends cElementalDefinition { case "B-": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){ withThis.putUnify(dHadronDefinition.hadron_p1); - additional.putReplace(eLeptonDefinition.lepton_e1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -526,11 +529,11 @@ public final class dAtomDefinition extends cElementalDefinition { case "2B-": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){ withThis.putUnify(dHadronDefinition.hadron_p2); - additional.putReplace(eLeptonDefinition.lepton_e2); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_2); + newStuff.putReplace(eLeptonDefinition.lepton_e2); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -540,10 +543,10 @@ public final class dAtomDefinition extends cElementalDefinition { case "EC": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){ withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -553,10 +556,10 @@ public final class dAtomDefinition extends cElementalDefinition { case "2EC": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e2)){ withThis.putUnify(dHadronDefinition.hadron_n2); - additional.putReplace(eNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -566,11 +569,11 @@ public final class dAtomDefinition extends cElementalDefinition { case "B++EC": case "EC+B+": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){ withThis.putUnify(dHadronDefinition.hadron_n2); - additional.putReplace(eLeptonDefinition.lepton_e_1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -578,14 +581,13 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "B+A": { - if (withThis.removeAllAmounts(false, alpha.definition.getSubParticles()) && withThis.removeAmount(false, dHadronDefinition.hadron_p1)){ - withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eLeptonDefinition.lepton_e_1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); - additional.putReplace(alpha); + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3, dHadronDefinition.hadron_n1)){ + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(alpha); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -595,12 +597,12 @@ public final class dAtomDefinition extends cElementalDefinition { case "B+P": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){ withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eLeptonDefinition.lepton_e_1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); - additional.putReplace(dHadronDefinition.hadron_p1); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(dHadronDefinition.hadron_p1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -610,12 +612,12 @@ public final class dAtomDefinition extends cElementalDefinition { case "B+2P": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3)){ withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eLeptonDefinition.lepton_e_1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); - additional.putReplace(dHadronDefinition.hadron_p2); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(dHadronDefinition.hadron_p2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -623,14 +625,13 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "B-A": { - if (withThis.removeAllAmounts(false, alpha.definition.getSubParticles()) && withThis.removeAmount(false,dHadronDefinition.hadron_n1)){ - withThis.putUnify(dHadronDefinition.hadron_p1); - additional.putReplace(eLeptonDefinition.lepton_e1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_1); - additional.putReplace(alpha); + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3, dHadronDefinition.hadron_p1)){ + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(alpha); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -640,12 +641,12 @@ public final class dAtomDefinition extends cElementalDefinition { case "B-N": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){ withThis.putUnify(dHadronDefinition.hadron_p1); - additional.putReplace(eLeptonDefinition.lepton_e1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_1); - additional.putReplace(dHadronDefinition.hadron_n1); + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(dHadronDefinition.hadron_n1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -655,12 +656,12 @@ public final class dAtomDefinition extends cElementalDefinition { case "B-2N": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3)){ withThis.putUnify(dHadronDefinition.hadron_p1); - additional.putReplace(eLeptonDefinition.lepton_e1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_1); - additional.putReplace(dHadronDefinition.hadron_n2); + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(dHadronDefinition.hadron_n2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -668,14 +669,13 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "B-P": { - if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1, dHadronDefinition.hadron_p1)){ - withThis.putUnify(dHadronDefinition.hadron_p1); - additional.putReplace(eLeptonDefinition.lepton_e1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve_1); - additional.putReplace(dHadronDefinition.hadron_p1); + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){ + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + newStuff.putReplace(dHadronDefinition.hadron_p1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -683,31 +683,66 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "ECA": { - if (withThis.removeAllAmounts(false, alpha.definition.getSubParticles()) && withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){ + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1,eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){ + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(alpha); + try{ + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); + return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "ECP": { + if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p2)){ + withThis.putUnify(dHadronDefinition.hadron_n1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(dHadronDefinition.hadron_p1); + try{ + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); + return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "EC2P": { + if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){ + withThis.putUnify(dHadronDefinition.hadron_n1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(dHadronDefinition.hadron_p2); + try{ + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); + return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "ECP+EC2P": {//todo look at branching ratios + if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e2,dHadronDefinition.hadron_p5)){ withThis.putUnify(dHadronDefinition.hadron_n1); - additional.putReplace(eNeutrinoDefinition.lepton_Ve1); - additional.putReplace(alpha); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(dHadronDefinition.hadron_p3); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); } } } break; - case "ECP": - break; - case "EC2P": - break; - case "ECP+EC2P": - break; case "N": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){ - additional.putReplace(dHadronDefinition.hadron_n1); + newStuff.putReplace(dHadronDefinition.hadron_n1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -716,10 +751,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "2N": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){ - additional.putReplace(dHadronDefinition.hadron_n2); + newStuff.putReplace(dHadronDefinition.hadron_n2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -728,10 +763,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "P": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){ - additional.putReplace(dHadronDefinition.hadron_p1); + newStuff.putReplace(dHadronDefinition.hadron_p1); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -740,10 +775,10 @@ public final class dAtomDefinition extends cElementalDefinition { } break; case "2P": { if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){ - additional.putReplace(dHadronDefinition.hadron_p2); + newStuff.putReplace(dHadronDefinition.hadron_p2); try{ - additional.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); - decaysList.add(new cElementalDecay(decay.chance,additional.toImmutable_unsafeMightLeaveExposedElementalTree())); + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; }catch (Exception e){ if(DEBUG_MODE) e.printStackTrace(); @@ -751,20 +786,72 @@ public final class dAtomDefinition extends cElementalDefinition { } } break; case "SF": - return Fission(decaysList,decay.chance,false,withThis); - case "B-F": - break; - case "ECF": case "ECSF": case "EC(+SF)": - break; - case "SF(+EC+B+)": case "SF+EC+B+": - break; - case "SF+EC+B-": - break; + if(Fission(decaysList,withThis,newStuff,decay.chance,false)) return true; + case "B-F": { + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){ + withThis.putUnify(dHadronDefinition.hadron_p1); + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + try{ + if(Fission(decaysList,withThis,newStuff,decay.chance,false)) return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "ECF": case "ECSF": case "EC(+SF)": { + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){ + withThis.putUnify(dHadronDefinition.hadron_n1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + try{ + if(Fission(decaysList,withThis,newStuff,decay.chance,false)) return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "SF(+EC+B+)": case "SF+EC+B+": { + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){ + withThis.putUnify(dHadronDefinition.hadron_n2); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); + try{ + if(Fission(decaysList,withThis,newStuff,decay.chance,false)) return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; + case "SF+EC+B-": { + if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1)){ + newStuff.putReplace(eLeptonDefinition.lepton_e1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1); + try{ + if(Fission(decaysList,withThis,newStuff,decay.chance,false)) return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; case "IT": case "IT?": case "G": decaysList.add(new cElementalDecay(decay.chance, this, eBosonDefinition.boson_Y__)); return true; - case "IT+EC+B+": - break; + case "IT+EC+B+": { + if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){ + withThis.putUnify(dHadronDefinition.hadron_n2); + newStuff.putReplace(eLeptonDefinition.lepton_e_1); + newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2); + newStuff.putReplace(eBosonDefinition.boson_Y__1); + try{ + newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_unsafeMightLeaveExposedElementalTree()).getStackForm(1)); + decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_unsafeMightLeaveExposedElementalTree())); + return true; + }catch (Exception e){ + if(DEBUG_MODE) e.printStackTrace(); + } + } + } break; case "DEAD_END": decaysList.add(deadEnd); return true; @@ -789,7 +876,7 @@ public final class dAtomDefinition extends cElementalDefinition { private boolean alphaDecay(ArrayList decaysList) { final cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable(); - if (tree.removeAllAmounts(false, dHadronDefinition.hadron_n2, dHadronDefinition.hadron_p2)) { + if (tree.removeAllAmounts(false, alpha.definition.getSubParticles())) { try { decaysList.add(new cElementalDecay((float) 1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_unsafeMightLeaveExposedElementalTree()), 1), alpha)); return true; @@ -833,7 +920,7 @@ public final class dAtomDefinition extends cElementalDefinition { if (tree.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)) { try { tree.putUnify(dHadronDefinition.hadron_n1); - decaysList.add(new cElementalDecay((float) 1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_unsafeMightLeaveExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1)); + decaysList.add(new cElementalDecay((float) 1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_unsafeMightLeaveExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1)); return true; } catch (Exception e) { if (DEBUG_MODE) e.printStackTrace(); @@ -842,9 +929,8 @@ public final class dAtomDefinition extends cElementalDefinition { return false; } - private boolean Fission(ArrayList decaysList,float probability,boolean spontaneousCheck, cElementalMutableDefinitionStackMap fissile) { + private boolean Fission(ArrayList decaysList, cElementalMutableDefinitionStackMap fissile, cElementalMutableDefinitionStackMap particles,float probability,boolean spontaneousCheck) { final cElementalMutableDefinitionStackMap heavy = new cElementalMutableDefinitionStackMap(); - final ArrayList particles = new ArrayList<>(4); final double[] liquidDrop=liquidDropFunction(Math.abs(element)<=97); for(cElementalDefinitionStack stack: fissile.values()){ @@ -856,7 +942,7 @@ public final class dAtomDefinition extends cElementalDefinition { double neutrals=stack.amount*liquidDrop[2]; int neutrals_cnt=(int)Math.floor(neutrals); neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0; - particles.add(new cElementalDefinitionStack(stack.definition, neutrals_cnt)); + particles.putUnify(new cElementalDefinitionStack(stack.definition, neutrals_cnt)); int heavy_cnt=(int)Math.ceil(stack.amount*liquidDrop[1]); while(heavy_cnt+neutrals_cnt>stack.amount) @@ -878,12 +964,12 @@ public final class dAtomDefinition extends cElementalDefinition { } try { - particles.add(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_unsafeMightLeaveExposedElementalTree()),1)); - particles.add(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_unsafeMightLeaveExposedElementalTree()),1)); - decaysList.add(new cElementalDecay(0.5f, particles.toArray(new cElementalDefinitionStack[particles.size()]))); + particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_unsafeMightLeaveExposedElementalTree()),1)); + particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_unsafeMightLeaveExposedElementalTree()),1)); + decaysList.add(new cElementalDecay(probability, particles.toImmutable_unsafeMightLeaveExposedElementalTree())); return true; } catch (Exception e) { - if (DEBUG_MODE) e.printStackTrace(); + if(DEBUG_MODE) e.printStackTrace(); } return false; } @@ -996,7 +1082,7 @@ public final class dAtomDefinition extends cElementalDefinition { //} @Override - public iElementalDefinition getAnti() { + public dAtomDefinition getAnti() { cElementalMutableDefinitionStackMap anti = new cElementalMutableDefinitionStackMap(); for (cElementalDefinitionStack stack : elementalStacks.values()) anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount)); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java index e15ca05bf3..f7bb9c7f5d 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java @@ -33,7 +33,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi private static final byte nbtType = (byte) 'h'; //Helpers public static dHadronDefinition hadron_p, hadron_n, hadron_p_, hadron_n_; - public static cElementalDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3; + public static cElementalDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5; private static float protonMass = 0F; private static float neutronMass = 0F; @@ -362,6 +362,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi hadron_n2 = new cElementalDefinitionStack(hadron_n, 2); hadron_p3 = new cElementalDefinitionStack(hadron_p, 3); hadron_n3 = new cElementalDefinitionStack(hadron_n, 3); + hadron_p5 = new cElementalDefinitionStack(hadron_p, 5); try { cElementalDefinition.addCreatorFromNBT(nbtType, dHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java index 2bb9efffb8..d08ec62256 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/iaea/iaeaNuclide.java @@ -12,6 +12,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.TreeMap; +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefinition.STABLE_RAW_LIFE_TIME; public final class iaeaNuclide { @@ -112,9 +113,11 @@ public final class iaeaNuclide { } private void getMoreData(String[] cells){ - if(add(cells[14]))System.out.println(N+" "+Z); - if(add(cells[17]))System.out.println(N+" "+Z); - if(add(cells[20]))System.out.println(N+" "+Z); + if(DEBUG_MODE) { + if (add(cells[14])) System.out.println(N + " " + Z); + if (add(cells[17])) System.out.println(N + " " + Z); + if (add(cells[20])) System.out.println(N + " " + Z); + } new energeticState(this, halfTime,getDecaysFixed(cells[14],doubleOrNaN(cells[15],"chance1"),cells[17],doubleOrNaN(cells[18],"chance1"),cells[20],doubleOrNaN(cells[21],"chance1"))); } @@ -164,10 +167,11 @@ public final class iaeaNuclide { nuclide.energeticStates = new TreeMap<>(); } nuclide.energeticStates.put(energy,this); - - if(add(cells[12]))System.out.println(nuclide.N+" "+nuclide.Z); - if(add(cells[15]))System.out.println(nuclide.N+" "+nuclide.Z); - if(add(cells[18]))System.out.println(nuclide.N+" "+nuclide.Z); + if(DEBUG_MODE) { + if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z); + if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z); + if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z); + } this.decaymodes=getDecaysFixed(cells[12],doubleOrNaN(cells[13],"chance 1",nuclide),cells[15],doubleOrNaN(cells[16],"chance 2",nuclide),cells[18],doubleOrNaN(cells[19],"chance 3",nuclide)); } @@ -195,7 +199,6 @@ public final class iaeaNuclide { private static HashSet decays=new HashSet<>(); private static boolean add(String s){ - int len=decays.size(); if(decays.add(s)){ System.out.println(s); return true; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java index 25696992a6..3b9ecc8433 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java @@ -14,6 +14,7 @@ public final class eBosonDefinition extends cElementalPrimitive { //deadEnd public static final cElementalDecay deadEnd = new cElementalDecay(boson_Y__, boson_Y__); public static final cElementalDecay deadEndHalf = new cElementalDecay(boson_Y__); + public static final cElementalDefinitionStack boson_Y__1=new cElementalDefinitionStack(boson_Y__,1); private eBosonDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) { super(name, symbol, type, mass, charge, color, ID); -- cgit From 92f600c303efb7ca5c9bfb5272ca959a4dabbbe7 Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 12 Dec 2017 22:06:41 +0100 Subject: update dep --- libs/GTNewHorizonsCoreMod-1.7.10-1.5.10.jar | Bin 0 -> 3287685 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 libs/GTNewHorizonsCoreMod-1.7.10-1.5.10.jar (limited to 'libs') diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.10.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.10.jar new file mode 100644 index 0000000000..45d7dc3183 Binary files /dev/null and b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.10.jar differ -- cgit