diff options
author | Tec <daniel112092@gmail.com> | 2019-02-16 14:36:34 +0100 |
---|---|---|
committer | Tec <daniel112092@gmail.com> | 2019-02-16 14:36:34 +0100 |
commit | 74cb12a7ca9c8ba0cfd63e8ca743e1b8820fea21 (patch) | |
tree | d5194a9660f94caf1506e6c38fa114f8606e1d2b /src/main/java | |
parent | 5965915bd0549cd289846ea20c9de6037e7faed1 (diff) | |
download | GT5-Unofficial-74cb12a7ca9c8ba0cfd63e8ca743e1b8820fea21.tar.gz GT5-Unofficial-74cb12a7ca9c8ba0cfd63e8ca743e1b8820fea21.tar.bz2 GT5-Unofficial-74cb12a7ca9c8ba0cfd63e8ca743e1b8820fea21.zip |
Backup theese default methods
Diffstat (limited to 'src/main/java')
17 files changed, 401 insertions, 226 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 1d1c80f0da..a70f85d62d 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 Hatch + //UHV Energy ParameterDefinition 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 84cd28b7c9..9e6f3f3c77 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 Hatch", + "2 - Elemental Input ParameterDefinition", "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 d45060c758..d97c28a2be 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 Hatch", + "2 - Elemental Output ParameterDefinition", "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 c1b78523c5..deca78bf6e 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 Hatch", 8).getStackForm(1L)); + 15000, "hatch.emin.tier.08", "UV Elemental Input ParameterDefinition", 8).getStackForm(1L)); eM_in_UHV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 15001, "hatch.emin.tier.09", "UHV Elemental Input Hatch", 9).getStackForm(1L)); + 15001, "hatch.emin.tier.09", "UHV Elemental Input ParameterDefinition", 9).getStackForm(1L)); eM_in_UEV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 15002, "hatch.emin.tier.10", "UEV Elemental Input Hatch", 10).getStackForm(1L)); + 15002, "hatch.emin.tier.10", "UEV Elemental Input ParameterDefinition", 10).getStackForm(1L)); eM_in_UIV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 15003, "hatch.emin.tier.11", "UIV Elemental Input Hatch", 11).getStackForm(1L)); + 15003, "hatch.emin.tier.11", "UIV Elemental Input ParameterDefinition", 11).getStackForm(1L)); eM_in_UMV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 15004, "hatch.emin.tier.12", "UMV Elemental Input Hatch", 12).getStackForm(1L)); + 15004, "hatch.emin.tier.12", "UMV Elemental Input ParameterDefinition", 12).getStackForm(1L)); eM_in_UXV.set(new GT_MetaTileEntity_Hatch_InputElemental( - 15005, "hatch.emin.tier.13", "UXV Elemental Input Hatch", 13).getStackForm(1L)); + 15005, "hatch.emin.tier.13", "UXV Elemental Input ParameterDefinition", 13).getStackForm(1L)); // =================================================================================================== // eM OUT // =================================================================================================== eM_out_UV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15010, "hatch.emout.tier.08", "UV Elemental Output Hatch", 8).getStackForm(1L)); + 15010, "hatch.emout.tier.08", "UV Elemental Output ParameterDefinition", 8).getStackForm(1L)); eM_out_UHV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15011, "hatch.emout.tier.09", "UHV Elemental Output Hatch", 9).getStackForm(1L)); + 15011, "hatch.emout.tier.09", "UHV Elemental Output ParameterDefinition", 9).getStackForm(1L)); eM_out_UEV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15012, "hatch.emout.tier.10", "UEV Elemental Output Hatch", 10).getStackForm(1L)); + 15012, "hatch.emout.tier.10", "UEV Elemental Output ParameterDefinition", 10).getStackForm(1L)); eM_out_UIV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15013, "hatch.emout.tier.11", "UIV Elemental Output Hatch", 11).getStackForm(1L)); + 15013, "hatch.emout.tier.11", "UIV Elemental Output ParameterDefinition", 11).getStackForm(1L)); eM_out_UMV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15014, "hatch.emout.tier.12", "UMV Elemental Output Hatch", 12).getStackForm(1L)); + 15014, "hatch.emout.tier.12", "UMV Elemental Output ParameterDefinition", 12).getStackForm(1L)); eM_out_UXV.set(new GT_MetaTileEntity_Hatch_OutputElemental( - 15015, "hatch.emout.tier.13", "UXV Elemental Output Hatch", 13).getStackForm(1L)); + 15015, "hatch.emout.tier.13", "UXV Elemental Output ParameterDefinition", 13).getStackForm(1L)); // =================================================================================================== // eM Waste OUT // =================================================================================================== eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L)); + 15020, "hatch.emmuffler.tier.08", "UV Overflow Output ParameterDefinition", 8, 1e10f).getStackForm(1L)); eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L)); + 15021, "hatch.emmuffler.tier.09", "UHV Overflow Output ParameterDefinition", 9, 5e10f).getStackForm(1L)); eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L)); + 15022, "hatch.emmuffler.tier.10", "UEV Overflow Output ParameterDefinition", 10, 25e10f).getStackForm(1L)); eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L)); + 15023, "hatch.emmuffler.tier.11", "UIV Overflow Output ParameterDefinition", 11, 125e10f).getStackForm(1L)); eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L)); + 15024, "hatch.emmuffler.tier.12", "UMV Overflow Output ParameterDefinition", 12, 125e11f).getStackForm(1L)); eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental( - 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L)); + 15025, "hatch.emmuffler.tier.13", "UXV Overflow Output ParameterDefinition", 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 Hatch", 5, 4).getStackForm(1L)); + 15100, "hatch.energymulti04.tier.05", "IV 4A Energy ParameterDefinition", 5, 4).getStackForm(1L)); eM_energymulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15110, "hatch.energymulti16.tier.05", "IV 16A Energy Hatch", 5, 16).getStackForm(1L)); + 15110, "hatch.energymulti16.tier.05", "IV 16A Energy ParameterDefinition", 5, 16).getStackForm(1L)); eM_energymulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15120, "hatch.energymulti64.tier.05", "IV 64A Energy Hatch", 5, 64).getStackForm(1L)); + 15120, "hatch.energymulti64.tier.05", "IV 64A Energy ParameterDefinition", 5, 64).getStackForm(1L)); eM_energymulti4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15101, "hatch.energymulti04.tier.06", "LuV 4A Energy Hatch", 6, 4).getStackForm(1L)); + 15101, "hatch.energymulti04.tier.06", "LuV 4A Energy ParameterDefinition", 6, 4).getStackForm(1L)); eM_energymulti16_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15111, "hatch.energymulti16.tier.06", "LuV 16A Energy Hatch", 6, 16).getStackForm(1L)); + 15111, "hatch.energymulti16.tier.06", "LuV 16A Energy ParameterDefinition", 6, 16).getStackForm(1L)); eM_energymulti64_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15121, "hatch.energymulti64.tier.06", "LuV 64A Energy Hatch", 6, 64).getStackForm(1L)); + 15121, "hatch.energymulti64.tier.06", "LuV 64A Energy ParameterDefinition", 6, 64).getStackForm(1L)); eM_energymulti4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy Hatch", 7, 4).getStackForm(1L)); + 15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy ParameterDefinition", 7, 4).getStackForm(1L)); eM_energymulti16_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy Hatch", 7, 16).getStackForm(1L)); + 15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy ParameterDefinition", 7, 16).getStackForm(1L)); eM_energymulti64_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy Hatch", 7, 64).getStackForm(1L)); + 15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy ParameterDefinition", 7, 64).getStackForm(1L)); eM_energymulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15103, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L)); + 15103, "hatch.energymulti04.tier.08", "UV 4A Energy ParameterDefinition", 8, 4).getStackForm(1L)); eM_energymulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15113, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L)); + 15113, "hatch.energymulti16.tier.08", "UV 16A Energy ParameterDefinition", 8, 16).getStackForm(1L)); eM_energymulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15123, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L)); + 15123, "hatch.energymulti64.tier.08", "UV 64A Energy ParameterDefinition", 8, 64).getStackForm(1L)); eM_energymulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15104, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L)); + 15104, "hatch.energymulti04.tier.09", "UHV 4A Energy ParameterDefinition", 9, 4).getStackForm(1L)); eM_energymulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15114, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L)); + 15114, "hatch.energymulti16.tier.09", "UHV 16A Energy ParameterDefinition", 9, 16).getStackForm(1L)); eM_energymulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15124, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L)); + 15124, "hatch.energymulti64.tier.09", "UHV 64A Energy ParameterDefinition", 9, 64).getStackForm(1L)); eM_energymulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15105, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L)); + 15105, "hatch.energymulti04.tier.10", "UEV 4A Energy ParameterDefinition", 10, 4).getStackForm(1L)); eM_energymulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15115, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L)); + 15115, "hatch.energymulti16.tier.10", "UEV 16A Energy ParameterDefinition", 10, 16).getStackForm(1L)); eM_energymulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15125, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L)); + 15125, "hatch.energymulti64.tier.10", "UEV 64A Energy ParameterDefinition", 10, 64).getStackForm(1L)); eM_energymulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15106, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L)); + 15106, "hatch.energymulti04.tier.11", "UIV 4A Energy ParameterDefinition", 11, 4).getStackForm(1L)); eM_energymulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15116, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L)); + 15116, "hatch.energymulti16.tier.11", "UIV 16A Energy ParameterDefinition", 11, 16).getStackForm(1L)); eM_energymulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15126, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L)); + 15126, "hatch.energymulti64.tier.11", "UIV 64A Energy ParameterDefinition", 11, 64).getStackForm(1L)); eM_energymulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15107, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L)); + 15107, "hatch.energymulti04.tier.12", "UMV 4A Energy ParameterDefinition", 12, 4).getStackForm(1L)); eM_energymulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15117, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L)); + 15117, "hatch.energymulti16.tier.12", "UMV 16A Energy ParameterDefinition", 12, 16).getStackForm(1L)); eM_energymulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15127, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L)); + 15127, "hatch.energymulti64.tier.12", "UMV 64A Energy ParameterDefinition", 12, 64).getStackForm(1L)); eM_energymulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15108, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L)); + 15108, "hatch.energymulti04.tier.13", "UXV 4A Energy ParameterDefinition", 13, 4).getStackForm(1L)); eM_energymulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15118, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L)); + 15118, "hatch.energymulti16.tier.13", "UXV 16A Energy ParameterDefinition", 13, 16).getStackForm(1L)); eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L)); + 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy ParameterDefinition", 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 Hatch", 5, 4).getStackForm(1L)); + 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo ParameterDefinition", 5, 4).getStackForm(1L)); eM_dynamomulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo Hatch", 5, 16).getStackForm(1L)); + 15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo ParameterDefinition", 5, 16).getStackForm(1L)); eM_dynamomulti64_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo Hatch", 5, 64).getStackForm(1L)); + 15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo ParameterDefinition", 5, 64).getStackForm(1L)); eM_dynamomulti4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo Hatch", 6, 4).getStackForm(1L)); + 15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo ParameterDefinition", 6, 4).getStackForm(1L)); eM_dynamomulti16_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo Hatch", 6, 16).getStackForm(1L)); + 15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo ParameterDefinition", 6, 16).getStackForm(1L)); eM_dynamomulti64_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo Hatch", 6, 64).getStackForm(1L)); + 15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo ParameterDefinition", 6, 64).getStackForm(1L)); eM_dynamomulti4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo Hatch", 7, 4).getStackForm(1L)); + 15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo ParameterDefinition", 7, 4).getStackForm(1L)); eM_dynamomulti16_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo Hatch", 7, 16).getStackForm(1L)); + 15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo ParameterDefinition", 7, 16).getStackForm(1L)); eM_dynamomulti64_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo Hatch", 7, 64).getStackForm(1L)); + 15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo ParameterDefinition", 7, 64).getStackForm(1L)); eM_dynamomulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L)); + 15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo ParameterDefinition", 8, 4).getStackForm(1L)); eM_dynamomulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L)); + 15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo ParameterDefinition", 8, 16).getStackForm(1L)); eM_dynamomulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L)); + 15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo ParameterDefinition", 8, 64).getStackForm(1L)); eM_dynamomulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L)); + 15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo ParameterDefinition", 9, 4).getStackForm(1L)); eM_dynamomulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L)); + 15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo ParameterDefinition", 9, 16).getStackForm(1L)); eM_dynamomulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L)); + 15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo ParameterDefinition", 9, 64).getStackForm(1L)); eM_dynamomulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L)); + 15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo ParameterDefinition", 10, 4).getStackForm(1L)); eM_dynamomulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L)); + 15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo ParameterDefinition", 10, 16).getStackForm(1L)); eM_dynamomulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L)); + 15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo ParameterDefinition", 10, 64).getStackForm(1L)); eM_dynamomulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L)); + 15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo ParameterDefinition", 11, 4).getStackForm(1L)); eM_dynamomulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L)); + 15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo ParameterDefinition", 11, 16).getStackForm(1L)); eM_dynamomulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L)); + 15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo ParameterDefinition", 11, 64).getStackForm(1L)); eM_dynamomulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L)); + 15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo ParameterDefinition", 12, 4).getStackForm(1L)); eM_dynamomulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L)); + 15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo ParameterDefinition", 12, 16).getStackForm(1L)); eM_dynamomulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L)); + 15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo ParameterDefinition", 12, 64).getStackForm(1L)); eM_dynamomulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L)); + 15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo ParameterDefinition", 13, 4).getStackForm(1L)); eM_dynamomulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L)); + 15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo ParameterDefinition", 13, 16).getStackForm(1L)); eM_dynamomulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L)); + 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo ParameterDefinition", 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 Hatch", 5, "For Tesla Coil").getStackForm(1L)); + capacitor_Hatch.set(new GT_MetaTileEntity_Hatch_Capacitor(15452, "hatch.capacitor.tier.05", "Capacitor ParameterDefinition", 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 Hatch", 15).getStackForm(1L)); + hatch_CreativeMaitenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance(15497, "debug.tt.maintenance", "Debug Maintenance ParameterDefinition", 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 efb9e6d644..667f1a45d5 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 Hatch", + "2 - Muffler ParameterDefinition", "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 035b049a99..bc6d8cf3c6 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("Hatch ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param")); + aList.add("ParameterDefinition 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 2aae2b8c2b..ca8fb59f74 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 Hatch"); + return new GT_GUIContainer_Capacitor(aPlayerInventory, aBaseMetaTileEntity, "Capacitor ParameterDefinition"); } @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 c84057c121..e97ffaa670 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 Hatch behind,on top or below", + "Place Overflow ParameterDefinition 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 409f8195e2..cd3ad8d573 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 Hatch"); + return new GT_GUIContainer_Holder(aPlayerInventory, aBaseMetaTileEntity, "Holder ParameterDefinition"); } @Override 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 5f102c94ab..346e851345 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 Hatch", + "2 - Elemental Input ParameterDefinition", "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 a5a3f451ea..5733bfb458 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 Hatch", + "2 - Elemental Output ParameterDefinition", "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 377291f59a..edc9c11a56 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 Hatch", + "2 - Holder ParameterDefinition", }; //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 Hatch " + (i + 1) + ": " + tRecipe.mFluidInputs[i].amount + "L " + GT_LanguageManager.getTranslation(tRecipe.mFluidInputs[i].getLocalizedName()))); + tNBTList.appendTag(new NBTTagString("Input ParameterDefinition " + (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 Hatch "+(i+1)+": "+tRecipe.mFluidInputs[i].amount+"L "+s)); + tNBTList.appendTag(new NBTTagString("Input ParameterDefinition "+(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/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 1fdf8d6943..541adfd953 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -210,7 +210,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock } @Override - protected void parametersInRead_EM() { + protected void parametersInReadWhileActive_EM() { powerSetting = (int) getParameterIn(0, 0); timerSetting = (int) getParameterIn(0, 1); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java index 4845117a99..b8c856f9f8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java @@ -106,8 +106,8 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine { if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null || eParamsInStatus == null) { return; } - eParamsInStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).eParamsInStatus; - eParamsOutStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).eParamsOutStatus; + eParamsInStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).parametrization.eParamsInStatus; + eParamsOutStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).parametrization.eParamsOutStatus; eCertainMode = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).eCertainMode; eCertainStatus = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).eCertainStatus; ePowerPass = ((GT_MetaTileEntity_MultiblockBase_EM) mTileEntity.getMetaTileEntity()).ePowerPass; 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 a6ec5b561a..07fde1050a 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 @@ -95,20 +95,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt protected ArrayList<GT_MetaTileEntity_Hatch_InputData> eInputData = new ArrayList<>(); protected ArrayList<GT_MetaTileEntity_Hatch_OutputData> eOutputData = new ArrayList<>(); - //endregion - - //region PARAMETERS! GO AWAY and use proper get/set methods - // 0 and 10 are from first parametrizer - // 1 and 11 are from second etc... - - private final int[] iParamsIn = new int[20];//number I from parametrizers - private final int[] iParamsOut = new int[20];//number O to parametrizers - private final boolean[] bParamsAreFloats = new boolean[10]; - - final LedStatus[] eParamsInStatus = new LedStatus[20];//LED status for I - final LedStatus[] eParamsOutStatus = new LedStatus[20];//LED status for O - // 0,2,4,6 - ok - // 1,3,5 - nok + //region parameters + public final Parameters parametrization; //endregion @@ -164,12 +152,16 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt protected GT_MetaTileEntity_MultiblockBase_EM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - parametersLoadDefault_EM(); + parametrization=new Parameters(); + parametersInstantiation_EM(); + parametrization.setToDefaults(true,true,true); } protected GT_MetaTileEntity_MultiblockBase_EM(String aName) { super(aName); - parametersLoadDefault_EM(); + parametrization=new Parameters(); + parametersInstantiation_EM(); + parametrization.setToDefaults(true,true,true); } //region SUPER STRUCT @@ -631,80 +623,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt //endregion - //region PARAMETERS AND STATUSES - actually use it to work with parameters in other overrides - - public final boolean setParameterPairIn_ClearOut(int hatchNo, boolean usesFloats, double value0, double value1) { - if (mMaxProgresstime > 0) { - return false; - } - bParamsAreFloats[hatchNo] = usesFloats; - if (usesFloats) { - iParamsIn[hatchNo] = Float.floatToIntBits((float) value0); - iParamsIn[hatchNo + 10] = Float.floatToIntBits((float) value1); - } else { - iParamsIn[hatchNo] = (int) value0; - iParamsIn[hatchNo + 10] = (int) value1; - } - iParamsOut[hatchNo] = 0; - iParamsOut[hatchNo + 10] = 0; - return true; - } - - public final boolean isParametrizerUsingFloat(int hatchNo){ - return bParamsAreFloats[hatchNo]; - } - - public final double getParameterIn(int hatchNo, int paramID){ - return bParamsAreFloats[hatchNo]?Float.intBitsToFloat(iParamsIn[hatchNo+10*paramID]):iParamsIn[hatchNo+10*paramID]; - } - - public final int getParameterInInt(int hatchNo, int paramID){ - if(bParamsAreFloats[hatchNo]) { - return (int) Float.intBitsToFloat(iParamsIn[hatchNo + 10 * paramID]); - } - return iParamsIn[hatchNo+10*paramID]; - } - - //public final int getParameterInIntRaw(int hatchNo, int paramID){ - // return iParamsIn[hatchNo+10*paramID]; - //} - - //public final float getParameterInFloatRaw(int hatchNo, int paramID){ - // return Float.intBitsToFloat(iParamsIn[hatchNo+10*paramID]); - //} - - public final void setParameterOut(int hatchNo, int paramID, double value){ - if(bParamsAreFloats[hatchNo]) { - iParamsOut[hatchNo+10*paramID]=Float.floatToIntBits((float) value); - }else{ - iParamsOut[hatchNo+10*paramID]=(int)value; - } - } - - //public final boolean setParameterOutInt(int hatchNo, int paramID, int value){ - // if(bParamsAreFloats[hatchNo]) return false; - // iParamsOut[hatchNo+10*paramID]=value; - // return true; - //} - - //public final boolean setParameterOutFloat(int hatchNo, int paramID, float value){ - // if(bParamsAreFloats[hatchNo]) { - // iParamsOut[hatchNo + 10 * paramID] = Float.floatToIntBits(value); - // return true; - // } - // return false; - //} - - public final void setStatusOfParameterIn(int hatchNo, int paramID, LedStatus status){ - eParamsInStatus[hatchNo+10*paramID]=status; - } - - public final void setStatusOfParameterOut(int hatchNo, int paramID, LedStatus status){ - eParamsOutStatus[hatchNo+10*paramID]=status; - } - - //endregion - //region Methods to maybe override (if u implement certain stuff) /** @@ -787,30 +705,43 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * loads default parameters in CONSTRUCTOR! CALLED ONCE on creation, don't call it in your classes + * instantiate parameters in CONSTRUCTOR! CALLED ONCE on creation, don't call it in your classes */ - protected void parametersLoadDefault_EM(){ - //load default parameters with setParameterPairIn_ClearOut - } + protected void parametersInstantiation_EM(){} /** - * This is called automatically when there was parameters data update, copy it to your variables for safe storage - * although the base code only downloads the values from parametrizers when machines is NOT OPERATING + * This is called automatically when there was IN parameters data update and machine IS RUNNING + * although the base code only downloads the IN values from parametrizers when machine is NOT OPERATING + * + * this can be used to update the IN values on the fly when machine is running to affect the current process * - * good place to get Parameters */ - protected void parametersInRead_EM(){} + protected void parametersInReadWhileActive_EM() { + } /** * It is automatically called OFTEN * update status of parameters in guis (and "machine state" if u wish) - * Called before check recipe, before outputting, and every second the machine is active + * Called before check recipe, before outputting, and every second the machine is complete * - * good place for set Parameters + * good place to update parameter statuses, default implementation handles it well * * @param machineBusy is machine doing SHIT */ - public void parametersOutAndStatusesWrite_EM(boolean machineBusy){} + public void parametersOutAndStatusesWrite_EM(boolean machineBusy) { + if(!machineBusy){ + for (Parameters.ParameterDefinition.In in : parametrization.inArrayList) { + if (in != null) { + in.updateStatus(); + } + } + } + for (Parameters.ParameterDefinition.Out out : parametrization.outArrayList) { + if (out != null) { + out.updateStatus(); + } + } + } /** * For extra types of hatches initiation, LOOK HOW IT IS CALLED! in onPostTick @@ -942,32 +873,32 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } NBTTagCompound paramI = new NBTTagCompound(); - for (int i = 0; i < iParamsIn.length; i++) { - paramI.setInteger(Integer.toString(i), iParamsIn[i]); + for (int i = 0; i < parametrization.iParamsIn.length; i++) { + paramI.setInteger(Integer.toString(i), parametrization.iParamsIn[i]); } aNBT.setTag("eParamsIn", paramI); NBTTagCompound paramO = new NBTTagCompound(); - for (int i = 0; i < iParamsOut.length; i++) { - paramO.setInteger(Integer.toString(i), iParamsOut[i]); + for (int i = 0; i < parametrization.iParamsOut.length; i++) { + paramO.setInteger(Integer.toString(i), parametrization.iParamsOut[i]); } aNBT.setTag("eParamsOut", paramO); NBTTagCompound paramB = new NBTTagCompound(); - for (int i = 0; i < bParamsAreFloats.length; i++) { - paramB.setBoolean(Integer.toString(i), bParamsAreFloats[i]); + for (int i = 0; i < parametrization.bParamsAreFloats.length; i++) { + paramB.setBoolean(Integer.toString(i), parametrization.bParamsAreFloats[i]); } aNBT.setTag("eParamsB", paramB); NBTTagCompound paramIs = new NBTTagCompound(); - for (int i = 0; i < eParamsInStatus.length; i++) { - paramIs.setByte(Integer.toString(i), eParamsInStatus[i].getOrdinalByte()); + for (int i = 0; i < parametrization.eParamsInStatus.length; i++) { + paramIs.setByte(Integer.toString(i), parametrization.eParamsInStatus[i].getOrdinalByte()); } aNBT.setTag("eParamsInS", paramIs); NBTTagCompound paramOs = new NBTTagCompound(); - for (int i = 0; i < eParamsOutStatus.length; i++) { - paramOs.setByte(Integer.toString(i), eParamsOutStatus[i].getOrdinalByte()); + for (int i = 0; i < parametrization.eParamsOutStatus.length; i++) { + paramOs.setByte(Integer.toString(i), parametrization.eParamsOutStatus[i].getOrdinalByte()); } aNBT.setTag("eParamsOutS", paramOs); } @@ -1035,28 +966,28 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } NBTTagCompound paramI = aNBT.getCompoundTag("eParamsIn"); - for (int i = 0; i < iParamsIn.length; i++) { - iParamsIn[i] = paramI.getInteger(Integer.toString(i)); + for (int i = 0; i < parametrization.iParamsIn.length; i++) { + parametrization.iParamsIn[i] = paramI.getInteger(Integer.toString(i)); } NBTTagCompound paramO = aNBT.getCompoundTag("eParamsOut"); - for (int i = 0; i < iParamsOut.length; i++) { - iParamsOut[i] = paramO.getInteger(Integer.toString(i)); + for (int i = 0; i < parametrization.iParamsOut.length; i++) { + parametrization.iParamsOut[i] = paramO.getInteger(Integer.toString(i)); } NBTTagCompound paramB = aNBT.getCompoundTag("eParamsB"); - for (int i = 0; i < bParamsAreFloats.length; i++) { - bParamsAreFloats[i] = paramB.getBoolean(Integer.toString(i)); + for (int i = 0; i < parametrization.bParamsAreFloats.length; i++) { + parametrization.bParamsAreFloats[i] = paramB.getBoolean(Integer.toString(i)); } NBTTagCompound paramIs = aNBT.getCompoundTag("eParamsInS"); - for (int i = 0; i < eParamsInStatus.length; i++) { - eParamsInStatus[i] = LedStatus.getStatus(paramIs.getByte(Integer.toString(i))); + for (int i = 0; i < parametrization.eParamsInStatus.length; i++) { + parametrization.eParamsInStatus[i] = LedStatus.getStatus(paramIs.getByte(Integer.toString(i))); } NBTTagCompound paramOs = aNBT.getCompoundTag("eParamsOutS"); - for (int i = 0; i < eParamsOutStatus.length; i++) { - eParamsOutStatus[i] = LedStatus.getStatus(paramOs.getByte(Integer.toString(i))); + for (int i = 0; i < parametrization.eParamsOutStatus.length; i++) { + parametrization.eParamsOutStatus[i] = LedStatus.getStatus(paramOs.getByte(Integer.toString(i))); } } @@ -1235,7 +1166,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } /** - * callback for updating parameters, change this if u really need dynamic (inside recipe time) parameter updates + * callback for updating parameters and new hatches */ protected void hatchesStatusUpdate_EM() { boolean busy=mMaxProgresstime>0; @@ -1245,29 +1176,29 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt continue; } int paramID = hatch.param; - if(bParamsAreFloats[hatch.param] == hatch.isUsingFloats()){ - hatch.input0i = iParamsOut[paramID]; - hatch.input1i = iParamsOut[paramID + 10]; + if(parametrization.bParamsAreFloats[hatch.param] == hatch.isUsingFloats()){ + hatch.input0i = parametrization.iParamsOut[paramID]; + hatch.input1i = parametrization.iParamsOut[paramID + 10]; }else if(hatch.isUsingFloats()){ - hatch.input0i = Float.floatToIntBits((float)iParamsOut[paramID]); - hatch.input1i = Float.floatToIntBits((float)iParamsOut[paramID + 10]); + hatch.input0i = Float.floatToIntBits((float)parametrization.iParamsOut[paramID]); + hatch.input1i = Float.floatToIntBits((float)parametrization.iParamsOut[paramID + 10]); }else { - hatch.input0i = (int)Float.intBitsToFloat(iParamsOut[paramID]); - hatch.input1i = (int)Float.intBitsToFloat(iParamsOut[paramID + 10]); + hatch.input0i = (int)Float.intBitsToFloat(parametrization.iParamsOut[paramID]); + hatch.input1i = (int)Float.intBitsToFloat(parametrization.iParamsOut[paramID + 10]); } } - parametersInRead_EM(); + parametersInReadWhileActive_EM(); } else {//if has nothing to do update all for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) { if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch) || hatch.param < 0) { continue; } int paramID = hatch.param; - bParamsAreFloats[hatch.param] = hatch.isUsingFloats(); - iParamsIn[paramID] = hatch.value0i; - iParamsIn[paramID + 10] = hatch.value1i; - hatch.input0i = iParamsOut[paramID]; - hatch.input1i = iParamsOut[paramID + 10]; + parametrization.bParamsAreFloats[hatch.param] = hatch.isUsingFloats(); + parametrization.iParamsIn[paramID] = hatch.value0i; + parametrization.iParamsIn[paramID + 10] = hatch.value1i; + hatch.input0i = parametrization.iParamsOut[paramID]; + hatch.input1i = parametrization.iParamsOut[paramID + 10]; } } for (GT_MetaTileEntity_Hatch_Uncertainty uncertainty : eUncertainHatches) { @@ -1479,7 +1410,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(hatch)) { hatch.getBaseMetaTileEntity().setActive(true); if(hatch.param>=0) { - bParamsAreFloats[hatch.param] = hatch.isUsingFloats(); + parametrization.bParamsAreFloats[hatch.param] = hatch.isUsingFloats(); } } } 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 new file mode 100644 index 0000000000..3bd769f14f --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/Parameters.java @@ -0,0 +1,240 @@ +package com.github.technus.tectech.thing.metaTileEntity.multi.base; + +import java.util.ArrayList; +import java.util.function.Supplier; + +/** + * Instantiate parameters as field in parametersInstantiation_EM(); + */ +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 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 boolean[] bParamsAreFloats =new boolean[10]; + + //package private for use in gui + final LedStatus[] eParamsInStatus = new LedStatus[20];//LED status for I + final LedStatus[] eParamsOutStatus = new LedStatus[20];//LED status for O + + Parameters(){} + + void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats){ + for (int hatch=0;hatch<10;hatch++) { + ParameterDefinition p= parameterDefinitions[hatch]; + if (p!=null){ + p.setToDefaults(defaultIn,defaultOut,defaultAreFloats); + }else{ + if(defaultAreFloats){ + bParamsAreFloats[hatch]=false; + if(defaultIn){ + iParamsIn[hatch] = 0; + iParamsIn[hatch + 10] = 0; + } + if(defaultOut){ + iParamsOut[hatch] = 0; + iParamsOut[hatch + 10] = 0; + } + }else{ + if(bParamsAreFloats[hatch]){ + if(defaultIn){ + iParamsIn[hatch] = ZERO_FLOAT; + iParamsIn[hatch + 10] = ZERO_FLOAT; + } + if(defaultOut){ + iParamsOut[hatch] = ZERO_FLOAT; + iParamsOut[hatch + 10] = ZERO_FLOAT; + } + }else{ + if(defaultIn){ + iParamsIn[hatch] = 0; + iParamsIn[hatch + 10] = 0; + } + if(defaultOut){ + iParamsOut[hatch] = 0; + iParamsOut[hatch + 10] = 0; + } + } + } + } + } + } + + public void ClearDefinitions(){ + setToDefaults(true,true,false); + inArrayList.clear(); + outArrayList.clear(); + for(int i = 0; i< parameterDefinitions.length; i++){ + parameterDefinitions[i]=null; + } + } + + /** + * most likely used locally in parametersInstantiation_EM() + */ + public class ParameterDefinition { + private final boolean bParamsDefaultsAreStoredAsFloats; + private final int hatchNo; + private final In[] in=new In[2]; + private final Out[] out=new Out[2]; + + private ParameterDefinition(int hatchNo, boolean aParamsDefaultsAreFloats){ + if(hatchNo<0 || hatchNo>=10){ + throw new IllegalArgumentException("ParameterDefinition id must be in 0 to 9 range"); + } + this.hatchNo=hatchNo; + bParamsDefaultsAreStoredAsFloats =aParamsDefaultsAreFloats; + parameterDefinitions[hatchNo]=this; + } + + private void setToDefaults(boolean defaultIn, boolean defaultOut,boolean defaultAreFloats) { + if(defaultAreFloats){ + bParamsAreFloats[hatchNo] = bParamsDefaultsAreStoredAsFloats; + } + if(defaultIn){ + for(int in=0;in<2;in++){ + if(this.in[in]!=null){ + this.in[in].setDefault(); + }else { + if (bParamsAreFloats[hatchNo]) { + iParamsIn[hatchNo] = ZERO_FLOAT; + iParamsIn[hatchNo + 10] = ZERO_FLOAT; + } else { + iParamsIn[hatchNo] = 0; + iParamsIn[hatchNo + 10] = 0; + } + } + } + } + if(defaultOut){ + for(int out=0;out<2;out++){ + if(this.out[out]!=null){ + this.out[out].setDefault(); + }else { + if (bParamsAreFloats[hatchNo]) { + iParamsIn[hatchNo] = ZERO_FLOAT; + iParamsIn[hatchNo + 10] = ZERO_FLOAT; + } else { + iParamsIn[hatchNo] = 0; + iParamsIn[hatchNo + 10] = 0; + } + } + } + } + } + + /** + * Make a field out of this... + */ + public class Out { + public final int id; + public final double defaultValue; + private final Supplier<LedStatus> status; + + public Out(int paramID, double defaultValue, Supplier< LedStatus> status){ + this.id=hatchNo+10*paramID; + if(paramID<0 || paramID>2){ + throw new IllegalArgumentException("Parameter id must be in 0 to 1 range"); + } + this.defaultValue=defaultValue; + if(out[paramID]!=null){ + throw new InstantiationError("This parameter already exists!"); + } + if(status ==null){ + this.status =LED_STATUS_FUNCTION_DEFAULT; + }else{ + this.status = status; + } + outArrayList.add(this); + out[paramID]=this; + } + + private void setDefault() { + set(defaultValue); + } + + public double get(){ + return bParamsAreFloats[hatchNo]?Float.intBitsToFloat(iParamsOut[id]):iParamsOut[id]; + } + + public void set(double value){ + if(bParamsAreFloats[hatchNo]) { + iParamsOut[id]=Float.floatToIntBits((float) value); + }else{ + iParamsOut[id]=(int)value; + } + } + + public LedStatus getStatus(){ + return eParamsOutStatus[id]; + } + + public void updateStatus(){ + eParamsOutStatus[id]=status.get(); + } + + public LedStatus getStaus(boolean update){ + if(update){ + updateStatus(); + } + return eParamsOutStatus[id]; + } + } + + /** + * Make a field out of this... + */ + public class In { + public final int id; + public final double defaultValue; + private final Supplier<LedStatus> status; + + public In(int paramID, double defaultValue,Supplier<LedStatus> status){ + this.id=hatchNo+10*paramID; + if(paramID<0 || paramID>2){ + throw new IllegalArgumentException("Parameter id must be in 0 to 1 range"); + } + this.defaultValue=defaultValue; + if(in[paramID]!=null){ + throw new InstantiationError("This parameter already exists!"); + } + if(status ==null){ + this.status =LED_STATUS_FUNCTION_DEFAULT; + }else{ + this.status = status; + } + inArrayList.add(this); + in[paramID]=this; + } + + private void setDefault() { + if(bParamsAreFloats[hatchNo]) { + iParamsIn[id]=Float.floatToIntBits((float) defaultValue); + }else{ + iParamsIn[id]=(int)defaultValue; + } + } + + public double get(){ + return bParamsAreFloats[hatchNo]?Float.intBitsToFloat(iParamsIn[id]):iParamsIn[id]; + } + + public void updateStatus(){ + eParamsInStatus[id]=status.get(); + } + + public LedStatus getStaus(boolean update){ + if(update){ + updateStatus(); + } + return eParamsInStatus[id]; + } + } + } +} + 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 ad10d70cbf..93c8f69587 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 @@ -376,6 +376,10 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa public static abstract class Behaviour { public Behaviour(){} + public abstract void setOnMachine(){ + + } + /** * handle parameters pre recipe, and cyclically * this shouldn't write to input parameters! only to the provided array and/or output parameters |