aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2019-02-16 15:16:44 +0100
committerTec <daniel112092@gmail.com>2019-02-16 15:16:44 +0100
commitd1b16ceea346e546ae7bec574230bdf03c2a4172 (patch)
treecd3dd2fd1a9030902add1e27b212df0186c54e39 /src/main
parent74cb12a7ca9c8ba0cfd63e8ca743e1b8820fea21 (diff)
downloadGT5-Unofficial-d1b16ceea346e546ae7bec574230bdf03c2a4172.tar.gz
GT5-Unofficial-d1b16ceea346e546ae7bec574230bdf03c2a4172.tar.bz2
GT5-Unofficial-d1b16ceea346e546ae7bec574230bdf03c2a4172.zip
Collider uses new impl of parameters
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java148
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java48
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java14
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java49
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java25
16 files changed, 173 insertions, 137 deletions
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 a70f85d62d..a735213915 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
@@ -716,7 +716,7 @@ public class DreamCraftRecipeLoader implements Runnable {
Materials.SolderingAlloy.getMolten(9216)},
ItemList.Field_Generator_UEV.get(1L), 4000, 800000);
- //UHV Energy ParameterDefinition
+ //UHV Energy ParameterGroup
TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Energy_UV.get(1L),
24000, 16, 50000, 2, new Object[]{
ItemList.Hull_MAX.get(1L),
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 9e6f3f3c77..6a9ef392cd 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -52,7 +52,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
private static final String[] description = new String[]{
EnumChatFormatting.AQUA+"Hint Details:",
"1 - Classic Hatches or High Power Casing",
- "2 - Elemental Input ParameterDefinition",
+ "2 - Elemental Input ParameterGroup",
"3 - Elemental Overflow Hatches or Elemental Casing",
"General - Some sort of Essentia Storage",
};
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index d97c28a2be..0fbf3aaa13 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -52,7 +52,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
private static final String[] description = new String[]{
EnumChatFormatting.AQUA+"Hint Details:",
"1 - Classic Hatches or High Power Casing",
- "2 - Elemental Output ParameterDefinition",
+ "2 - Elemental Output ParameterGroup",
"3 - Elemental Overflow Hatches or Elemental Casing",
"General - Some sort of Essentia Storage",
};
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index deca78bf6e..0e65aa0b12 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -26,133 +26,133 @@ public class MachineLoader implements Runnable {
// ===================================================================================================
eM_in_UV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15000, "hatch.emin.tier.08", "UV Elemental Input ParameterDefinition", 8).getStackForm(1L));
+ 15000, "hatch.emin.tier.08", "UV Elemental Input ParameterGroup", 8).getStackForm(1L));
eM_in_UHV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15001, "hatch.emin.tier.09", "UHV Elemental Input ParameterDefinition", 9).getStackForm(1L));
+ 15001, "hatch.emin.tier.09", "UHV Elemental Input ParameterGroup", 9).getStackForm(1L));
eM_in_UEV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15002, "hatch.emin.tier.10", "UEV Elemental Input ParameterDefinition", 10).getStackForm(1L));
+ 15002, "hatch.emin.tier.10", "UEV Elemental Input ParameterGroup", 10).getStackForm(1L));
eM_in_UIV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15003, "hatch.emin.tier.11", "UIV Elemental Input ParameterDefinition", 11).getStackForm(1L));
+ 15003, "hatch.emin.tier.11", "UIV Elemental Input ParameterGroup", 11).getStackForm(1L));
eM_in_UMV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15004, "hatch.emin.tier.12", "UMV Elemental Input ParameterDefinition", 12).getStackForm(1L));
+ 15004, "hatch.emin.tier.12", "UMV Elemental Input ParameterGroup", 12).getStackForm(1L));
eM_in_UXV.set(new GT_MetaTileEntity_Hatch_InputElemental(
- 15005, "hatch.emin.tier.13", "UXV Elemental Input ParameterDefinition", 13).getStackForm(1L));
+ 15005, "hatch.emin.tier.13", "UXV Elemental Input ParameterGroup", 13).getStackForm(1L));
// ===================================================================================================
// eM OUT
// ===================================================================================================
eM_out_UV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15010, "hatch.emout.tier.08", "UV Elemental Output ParameterDefinition", 8).getStackForm(1L));
+ 15010, "hatch.emout.tier.08", "UV Elemental Output ParameterGroup", 8).getStackForm(1L));
eM_out_UHV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15011, "hatch.emout.tier.09", "UHV Elemental Output ParameterDefinition", 9).getStackForm(1L));
+ 15011, "hatch.emout.tier.09", "UHV Elemental Output ParameterGroup", 9).getStackForm(1L));
eM_out_UEV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15012, "hatch.emout.tier.10", "UEV Elemental Output ParameterDefinition", 10).getStackForm(1L));
+ 15012, "hatch.emout.tier.10", "UEV Elemental Output ParameterGroup", 10).getStackForm(1L));
eM_out_UIV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15013, "hatch.emout.tier.11", "UIV Elemental Output ParameterDefinition", 11).getStackForm(1L));
+ 15013, "hatch.emout.tier.11", "UIV Elemental Output ParameterGroup", 11).getStackForm(1L));
eM_out_UMV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15014, "hatch.emout.tier.12", "UMV Elemental Output ParameterDefinition", 12).getStackForm(1L));
+ 15014, "hatch.emout.tier.12", "UMV Elemental Output ParameterGroup", 12).getStackForm(1L));
eM_out_UXV.set(new GT_MetaTileEntity_Hatch_OutputElemental(
- 15015, "hatch.emout.tier.13", "UXV Elemental Output ParameterDefinition", 13).getStackForm(1L));
+ 15015, "hatch.emout.tier.13", "UXV Elemental Output ParameterGroup", 13).getStackForm(1L));
// ===================================================================================================
// eM Waste OUT
// ===================================================================================================
eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15020, "hatch.emmuffler.tier.08", "UV Overflow Output ParameterDefinition", 8, 1e10f).getStackForm(1L));
+ 15020, "hatch.emmuffler.tier.08", "UV Overflow Output ParameterGroup", 8, 1e10f).getStackForm(1L));
eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output ParameterDefinition", 9, 5e10f).getStackForm(1L));
+ 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output ParameterGroup", 9, 5e10f).getStackForm(1L));
eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output ParameterDefinition", 10, 25e10f).getStackForm(1L));
+ 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output ParameterGroup", 10, 25e10f).getStackForm(1L));
eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output ParameterDefinition", 11, 125e10f).getStackForm(1L));
+ 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output ParameterGroup", 11, 125e10f).getStackForm(1L));
eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output ParameterDefinition", 12, 125e11f).getStackForm(1L));
+ 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output ParameterGroup", 12, 125e11f).getStackForm(1L));
eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
- 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output ParameterDefinition", 13, 125e12f).getStackForm(1L));
+ 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output ParameterGroup", 13, 125e12f).getStackForm(1L));
// ===================================================================================================
// Multi AMP Power INPUTS
// ===================================================================================================
eM_energymulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15100, "hatch.energymulti04.tier.05", "IV 4A Energy ParameterDefinition", 5, 4).getStackForm(1L));
+ 15100, "hatch.energymulti04.tier.05", "IV 4A Energy ParameterGroup", 5, 4).getStackForm(1L));
eM_energymulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15110, "hatch.energymulti16.tier.05", "IV 16A Energy ParameterDefinition", 5, 16).getStackForm(1L));
+ 15110, "hatch.energymulti16.tier.05", "IV 16A Energy ParameterGroup", 5, 16).getStackForm(1L));
eM_energymulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15120, "hatch.energymulti64.tier.05", "IV 64A Energy ParameterDefinition", 5, 64).getStackForm(1L));
+ 15120, "hatch.energymulti64.tier.05", "IV 64A Energy ParameterGroup", 5, 64).getStackForm(1L));
eM_energymulti4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15101, "hatch.energymulti04.tier.06", "LuV 4A Energy ParameterDefinition", 6, 4).getStackForm(1L));
+ 15101, "hatch.energymulti04.tier.06", "LuV 4A Energy ParameterGroup", 6, 4).getStackForm(1L));
eM_energymulti16_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15111, "hatch.energymulti16.tier.06", "LuV 16A Energy ParameterDefinition", 6, 16).getStackForm(1L));
+ 15111, "hatch.energymulti16.tier.06", "LuV 16A Energy ParameterGroup", 6, 16).getStackForm(1L));
eM_energymulti64_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15121, "hatch.energymulti64.tier.06", "LuV 64A Energy ParameterDefinition", 6, 64).getStackForm(1L));
+ 15121, "hatch.energymulti64.tier.06", "LuV 64A Energy ParameterGroup", 6, 64).getStackForm(1L));
eM_energymulti4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy ParameterDefinition", 7, 4).getStackForm(1L));
+ 15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy ParameterGroup", 7, 4).getStackForm(1L));
eM_energymulti16_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy ParameterDefinition", 7, 16).getStackForm(1L));
+ 15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy ParameterGroup", 7, 16).getStackForm(1L));
eM_energymulti64_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy ParameterDefinition", 7, 64).getStackForm(1L));
+ 15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy ParameterGroup", 7, 64).getStackForm(1L));
eM_energymulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15103, "hatch.energymulti04.tier.08", "UV 4A Energy ParameterDefinition", 8, 4).getStackForm(1L));
+ 15103, "hatch.energymulti04.tier.08", "UV 4A Energy ParameterGroup", 8, 4).getStackForm(1L));
eM_energymulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15113, "hatch.energymulti16.tier.08", "UV 16A Energy ParameterDefinition", 8, 16).getStackForm(1L));
+ 15113, "hatch.energymulti16.tier.08", "UV 16A Energy ParameterGroup", 8, 16).getStackForm(1L));
eM_energymulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15123, "hatch.energymulti64.tier.08", "UV 64A Energy ParameterDefinition", 8, 64).getStackForm(1L));
+ 15123, "hatch.energymulti64.tier.08", "UV 64A Energy ParameterGroup", 8, 64).getStackForm(1L));
eM_energymulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15104, "hatch.energymulti04.tier.09", "UHV 4A Energy ParameterDefinition", 9, 4).getStackForm(1L));
+ 15104, "hatch.energymulti04.tier.09", "UHV 4A Energy ParameterGroup", 9, 4).getStackForm(1L));
eM_energymulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15114, "hatch.energymulti16.tier.09", "UHV 16A Energy ParameterDefinition", 9, 16).getStackForm(1L));
+ 15114, "hatch.energymulti16.tier.09", "UHV 16A Energy ParameterGroup", 9, 16).getStackForm(1L));
eM_energymulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15124, "hatch.energymulti64.tier.09", "UHV 64A Energy ParameterDefinition", 9, 64).getStackForm(1L));
+ 15124, "hatch.energymulti64.tier.09", "UHV 64A Energy ParameterGroup", 9, 64).getStackForm(1L));
eM_energymulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15105, "hatch.energymulti04.tier.10", "UEV 4A Energy ParameterDefinition", 10, 4).getStackForm(1L));
+ 15105, "hatch.energymulti04.tier.10", "UEV 4A Energy ParameterGroup", 10, 4).getStackForm(1L));
eM_energymulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15115, "hatch.energymulti16.tier.10", "UEV 16A Energy ParameterDefinition", 10, 16).getStackForm(1L));
+ 15115, "hatch.energymulti16.tier.10", "UEV 16A Energy ParameterGroup", 10, 16).getStackForm(1L));
eM_energymulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15125, "hatch.energymulti64.tier.10", "UEV 64A Energy ParameterDefinition", 10, 64).getStackForm(1L));
+ 15125, "hatch.energymulti64.tier.10", "UEV 64A Energy ParameterGroup", 10, 64).getStackForm(1L));
eM_energymulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15106, "hatch.energymulti04.tier.11", "UIV 4A Energy ParameterDefinition", 11, 4).getStackForm(1L));
+ 15106, "hatch.energymulti04.tier.11", "UIV 4A Energy ParameterGroup", 11, 4).getStackForm(1L));
eM_energymulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15116, "hatch.energymulti16.tier.11", "UIV 16A Energy ParameterDefinition", 11, 16).getStackForm(1L));
+ 15116, "hatch.energymulti16.tier.11", "UIV 16A Energy ParameterGroup", 11, 16).getStackForm(1L));
eM_energymulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15126, "hatch.energymulti64.tier.11", "UIV 64A Energy ParameterDefinition", 11, 64).getStackForm(1L));
+ 15126, "hatch.energymulti64.tier.11", "UIV 64A Energy ParameterGroup", 11, 64).getStackForm(1L));
eM_energymulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15107, "hatch.energymulti04.tier.12", "UMV 4A Energy ParameterDefinition", 12, 4).getStackForm(1L));
+ 15107, "hatch.energymulti04.tier.12", "UMV 4A Energy ParameterGroup", 12, 4).getStackForm(1L));
eM_energymulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15117, "hatch.energymulti16.tier.12", "UMV 16A Energy ParameterDefinition", 12, 16).getStackForm(1L));
+ 15117, "hatch.energymulti16.tier.12", "UMV 16A Energy ParameterGroup", 12, 16).getStackForm(1L));
eM_energymulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15127, "hatch.energymulti64.tier.12", "UMV 64A Energy ParameterDefinition", 12, 64).getStackForm(1L));
+ 15127, "hatch.energymulti64.tier.12", "UMV 64A Energy ParameterGroup", 12, 64).getStackForm(1L));
eM_energymulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15108, "hatch.energymulti04.tier.13", "UXV 4A Energy ParameterDefinition", 13, 4).getStackForm(1L));
+ 15108, "hatch.energymulti04.tier.13", "UXV 4A Energy ParameterGroup", 13, 4).getStackForm(1L));
eM_energymulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15118, "hatch.energymulti16.tier.13", "UXV 16A Energy ParameterDefinition", 13, 16).getStackForm(1L));
+ 15118, "hatch.energymulti16.tier.13", "UXV 16A Energy ParameterGroup", 13, 16).getStackForm(1L));
eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
- 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy ParameterDefinition", 13, 64).getStackForm(1L));
+ 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy ParameterGroup", 13, 64).getStackForm(1L));
// ===================================================================================================
// Multi AMP Power OUTPUTS
@@ -160,67 +160,67 @@ public class MachineLoader implements Runnable {
eM_dynamomulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo ParameterDefinition", 5, 4).getStackForm(1L));
+ 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo ParameterGroup", 5, 4).getStackForm(1L));
eM_dynamomulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo ParameterDefinition", 5, 16).getStackForm(1L));
+ 15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo ParameterGroup", 5, 16).getStackForm(1L));
eM_dynamomulti64_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo ParameterDefinition", 5, 64).getStackForm(1L));
+ 15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo ParameterGroup", 5, 64).getStackForm(1L));
eM_dynamomulti4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo ParameterDefinition", 6, 4).getStackForm(1L));
+ 15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo ParameterGroup", 6, 4).getStackForm(1L));
eM_dynamomulti16_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo ParameterDefinition", 6, 16).getStackForm(1L));
+ 15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo ParameterGroup", 6, 16).getStackForm(1L));
eM_dynamomulti64_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo ParameterDefinition", 6, 64).getStackForm(1L));
+ 15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo ParameterGroup", 6, 64).getStackForm(1L));
eM_dynamomulti4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo ParameterDefinition", 7, 4).getStackForm(1L));
+ 15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo ParameterGroup", 7, 4).getStackForm(1L));
eM_dynamomulti16_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo ParameterDefinition", 7, 16).getStackForm(1L));
+ 15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo ParameterGroup", 7, 16).getStackForm(1L));
eM_dynamomulti64_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo ParameterDefinition", 7, 64).getStackForm(1L));
+ 15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo ParameterGroup", 7, 64).getStackForm(1L));
eM_dynamomulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo ParameterDefinition", 8, 4).getStackForm(1L));
+ 15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo ParameterGroup", 8, 4).getStackForm(1L));
eM_dynamomulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo ParameterDefinition", 8, 16).getStackForm(1L));
+ 15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo ParameterGroup", 8, 16).getStackForm(1L));
eM_dynamomulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo ParameterDefinition", 8, 64).getStackForm(1L));
+ 15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo ParameterGroup", 8, 64).getStackForm(1L));
eM_dynamomulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo ParameterDefinition", 9, 4).getStackForm(1L));
+ 15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo ParameterGroup", 9, 4).getStackForm(1L));
eM_dynamomulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo ParameterDefinition", 9, 16).getStackForm(1L));
+ 15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo ParameterGroup", 9, 16).getStackForm(1L));
eM_dynamomulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo ParameterDefinition", 9, 64).getStackForm(1L));
+ 15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo ParameterGroup", 9, 64).getStackForm(1L));
eM_dynamomulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo ParameterDefinition", 10, 4).getStackForm(1L));
+ 15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo ParameterGroup", 10, 4).getStackForm(1L));
eM_dynamomulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo ParameterDefinition", 10, 16).getStackForm(1L));
+ 15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo ParameterGroup", 10, 16).getStackForm(1L));
eM_dynamomulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo ParameterDefinition", 10, 64).getStackForm(1L));
+ 15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo ParameterGroup", 10, 64).getStackForm(1L));
eM_dynamomulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo ParameterDefinition", 11, 4).getStackForm(1L));
+ 15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo ParameterGroup", 11, 4).getStackForm(1L));
eM_dynamomulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo ParameterDefinition", 11, 16).getStackForm(1L));
+ 15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo ParameterGroup", 11, 16).getStackForm(1L));
eM_dynamomulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo ParameterDefinition", 11, 64).getStackForm(1L));
+ 15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo ParameterGroup", 11, 64).getStackForm(1L));
eM_dynamomulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo ParameterDefinition", 12, 4).getStackForm(1L));
+ 15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo ParameterGroup", 12, 4).getStackForm(1L));
eM_dynamomulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo ParameterDefinition", 12, 16).getStackForm(1L));
+ 15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo ParameterGroup", 12, 16).getStackForm(1L));
eM_dynamomulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo ParameterDefinition", 12, 64).getStackForm(1L));
+ 15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo ParameterGroup", 12, 64).getStackForm(1L));
eM_dynamomulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo ParameterDefinition", 13, 4).getStackForm(1L));
+ 15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo ParameterGroup", 13, 4).getStackForm(1L));
eM_dynamomulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo ParameterDefinition", 13, 16).getStackForm(1L));
+ 15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo ParameterGroup", 13, 16).getStackForm(1L));
eM_dynamomulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
- 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo ParameterDefinition", 13, 64).getStackForm(1L));
+ 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo ParameterGroup", 13, 64).getStackForm(1L));
// ===================================================================================================
// MULTIBLOCKS
@@ -279,7 +279,7 @@ public class MachineLoader implements Runnable {
rack_Hatch.set(new GT_MetaTileEntity_Hatch_Rack(15450, "hatch.rack.tier.08", "Computer Rack", 8, "4 Slot Rack").getStackForm(1L));
holder_Hatch.set(new GT_MetaTileEntity_Hatch_Holder(15451, "hatch.holder.tier.09", "Object Holder", 8, "For Research Station").getStackForm(1L));
- capacitor_Hatch.set(new GT_MetaTileEntity_Hatch_Capacitor(15452, "hatch.capacitor.tier.05", "Capacitor ParameterDefinition", 5, "For Tesla Coil").getStackForm(1L));
+ capacitor_Hatch.set(new GT_MetaTileEntity_Hatch_Capacitor(15452, "hatch.capacitor.tier.05", "Capacitor ParameterGroup", 5, "For Tesla Coil").getStackForm(1L));
// ===================================================================================================
// Pipes
@@ -309,7 +309,7 @@ public class MachineLoader implements Runnable {
// ===================================================================================================
// Debug Stuff
// ===================================================================================================
- hatch_CreativeMaitenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance ParameterDefinition", 15).getStackForm(1L));
+ hatch_CreativeMaitenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance ParameterGroup", 15).getStackForm(1L));
Machine_DebugGenny.set(new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 15).getStackForm(1L));
Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 15).getStackForm(1L));
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index 667f1a45d5..cf4b4d2978 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -133,7 +133,7 @@ public final class ConstructableTriggerItem extends Item {
private final String[] desc=new String[]{
EnumChatFormatting.AQUA+"Hint Details:",
"1 - Classic Hatches or Heat Proof Casing",
- "2 - Muffler ParameterDefinition",
+ "2 - Muffler ParameterGroup",
"3 - Coil blocks"
};
//endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index bc6d8cf3c6..25eb3ec939 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -127,7 +127,7 @@ public final class ParametrizerMemoryCard extends Item {
int temp;
if(tNBT!=null && tNBT.hasKey("param")) {
- aList.add("ParameterDefinition ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param"));
+ aList.add("ParameterGroup ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param"));
temp=tNBT.getInteger("value0i");
aList.add("Value 0|I: "+EnumChatFormatting.AQUA + temp);
aList.add("Value 0|F: "+EnumChatFormatting.AQUA + Float.intBitsToFloat(temp));
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
index ca8fb59f74..560a57cd54 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_Capacitor(aPlayerInventory, aBaseMetaTileEntity, "Capacitor ParameterDefinition");
+ return new GT_GUIContainer_Capacitor(aPlayerInventory, aBaseMetaTileEntity, "Capacitor ParameterGroup");
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index e97ffaa670..63bd262a75 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -259,7 +259,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
mDescription,
"Max stacks amount: " + EnumChatFormatting.AQUA + getMaxStacksCount(),
"Stack capacity: " + EnumChatFormatting.AQUA + getMaxStackSize(),
- "Place Overflow ParameterDefinition behind,on top or below",
+ "Place Overflow ParameterGroup behind,on top or below",
"to provide overflow protection while this block",
"is not attached to multi block.",
"Transport range can be extended in straight",
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
index cd3ad8d573..0850bf859a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch {
@Override
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
- return new GT_GUIContainer_Holder(aPlayerInventory, aBaseMetaTileEntity, "Holder ParameterDefinition");
+ return new GT_GUIContainer_Holder(aPlayerInventory, aBaseMetaTileEntity, "Holder ParameterGroup");
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 69bebb4a78..0ec2196a82 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -16,6 +16,8 @@ import com.github.technus.tectech.thing.casing.TT_Container_Casings;
import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedTexture;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -51,8 +53,6 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
private static double MASS_TO_EU_PARTIAL,MASS_TO_EU_INSTANT;
private static int STARTUP_COST,KEEPUP_COST;
- private long plasmaEnergy;
-
public static void setValues(int heliumPlasmaValue){
MASS_TO_EU_PARTIAL = heliumPlasmaValue / 1.75893000478707E07;//mass diff
MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
@@ -267,6 +267,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
protected byte eTier = 0;
protected cElementalInstanceStack stack;
+ private long plasmaEnergy;
+ public Parameters.ParameterGroup.In mode;
protected static final byte FUSE_MODE=0, COLLIDE_MODE =1;
protected boolean started=false;
@@ -329,6 +331,35 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
}
@Override
+ protected void parametersInstantiation_EM() {
+ Parameters.ParameterGroup group=parametrization.makeGroup(0,false);
+ mode=group.makeInParameter(0,FUSE_MODE,()->{
+ if(isMaster()){
+ if(mode.get()==FUSE_MODE){
+ return "Mode: Fuse";
+ }else if(mode.get()==COLLIDE_MODE){
+ return "Mode: Collide";
+ }
+ return "Mode: Undefined";
+ }
+ return "Currently Slaves...";
+ },()->{
+ if(isMaster()){
+ if (mode.get() == FUSE_MODE || mode.get() == COLLIDE_MODE) {
+ return STATUS_OK;
+ } else if (mode.get() > 1) {
+ return STATUS_TOO_HIGH;
+ } else if (mode.get() < 0) {
+ return STATUS_TOO_LOW;
+ }else{
+ return STATUS_WRONG;
+ }
+ }
+ return STATUS_UNUSED;
+ });
+ }
+
+ @Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GT_MetaTileEntity_EM_collider(mName);
}
@@ -441,16 +472,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
@Override
public void parametersOutAndStatusesWrite_EM(boolean machineBusy) {
if(isMaster()) {
- double mode = getParameterIn(0, 0);
- if (mode == FUSE_MODE || mode == COLLIDE_MODE) {
- setStatusOfParameterIn(0, 0, STATUS_OK);
- } else if (mode > 1) {
- setStatusOfParameterIn(0, 0, STATUS_TOO_HIGH);
- } else if (mode < 0) {
- setStatusOfParameterIn(0, 0, STATUS_TOO_LOW);
- }else{
- setStatusOfParameterIn(0,0,STATUS_WRONG);
- }
+ super.parametersOutAndStatusesWrite_EM(machineBusy);
}
}
@@ -600,7 +622,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
return;
}
if (isMaster()) {
- switch (getParameterInInt(0,0)){
+ switch ((int)mode.get()){
case FUSE_MODE:
makeEU(fuse(partner));
break;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 346e851345..8c0a0f0708 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -53,7 +53,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
private static final String[] description = new String[]{
EnumChatFormatting.AQUA + "Hint Details:",
"1 - Classic Hatches or High Power Casing",
- "2 - Elemental Input ParameterDefinition",
+ "2 - Elemental Input ParameterGroup",
"3 - Elemental Overflow Hatches or Molecular Casing",
};
//endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 5733bfb458..1494d97e34 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -59,7 +59,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
private static final String[] description = new String[]{
EnumChatFormatting.AQUA+"Hint Details:",
"1 - Classic Hatches or High Power Casing",
- "2 - Elemental Output ParameterDefinition",
+ "2 - Elemental Output ParameterGroup",
"3 - Elemental Overflow Hatches or Molecular Casing",
};
//endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index edc9c11a56..b4b786dcdb 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -73,7 +73,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
private static final String[] description = new String[]{
EnumChatFormatting.AQUA+"Hint Details:",
"1 - Classic/Data Hatches or Computer casing",
- "2 - Holder ParameterDefinition",
+ "2 - Holder ParameterGroup",
};
//endregion
@@ -286,7 +286,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
}
for (int i = 0; i < tRecipe.mFluidInputs.length; i++) {
if (tRecipe.mFluidInputs[i] != null) {
- tNBTList.appendTag(new NBTTagString("Input ParameterDefinition " + (i + 1) + ": " + tRecipe.mFluidInputs[i].amount + "L " + GT_LanguageManager.getTranslation(tRecipe.mFluidInputs[i].getLocalizedName())));
+ tNBTList.appendTag(new NBTTagString("Input ParameterGroup " + (i + 1) + ": " + tRecipe.mFluidInputs[i].amount + "L " + GT_LanguageManager.getTranslation(tRecipe.mFluidInputs[i].getLocalizedName())));
}
}
tNBT.setTag("pages", tNBTList);
@@ -382,7 +382,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
s = tRecipe.mFluidInputs[i].getLocalizedName();
}
}
- tNBTList.appendTag(new NBTTagString("Input ParameterDefinition "+(i+1)+": "+tRecipe.mFluidInputs[i].amount+"L "+s));
+ tNBTList.appendTag(new NBTTagString("Input ParameterGroup "+(i+1)+": "+tRecipe.mFluidInputs[i].amount+"L "+s));
}
}
tNBT.setTag("pages", tNBTList);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 07fde1050a..82da3a5ba2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -453,6 +453,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
EnumChatFormatting.AQUA+paramID +
EnumChatFormatting.YELLOW+ ":"+
EnumChatFormatting.AQUA+"I");
+ try{
+ list.add(parametrization.parameterGroups[hatchNo].in[paramID].name.get());
+ }catch (NullPointerException e){
+ list.add("Unused");
+ }
return list;
}
@@ -470,6 +475,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
EnumChatFormatting.AQUA+paramID +
EnumChatFormatting.YELLOW+ ":"+
EnumChatFormatting.AQUA+"O");
+ try{
+ list.add(parametrization.parameterGroups[hatchNo].out[paramID].name.get());
+ }catch (NullPointerException e){
+ list.add("Unused");
+ }
return list;
}
@@ -730,13 +740,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
*/
public void parametersOutAndStatusesWrite_EM(boolean machineBusy) {
if(!machineBusy){
- for (Parameters.ParameterDefinition.In in : parametrization.inArrayList) {
+ for (Parameters.ParameterGroup.In in : parametrization.inArrayList) {
if (in != null) {
in.updateStatus();
}
}
}
- for (Parameters.ParameterDefinition.Out out : parametrization.outArrayList) {
+ for (Parameters.ParameterGroup.Out out : parametrization.outArrayList) {
if (out != null) {
out.updateStatus();
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java
index 3bd769f14f..824588ab25 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java
@@ -9,12 +9,13 @@ import java.util.function.Supplier;
public class Parameters {
private static final Supplier<LedStatus> LED_STATUS_FUNCTION_DEFAULT = ()->LedStatus.STATUS_UNDEFINED;
private static final int ZERO_FLOAT=Float.floatToIntBits(0);
- private final ParameterDefinition[] parameterDefinitions =new ParameterDefinition[10];
+
+ final ParameterGroup[] parameterGroups =new ParameterGroup[10];
final int[] iParamsIn = new int[20];//number I from parametrizers
final int[] iParamsOut = new int[20];//number O to parametrizers
- final ArrayList<ParameterDefinition.In> inArrayList=new ArrayList<>();
- final ArrayList<ParameterDefinition.Out> outArrayList=new ArrayList<>();
+ final ArrayList<ParameterGroup.In> inArrayList=new ArrayList<>();
+ final ArrayList<ParameterGroup.Out> outArrayList=new ArrayList<>();
final boolean[] bParamsAreFloats =new boolean[10];
@@ -24,9 +25,9 @@ public class Parameters {
Parameters(){}
- void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats){
+ public void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats){
for (int hatch=0;hatch<10;hatch++) {
- ParameterDefinition p= parameterDefinitions[hatch];
+ ParameterGroup p= parameterGroups[hatch];
if (p!=null){
p.setToDefaults(defaultIn,defaultOut,defaultAreFloats);
}else{
@@ -69,30 +70,42 @@ public class Parameters {
setToDefaults(true,true,false);
inArrayList.clear();
outArrayList.clear();
- for(int i = 0; i< parameterDefinitions.length; i++){
- parameterDefinitions[i]=null;
+ for(int i = 0; i< parameterGroups.length; i++){
+ parameterGroups[i]=null;
}
}
+ public ParameterGroup makeGroup(int hatchNo, boolean aParamsDefaultsAreFloats){
+ return new ParameterGroup( hatchNo, aParamsDefaultsAreFloats);
+ }
+
/**
* most likely used locally in parametersInstantiation_EM()
*/
- public class ParameterDefinition {
+ public class ParameterGroup {
private final boolean bParamsDefaultsAreStoredAsFloats;
private final int hatchNo;
- private final In[] in=new In[2];
- private final Out[] out=new Out[2];
+ final In[] in=new In[2];
+ final Out[] out=new Out[2];
- private ParameterDefinition(int hatchNo, boolean aParamsDefaultsAreFloats){
+ private ParameterGroup(int hatchNo, boolean aParamsDefaultsAreFloats){
if(hatchNo<0 || hatchNo>=10){
- throw new IllegalArgumentException("ParameterDefinition id must be in 0 to 9 range");
+ throw new IllegalArgumentException("ParameterGroup id must be in 0 to 9 range");
}
this.hatchNo=hatchNo;
bParamsDefaultsAreStoredAsFloats =aParamsDefaultsAreFloats;
- parameterDefinitions[hatchNo]=this;
+ parameterGroups[hatchNo]=this;
+ }
+
+ public In makeInParameter(int paramID, double defaultValue,Supplier<String> name, Supplier<LedStatus> status){
+ return new In(paramID, defaultValue,name, status);
+ }
+
+ public Out makeOutParameter(int paramID, double defaultValue,Supplier<String> name, Supplier<LedStatus> status){
+ return new Out(paramID, defaultValue, name, status);
}
- private void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats) {
+ public void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats) {
if(defaultAreFloats){
bParamsAreFloats[hatchNo] = bParamsDefaultsAreStoredAsFloats;
}
@@ -135,8 +148,10 @@ public class Parameters {
public final int id;
public final double defaultValue;
private final Supplier<LedStatus> status;
+ public Supplier<String> name;
- public Out(int paramID, double defaultValue, Supplier< LedStatus> status){
+ private Out(int paramID, double defaultValue,Supplier<String> name, Supplier<LedStatus> status){
+ this.name=name;
this.id=hatchNo+10*paramID;
if(paramID<0 || paramID>2){
throw new IllegalArgumentException("Parameter id must be in 0 to 1 range");
@@ -193,8 +208,10 @@ public class Parameters {
public final int id;
public final double defaultValue;
private final Supplier<LedStatus> status;
+ public Supplier<String> name;
- public In(int paramID, double defaultValue,Supplier<LedStatus> status){
+ private In(int paramID, double defaultValue,Supplier<String> name,Supplier<LedStatus> status){
+ this.name=name;
this.id=hatchNo+10*paramID;
if(paramID<0 || paramID>2){
throw new IllegalArgumentException("Parameter id must be in 0 to 1 range");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index 93c8f69587..d22b1d4d2c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -9,6 +9,7 @@ import com.github.technus.tectech.thing.block.QuantumStuffBlock;
import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.block.Block;
@@ -31,7 +32,6 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat
* Created by danie_000 on 17.12.2016.
*/
public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
-
public static final String machine = "EM Machinery";
private Behaviour currentBehaviour;
@@ -376,10 +376,13 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
public static abstract class Behaviour {
public Behaviour(){}
- public abstract void setOnMachine(){
-
+ public final void setOnMachine(GT_MetaTileEntity_EM_machine te){
+ te.parametrization.ClearDefinitions();
+ parametersInstantiation(te.parametrization);
}
+ public abstract void parametersInstantiation(Parameters parameters);
+
/**
* handle parameters pre recipe, and cyclically
* this shouldn't write to input parameters! only to the provided array and/or output parameters
@@ -397,22 +400,6 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
* @return null if recipe should not start, control object to set machine state and start recipe
*/
public abstract MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, double[] checkedAndFixedParameters);
-
- /**
- * get input param description, only for 4 first hatches
- * @param baseDescr
- * @param hatchNo
- * @param paramID
- */
- protected void getFullLedDescriptionIn(ArrayList<String> baseDescr, int hatchNo, int paramID){}
-
- /**
- * get output param description
- * @param baseDescr
- * @param hatchNo
- * @param paramID
- */
- protected void getFullLedDescriptionOut(ArrayList<String> baseDescr, int hatchNo, int paramID){}
}
@Override