From c42c28e3d45eb5bab3709e166a03074e5e34ff4e Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Sat, 9 Mar 2024 18:30:32 +0800 Subject: [PATCH 1/6] fix DSP Receiver tooltips --- .../com/Nxer/TwistSpaceTechnology/util/TextLocalization.java | 2 +- src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang | 2 +- src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java index 3011edab..c3738265 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java @@ -378,7 +378,7 @@ public class TextLocalization { public static final String Tooltip_DSPReceiver_02_05 = texter("Converted to remaining time of intensify mode.","Tooltip_DSPReceiver_02_05"); public static final String Tooltip_DSPReceiver_02_06 = texter("Requesting ratio = Integrated Circuit Number / Stack Size","Tooltip_DSPReceiver_02_06"); public static final String Tooltip_DSPReceiver_02_07 = texter("Put §b§l§oAstral Array Fabricator§7 into controller slot then this machine can request over 1024A Max power point.","Tooltip_DSPReceiver_02_07"); - public static final String Tooltip_DSPReceiver_02_08 = texter("Final requesting power point limit = Astral Array Fabricator amount * 1024A Max","Tooltip_DSPReceiver_02_08"); + public static final String Tooltip_DSPReceiver_02_08 = texter("Final requesting power point limit = Astral Array Fabricator amount * 2048A Max","Tooltip_DSPReceiver_02_08"); // endregion diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang index 69f352c0..ac62e1ae 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang @@ -340,7 +340,7 @@ Tooltip_DSPReceiver_02_04=Graviton Lens will be consumed immediately upon input. Tooltip_DSPReceiver_02_05=Converted to enhancement mode duration. Tooltip_DSPReceiver_02_06=Request ratio = Programmed Circuit Number / Stack Size Tooltip_DSPReceiver_02_07=Put §b§l§oAstral Array Fabricator§7 into controller slot then this machine can request over 1024A Max power point. -Tooltip_DSPReceiver_02_08=Final requesting power point limit = Astral Array Fabricator amount * 1024A Max +Tooltip_DSPReceiver_02_08=Final requesting power point limit = Astral Array Fabricator amount * 2048A Max Tooltip_ArtificialStar_MachineType=Dyson Sphere Program: Annihilation Generator Tooltip_ArtificialStar_00=§d§lAll you have to do is just let the positive and negative proton beams pass Tooltip_ArtificialStar_01=§d§l silently through the magnetic field from both ends into the confining sphere, easy peasy! diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang index 7a78c114..66c2e5b4 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang @@ -340,7 +340,7 @@ Tooltip_DSPReceiver_02_04=输入的引力透镜会立刻被消耗. Tooltip_DSPReceiver_02_05=转换成剩余的增强模式时间. Tooltip_DSPReceiver_02_06=请求比率 = 编程电路编号 / 堆叠数量 Tooltip_DSPReceiver_02_07=在控制器内放入 §b§l§o星阵§7 可以使此机器请求超过1024A Max的能量点数. -Tooltip_DSPReceiver_02_08=最终请求能量点数上限 = 星阵数量 * 1024A Max +Tooltip_DSPReceiver_02_08=最终请求能量点数上限 = 星阵数量 * 2048A Max Tooltip_ArtificialStar_MachineType=戴森球计划: 湮灭发电机 Tooltip_ArtificialStar_00=§d§l你只需要让正反质子束从两端静静地穿 Tooltip_ArtificialStar_01=§d§l 过磁场进入约束球就可以了, 轻松愉快! From be275d944c1fc0d06eaf08f31bcb5c85c5eb00aa Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Sat, 9 Mar 2024 18:36:16 +0800 Subject: [PATCH 2/6] adjust Nq line ICD recipes --- .../IntensifyChemicalDistorterRecipePool.java | 82 ++++++++++++++++++- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java index 7417a6a7..bc6c18ab 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java @@ -902,7 +902,7 @@ public void loadRecipes() { TST_RecipeBuilder .builder() .itemInputs( - copyAmount(0, Materials.Silver.getNanite(1)), + copyAmount(0, Materials.Neutronium.getNanite(1)), setStackSize(MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust,1), 220), setStackSize(Materials.Sulfur.getDust(1), 102) ) @@ -926,7 +926,7 @@ public void loadRecipes() { TST_RecipeBuilder .builder() .itemInputs( - copyAmount(0, Materials.Silver.getNanite(1)), + copyAmount(0, Materials.Neutronium.getNanite(1)), setStackSize(MyMaterial.naquadriaEarth.get(OrePrefixes.dust,1), 100), setStackSize(Materials.Phosphorus.getDust(1), 95) ) @@ -940,11 +940,87 @@ public void loadRecipes() { Materials.Naquadria.getMolten(144*100), Materials.Oxygen.getGas(1000*276) ) - .specialValue(12600) + .specialValue(11700) .eut(RECIPE_ZPM) .duration(20 * 100) .addTo(ICD); + // Naquadah + TST_RecipeBuilder + .builder() + .itemInputs( + copyAmount(0, Materials.Gold.getNanite(1)), + setStackSize(MyMaterial.naquadahEarth.get(OrePrefixes.dust,1), 480), + setStackSize(Materials.Sodium.getDust(1), 1128) + ) + .fluidInputs(Materials.Fluorine.getGas(1000*800)) + .itemOutputs( + MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust, 25), + setStackSize(Materials.Gallium.getDust(1), 960), + setStackSize(Materials.Adamantium.getDust(1), 384), + setStackSize(Materials.Sulfur.getDust(1), 1210) + ) + .fluidOutputs( + Materials.Naquadah.getMolten(144*960), + Materials.NaquadahEnriched.getMolten(144*225), + Materials.Naquadria.getMolten(144*30), + Materials.Titanium.getMolten(144*480), + Materials.Hydrogen.getGas(1000*3368), + Materials.Oxygen.getGas(1000*5816), + MyMaterial.wasteLiquid.getFluidOrGas(1000*160) + ) + .specialValue(12600) + .eut(RECIPE_LuV) + .duration(20 * 200) + .addTo(ICD); + + // Enriched Naquadah + TST_RecipeBuilder + .builder() + .itemInputs( + copyAmount(0, Materials.Gold.getNanite(1)), + setStackSize(MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust,1), 220), + setStackSize(Materials.Sulfur.getDust(1), 102) + ) + .fluidInputs(Materials.Oxygen.getGas(1000*288)) + .itemOutputs( + MyMaterial.naquadahEarth.get(OrePrefixes.dust, 60), + Materials.Trinium.getDust(10) + ) + .fluidOutputs( + Materials.NaquadahEnriched.getMolten(144*180), + Materials.Naquadria.getMolten(144*24), + Materials.Hydrogen.getGas(1000*600), + MyMaterial.wasteLiquid.getFluidOrGas(1000*60) + ) + .specialValue(12600) + .eut(RECIPE_LuV * 2) + .duration(20 * 50) + .addTo(ICD); + + // Naquadria + TST_RecipeBuilder + .builder() + .itemInputs( + copyAmount(0, Materials.Gold.getNanite(1)), + setStackSize(MyMaterial.naquadriaEarth.get(OrePrefixes.dust,1), 100), + setStackSize(Materials.Phosphorus.getDust(1), 95) + ) + .itemOutputs( + MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust, 50), + Materials.Barium.getDust(2), + Materials.Indium.getDust(5), + setStackSize(Materials.Sulfur.getDust(1), 102) + ) + .fluidOutputs( + Materials.Naquadria.getMolten(144*100), + Materials.Oxygen.getGas(1000*276) + ) + .specialValue(12600) + .eut(RECIPE_ZPM) + .duration(20 * 8) + .addTo(ICD); + // endregion } From f435081b86c93d9c283b74690b783125c9123f3f Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Mon, 11 Mar 2024 17:43:26 +0800 Subject: [PATCH 3/6] add Mega Fluid Heater : Core Device of Human Power Generation Facility --- .../common/GTCMItemList.java | 1 + ...TileEntity_IntensifyChemicalDistorter.java | 1 + .../machine/GT_TileEntity_Silksong.java | 1 + ...eDeviceOfHumanPowerGenerationFacility.java | 322 ++++++++++++++++++ .../common/machine/TST_MegaVoidMiner.java | 52 +++ .../TwistSpaceTechnology/config/Config.java | 9 + .../loader/MachineLoader.java | 12 + .../machineRecipe/GTCMMachineRecipePool.java | 23 ++ .../TwistSpaceTechnology/util/TextEnums.java | 20 +- .../util/TextLocalization.java | 3 +- .../util/enums/TierName.java | 13 + .../assets/gtnhcommunitymod/lang/en_US.lang | 5 + .../assets/gtnhcommunitymod/lang/zh_CN.lang | 5 + 13 files changed, 465 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_CoreDeviceOfHumanPowerGenerationFacility.java create mode 100644 src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaVoidMiner.java create mode 100644 src/main/java/com/Nxer/TwistSpaceTechnology/util/enums/TierName.java diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java index 4cb5840c..b05d0f40 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/GTCMItemList.java @@ -193,6 +193,7 @@ public enum GTCMItemList { MegaMacerator, HephaestusAtelier, DeployedNanoCore, + CoreDeviceOfHumanPowerGenerationFacility, // MAX HighDimensionalExtend, diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_IntensifyChemicalDistorter.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_IntensifyChemicalDistorter.java index 2f3dc2b4..340e74ee 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_IntensifyChemicalDistorter.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_IntensifyChemicalDistorter.java @@ -303,6 +303,7 @@ public boolean isCorrectMachinePart(ItemStack aStack) { @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { repairMachine(); + coilLevel = HeatingCoilLevel.None; // this.casingAmountActual = 0; // re-init counter return checkPiece(STRUCTURE_PIECE_MAIN, horizontalOffSet, verticalOffSet, depthOffSet); } diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_Silksong.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_Silksong.java index 81cee6a4..fb34fa0b 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_Silksong.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/GT_TileEntity_Silksong.java @@ -111,6 +111,7 @@ public RecipeMap getRecipeMap() { @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { repairMachine(); + coilLevel = HeatingCoilLevel.None; this.piece = 0; diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_CoreDeviceOfHumanPowerGenerationFacility.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_CoreDeviceOfHumanPowerGenerationFacility.java new file mode 100644 index 00000000..134d5c22 --- /dev/null +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_CoreDeviceOfHumanPowerGenerationFacility.java @@ -0,0 +1,322 @@ +package com.Nxer.TwistSpaceTechnology.common.machine; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChannel; +import static gregtech.api.enums.GT_HatchElement.Energy; +import static gregtech.api.enums.GT_HatchElement.ExoticEnergy; +import static gregtech.api.enums.GT_HatchElement.InputBus; +import static gregtech.api.enums.GT_HatchElement.InputHatch; +import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW; +import static gregtech.api.util.GT_StructureUtility.ofCoil; +import static gregtech.api.util.GT_StructureUtility.ofFrame; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + +import com.Nxer.TwistSpaceTechnology.common.machine.multiMachineClasses.GTCM_MultiMachineBase; +import com.Nxer.TwistSpaceTechnology.util.TextEnums; +import com.Nxer.TwistSpaceTechnology.util.TextLocalization; +import com.Nxer.TwistSpaceTechnology.util.enums.TierName; +import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.HeatingCoilLevel; +import gregtech.api.enums.Materials; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.recipe.RecipeMap; +import gregtech.api.recipe.RecipeMaps; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GT_HatchElementBuilder; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; + +public class TST_CoreDeviceOfHumanPowerGenerationFacility + extends GTCM_MultiMachineBase { + + // region Class Constructor + public TST_CoreDeviceOfHumanPowerGenerationFacility(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public TST_CoreDeviceOfHumanPowerGenerationFacility(String aName) { + super(aName); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new TST_CoreDeviceOfHumanPowerGenerationFacility(this.mName); + } + + // endregion + + // region Processing Logic + private float speedBonus = 1; + private byte glassTier = 0; + private String glassTierName = "NONE"; + private HeatingCoilLevel coilLevel; + + @Override + public String[] getInfoData() { + String[] origin = super.getInfoData(); + String[] ret = new String[origin.length + 1]; + System.arraycopy(origin, 0, ret, 0, origin.length); + ret[origin.length] = EnumChatFormatting.AQUA + TextEnums.GlassTier.toString() + + ": " + + EnumChatFormatting.GOLD + + this.glassTier + + EnumChatFormatting.RESET + + " --> " + + EnumChatFormatting.GOLD + + this.glassTierName; + return ret; + } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + super.saveNBTData(aNBT); + aNBT.setFloat("speedBonus", speedBonus); + aNBT.setByte("glassTier", glassTier); + } + + @Override + public void loadNBTData(NBTTagCompound aNBT) { + super.loadNBTData(aNBT); + speedBonus = aNBT.getFloat("speedBonus"); + glassTier = aNBT.getByte("glassTier"); + } + + public int getCoilTier() { + return 1 + coilLevel.getTier(); + } + + public HeatingCoilLevel getCoilLevel() { + return coilLevel; + } + + public void setCoilLevel(HeatingCoilLevel coilLevel) { + this.coilLevel = coilLevel; + } + + @Override + public RecipeMap getRecipeMap() { + return RecipeMaps.fluidHeaterRecipes; + } + + @Override + protected boolean isEnablePerfectOverclock() { + return true; + } + + @Override + protected float getSpeedBonus() { + return speedBonus; + } + + @Override + protected int getMaxParallelRecipes() { + return Integer.MAX_VALUE; + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + repairMachine(); + glassTier = 0; + coilLevel = HeatingCoilLevel.None; + if (!checkPiece(STRUCTURE_PIECE_MAIN, horizontalOffSet, verticalOffSet, depthOffSet)) return false; + if (glassTier == 0 || coilLevel == HeatingCoilLevel.None) return false; + if (glassTier < 12) { + for (GT_MetaTileEntity_Hatch hatch : this.mExoticEnergyHatches) { + if (this.glassTier < hatch.mTier) { + return false; + } + } + } + + speedBonus = 1F / getCoilTier(); + glassTierName = TierName.getVoltageName(glassTier); + return true; + } + // endregion + + // region Structure + // spotless:off + private static final int horizontalOffSet = 7; + private static final int verticalOffSet = 18; + private static final int depthOffSet = 0; + private static final String STRUCTURE_PIECE_MAIN = "mainCoreDeviceOfHumanPowerGenerationFacility"; + private static IStructureDefinition STRUCTURE_DEFINITION = null; + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(STRUCTURE_PIECE_MAIN, stackSize, hintsOnly, horizontalOffSet, verticalOffSet, depthOffSet); + } + + @Override + public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { + if (mMachine) return -1; + return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, horizontalOffSet, verticalOffSet, depthOffSet, elementBudget, env, false, true); + } + + @Override + public IStructureDefinition getStructureDefinition() { + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = + StructureDefinition + .builder() + .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][]{ + {" "," "," "," "," "," FFF "," FFFFF "," FFFFF "," FFFFF "," FFF "," "," "," "," "," "}, + {" "," BBB "," BBBBBBB "," BBBBBBBBB "," BBBBBBBBBBB "," BBBBFFFBBBB "," BBBBFFFFFBBBB "," BBBBFFDFFBBBB "," BBBBFFFFFBBBB "," BBBBFFFBBBB "," BBBBBBBBBBB "," BBBBBBBBB "," BBBBBBB "," BBB "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A A "," A A "," A D A "," A A "," A A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AAEEEAA "," AEE EEA "," AE EA "," AE EA "," AE EA "," AE GGGDGGG EA "," AE EA "," AE EA "," AE EA "," AEE EEA "," AAEEEAA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A A "," A A "," A GGGDGGG A "," A A "," A A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AAEEEAA "," AEE EEA "," AE G EA "," AE G EA "," AE G EA "," AE D EA "," AE G EA "," AE G EA "," AE G EA "," AEE EEA "," AAEEEAA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A G A "," A G A "," A G A "," A D A "," A G A "," A G A "," A G A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AAEEEAA "," AEE EEA "," AE EA "," AE EA "," AE EA "," AE GGGDGGG EA "," AE EA "," AE EA "," AE EA "," AEE EEA "," AAEEEAA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A A "," A A "," A GGGDGGG A "," A A "," A A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A A "," A G A "," A G A "," A D A "," A G A "," A G A "," A A "," A A "," AA AA "," AAA "," "}, + {" "," AAA "," AAEEEAA "," AEE EEA "," AE G EA "," AE G EA "," AE G EA "," AE D EA "," AE G EA "," AE G EA "," AE G EA "," AEE EEA "," AAEEEAA "," AAA "," "}, + {" "," AAA "," AA AA "," A A "," A G A "," A G A "," A G A "," A D A "," A G A "," A G A "," A G A "," A A "," AA AA "," AAA "," "}, + {" "," BBB "," BBBBBBB "," BBBBBBBBB "," BBBBBBBBBBB "," BBBBFFFBBBB "," BBBBFFFFFBBBB "," BBBBFFDFFBBBB "," BBBBFFFFFBBBB "," BBBBFFFBBBB "," BBBBBBBBBBB "," BBBBBBBBB "," BBBBBBB "," BBB "," "}, + {" CC~CC "," CCCCCCCCC "," CCCCCCCCCCC "," CCCCCCCCCCCCC "," CCCCCCCCCCCCC ","CCCCCCFFFCCCCCC","CCCCCFFFFFCCCCC","CCCCCFFFFFCCCCC","CCCCCFFFFFCCCCC","CCCCCCFFFCCCCCC"," CCCCCCCCCCCCC "," CCCCCCCCCCCCC "," CCCCCCCCCCC "," CCCCCCCCC "," CCCCC "}, + {" CCCCC "," CCCCCCCCC "," CCCCCCCCCCC "," CCCCCCCCCCCCC "," CCCCCCCCCCCCC ","CCCCCCFFFCCCCCC","CCCCCFFFFFCCCCC","CCCCCFFFFFCCCCC","CCCCCFFFFFCCCCC","CCCCCCFFFCCCCCC"," CCCCCCCCCCCCC "," CCCCCCCCCCCCC "," CCCCCCCCCCC "," CCCCCCCCC "," CCCCC "} + }) + ) + .addElement( + 'A', // BW Glasses + withChannel("glass", + BorosilicateGlass.ofBoroGlass( + (byte) 0, + (byte) 1, + Byte.MAX_VALUE, + (te, t) -> te.glassTier = t, + te -> te.glassTier + )) + ) + .addElement( + 'B', // gt.blockcasings, 11 : Fluid IO Hatches + GT_HatchElementBuilder + .builder() + .atLeast(InputHatch, OutputHatch) + .adder(TST_CoreDeviceOfHumanPowerGenerationFacility::addToMachineList) + .dot(1) + .casingIndex(11) + .buildAndChain(GregTech_API.sBlockCasings1, 11) + ) + .addElement( + 'C', // gt.blockcasings2, 0 : Item IO Buses + GT_HatchElementBuilder + .builder() + .atLeast(InputBus, OutputBus) + .adder(TST_CoreDeviceOfHumanPowerGenerationFacility::addToMachineList) + .dot(2) + .casingIndex(16) + .buildAndChain(GregTech_API.sBlockCasings2, 6) + ) + .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 4)) + .addElement( + 'E', // coils + withChannel( + "coil", + ofCoil( + TST_CoreDeviceOfHumanPowerGenerationFacility::setCoilLevel, + TST_CoreDeviceOfHumanPowerGenerationFacility::getCoilLevel + ) + ) + ) + .addElement( + 'F', // gt.blockcasings8, 7 : Energy Hatches + GT_HatchElementBuilder + .builder() + .atLeast(Energy.or(ExoticEnergy)) + .adder(TST_CoreDeviceOfHumanPowerGenerationFacility::addToMachineList) + .dot(3) + .casingIndex(183) + .buildAndChain(GregTech_API.sBlockCasings8, 7) + ) + .addElement('G', ofFrame(Materials.Osmiridium)) + .build(); + } + return STRUCTURE_DEFINITION; + } + // spotless:on + // endregion + + // region General + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + // #tr Tooltip_CoreDeviceOfHumanPowerGenerationFacility_MachineType + // # Fluid Heater + // #zh_CN 流体加热器 + tt.addMachineType(TextEnums.tr("Tooltip_CoreDeviceOfHumanPowerGenerationFacility_MachineType")) + // #tr Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller + // # Controller block for the Core Device of Human Power Generation Facility + // #zh_CN 人类能源设施的核心装置的控制器方块 + .addInfo(TextEnums.tr("Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller")) + // #tr Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01 + // # {\RED}The use of "The Fast-Heater" is prohibited in the dormitories. + // #zh_CN {\RED}禁止在宿舍使用 "热得快"。 + .addInfo(TextEnums.tr("Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01")) + // #tr Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02 + // # Upgrade coils for faster speeds. + // #zh_CN 升级线圈以获得更快的速度. + .addInfo(TextEnums.tr("Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02")) + .addInfo(TextLocalization.Tooltip_GlassTierLimitEnergyHatchTier) + .addSeparator() + .addInfo(TextLocalization.StructureTooComplex) + .addInfo(TextLocalization.BLUE_PRINT_INFO) + .beginStructureBlock(15, 20, 15, false) + .addInputHatch(TextLocalization.textAnyCasing, 1) + .addOutputHatch(TextLocalization.textAnyCasing, 1) + .addInputBus(TextLocalization.textAnyCasing, 2) + .addOutputBus(TextLocalization.textAnyCasing, 2) + .addEnergyHatch(TextLocalization.textAnyCasing, 3) + .toolTipFinisher(TextLocalization.ModName); + return tt; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection aFacing, + int colorIndex, boolean aActive, boolean redstoneLevel) { + if (side == aFacing) { + if (aActive) return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][16], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][16], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW) + .extFacing() + .glow() + .build() }; + } + return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][16] }; + } +} diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaVoidMiner.java b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaVoidMiner.java new file mode 100644 index 00000000..570786f3 --- /dev/null +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaVoidMiner.java @@ -0,0 +1,52 @@ +package com.Nxer.TwistSpaceTechnology.common.machine; + +import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base; + +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class TST_MegaVoidMiner extends GT_TileEntity_VoidMiner_Base { + + // region Class Constructor + public TST_MegaVoidMiner(int aID, String aName, String aNameRegional, int tier) { + super(aID, aName, aNameRegional, tier); + } + + public TST_MegaVoidMiner(String aName, int tier) { + super(aName, tier); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new TST_MegaVoidMiner(this.mName, this.TIER_MULTIPLIER); + } + // endregion + + // region Processing Logic + + // endregion + + // region Structure + + // endregion + + // region General + + @Override + protected ItemList getCasingBlockItem() { + return null; + } + + @Override + protected Materials getFrameMaterial() { + return null; + } + + @Override + protected int getCasingTextureIndex() { + return 0; + } + +} diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/config/Config.java b/src/main/java/com/Nxer/TwistSpaceTechnology/config/Config.java index c01f9d84..82620fe5 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/config/Config.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/config/Config.java @@ -37,6 +37,7 @@ public class Config { public static final String MegaMacerator = "HouseholdCellFragmentizer"; public static final String HephaestusAtelier = "HephaestusAtelier"; public static final String DeployedNanoCore = "DeployedNanoCore"; + public static final String CoreDeviceOfHumanPowerGenerationFacility = "CoreDeviceOfHumanPowerGenerationFacility"; public static final String SingleBlocks = "SingleBlocks"; public static final String spaceStation="spaceStation"; @@ -260,6 +261,10 @@ public class Config { public static int TickPerProgressing_WirelessMode_DeployedNanoCore = 128; // endregion + // region CoreDeviceOfHumanPowerGenerationFacility + public static boolean Enable_CoreDeviceOfHumanPowerGenerationFacility = true; + // endregion + // region Infinite Air Hatch public static double secondsOfInfiniteAirHatchFillFull = 1; @@ -276,6 +281,10 @@ public static void synchronizeConfiguration(File configFile) { MAX_PARALLEL_LIMIT = configuration.getInt("MAX_PARALLEL_LIMIT", GENERAL, MAX_PARALLEL_LIMIT, 1, Integer.MAX_VALUE, "Max parallel limit of normal machines."); // endregion + // region CoreDeviceOfHumanPowerGenerationFacility + Enable_CoreDeviceOfHumanPowerGenerationFacility = configuration.getBoolean("Enable_CoreDeviceOfHumanPowerGenerationFacility", CoreDeviceOfHumanPowerGenerationFacility, Enable_CoreDeviceOfHumanPowerGenerationFacility, "Enable Core Device of Human Power Generation Facility."); + // endregion + // region DeployedNanoCore Enable_DeployedNanoCore = configuration.getBoolean("Enable_DeployedNanoCore", DeployedNanoCore, Enable_DeployedNanoCore, "Enable Deployed Nano Core."); TickPerProgressing_WirelessMode_DeployedNanoCore = configuration.getInt("TickPerProgressing_WirelessMode_DeployedNanoCore", DeployedNanoCore, TickPerProgressing_WirelessMode_DeployedNanoCore, 1, 65536, "How many ticks per progressing cost in Wireless mode of Deployed Nano Core. Type: int"); diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java b/src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java index b2094448..e82fb2cb 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/loader/MachineLoader.java @@ -28,6 +28,7 @@ import com.Nxer.TwistSpaceTechnology.common.machine.TST_BiosphereIII; import com.Nxer.TwistSpaceTechnology.common.machine.TST_CleanRoom; import com.Nxer.TwistSpaceTechnology.common.machine.TST_Computer; +import com.Nxer.TwistSpaceTechnology.common.machine.TST_CoreDeviceOfHumanPowerGenerationFacility; import com.Nxer.TwistSpaceTechnology.common.machine.TST_DeployedNanoCore; import com.Nxer.TwistSpaceTechnology.common.machine.TST_EyeOfWood; import com.Nxer.TwistSpaceTechnology.common.machine.TST_HephaestusAtelier; @@ -55,6 +56,7 @@ import com.Nxer.TwistSpaceTechnology.system.DysonSphereProgram.machines.TST_DSPLauncher; import com.Nxer.TwistSpaceTechnology.system.DysonSphereProgram.machines.TST_DSPReceiver; import com.Nxer.TwistSpaceTechnology.system.OreProcess.machines.TST_OreProcessingFactory; +import com.Nxer.TwistSpaceTechnology.util.TextEnums; import com.Nxer.TwistSpaceTechnology.util.TextLocalization; import com.Nxer.TwistSpaceTechnology.util.Utils; @@ -101,6 +103,7 @@ public class MachineLoader { public static ItemStack MegaMacerator; public static ItemStack HephaestusAtelier; public static ItemStack DeployedNanoCore; + public static ItemStack CoreDeviceOfHumanPowerGenerationFacility; // Single Block public static ItemStack InfiniteAirHatch; @@ -380,6 +383,15 @@ public static void loadMachines() { GTCMItemList.DeployedNanoCore.set(DeployedNanoCore); } + // + if (Config.Enable_CoreDeviceOfHumanPowerGenerationFacility) { + CoreDeviceOfHumanPowerGenerationFacility = new TST_CoreDeviceOfHumanPowerGenerationFacility( + 19039, + "NameCoreDeviceOfHumanPowerGenerationFacility", + TextEnums.NameCoreDeviceOfHumanPowerGenerationFacility.toString()).getStackForm(1); + GTCMItemList.CoreDeviceOfHumanPowerGenerationFacility.set(CoreDeviceOfHumanPowerGenerationFacility); + } + // endregion // region Single block Machine diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java index c6ad5230..1a5bc730 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/GTCMMachineRecipePool.java @@ -1855,6 +1855,29 @@ public void loadRecipes() { .addTo(GTCMRecipe.MiracleTopRecipes); } // endregion + + // region CoreDeviceOfHumanPowerGenerationFacility + if (Config.Enable_CoreDeviceOfHumanPowerGenerationFacility) { + GT_Values.RA + .stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(10), + CustomItemList.FluidHeaterUV.get(64), + ItemList.Electric_Pump_UV.get(64), + + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 64), + new Object[]{OrePrefixes.circuit.get(Materials.SuperconductorUHV), 32}, + HighEnergyFlowCircuit.get(32), + + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 64) + ) + .fluidInputs(new FluidStack(solderPlasma, 144*64)) + .itemOutputs(GTCMItemList.CoreDeviceOfHumanPowerGenerationFacility.get(1)) + .eut(RECIPE_UV) + .duration(20*900) + .addTo(assembler); + } + // endregion } // spotless:on } diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextEnums.java b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextEnums.java index f2b66c14..c892bf39 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextEnums.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextEnums.java @@ -7,10 +7,28 @@ */ public enum TextEnums { + // region General + // #tr AddByTwistSpaceTechnology // # Added by {\GREEN}Twist Space Technology{\GRAY} // #zh_CN 由 {\GREEN}Twist Space Technology{\GRAY} 添加 - AddByTwistSpaceTechnology("AddByTwistSpaceTechnology"); + AddByTwistSpaceTechnology("AddByTwistSpaceTechnology"), + SpeedMultiplier("MachineInfoData.SpeedMultiplier"), + Parallels("MachineInfoData.Parallels"), + EuModifier("MachineInfoData.EuModifier"), + GlassTier("MachineInfoData.GlassTier"), + + // endregion + + // region Core Device of Human Power Generation Facility + + // #tr NameCoreDeviceOfHumanPowerGenerationFacility + // # Core Device of Human Power Generation Facility + // #zh_CN 人类能源设施的核心装置 + NameCoreDeviceOfHumanPowerGenerationFacility("NameCoreDeviceOfHumanPowerGenerationFacility") + // endregion + + ; public static String tr(String key) { return translateToLocalFormatted(key); diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java index c3738265..eb58d322 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/util/TextLocalization.java @@ -8,7 +8,8 @@ // spotless:off /** - * See This PR: Use a preprocessor to help complete the creation of language files + * Use {@link com.Nxer.TwistSpaceTechnology.util.TextEnums} + *

See This PR: Use a preprocessor to help complete the creation of language files */ @Deprecated public class TextLocalization { diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/util/enums/TierName.java b/src/main/java/com/Nxer/TwistSpaceTechnology/util/enums/TierName.java new file mode 100644 index 00000000..73bf79b8 --- /dev/null +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/util/enums/TierName.java @@ -0,0 +1,13 @@ +package com.Nxer.TwistSpaceTechnology.util.enums; + +public class TierName { + + public static final String[] VoltageName = { "ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", + "UIV", "UMV", "UXV", "MAX", "ERROR" }; + + public static String getVoltageName(int tier) { + if (tier < 0) throw new IllegalArgumentException("tier < 0"); + if (tier >= VoltageName.length) return "ERROR"; + return VoltageName[tier]; + } +} diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang index ac62e1ae..fb89a9ef 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang @@ -843,3 +843,8 @@ BufferedEnergyHatch.Tooltips.01=Buffered Energy Injector for Multiblocks BufferedEnergyHatch.Tooltips.02=Accepts up to 2 Amps Slots=Slots AddByTwistSpaceTechnology=Added by §aTwist Space Technology§7 +NameCoreDeviceOfHumanPowerGenerationFacility=Core Device of Human Power Generation Facility +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_MachineType=Fluid Heater +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller=Controller block for the Core Device of Human Power Generation Facility +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01=§cThe use of "The Fast-Heater" is prohibited in the dormitories. +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02=Upgrade coils for faster speeds. diff --git a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang index 66c2e5b4..d08651cd 100644 --- a/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang +++ b/src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang @@ -843,3 +843,8 @@ BufferedEnergyHatch.Tooltips.01=为多方块机器提供更高缓存的能源输 BufferedEnergyHatch.Tooltips.02=最大输入2安 Slots=格 AddByTwistSpaceTechnology=由 §aTwist Space Technology§7 添加 +NameCoreDeviceOfHumanPowerGenerationFacility=人类能源设施的核心装置 +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_MachineType=流体加热器 +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller=人类能源设施的核心装置的控制器方块 +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01=§c禁止在宿舍使用 "热得快"。 +Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02=升级线圈以获得更快的速度. From dcb4e696eeab841e04e7b5b0812a28d5af87f230 Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Mon, 11 Mar 2024 17:53:32 +0800 Subject: [PATCH 4/6] nerf nq line ICD recipes --- .../IntensifyChemicalDistorterRecipePool.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java index bc6c18ab..7439e89a 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java @@ -894,7 +894,7 @@ public void loadRecipes() { MyMaterial.wasteLiquid.getFluidOrGas(1000*160) ) .specialValue(11700) - .eut(RECIPE_LuV) + .eut(RECIPE_ZPM) .duration(20 * 1425) .addTo(ICD); @@ -918,7 +918,7 @@ public void loadRecipes() { MyMaterial.wasteLiquid.getFluidOrGas(1000*60) ) .specialValue(11700) - .eut(RECIPE_LuV * 2) + .eut(RECIPE_ZPM) .duration(20 * 228) .addTo(ICD); @@ -970,7 +970,7 @@ public void loadRecipes() { MyMaterial.wasteLiquid.getFluidOrGas(1000*160) ) .specialValue(12600) - .eut(RECIPE_LuV) + .eut(RECIPE_UV) .duration(20 * 200) .addTo(ICD); @@ -994,7 +994,7 @@ public void loadRecipes() { MyMaterial.wasteLiquid.getFluidOrGas(1000*60) ) .specialValue(12600) - .eut(RECIPE_LuV * 2) + .eut(RECIPE_UV) .duration(20 * 50) .addTo(ICD); @@ -1017,7 +1017,7 @@ public void loadRecipes() { Materials.Oxygen.getGas(1000*276) ) .specialValue(12600) - .eut(RECIPE_ZPM) + .eut(RECIPE_UV) .duration(20 * 8) .addTo(ICD); From e9cd07ea43ed988dcbbb733152c24c97a72296bc Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Mon, 11 Mar 2024 18:13:32 +0800 Subject: [PATCH 5/6] adjust nq line ICD recipes --- .../machineRecipe/IntensifyChemicalDistorterRecipePool.java | 6 +++--- .../system/DysonSphereProgram/logic/DSP_DataCell.java | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java index 7439e89a..f171046d 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java @@ -971,7 +971,7 @@ public void loadRecipes() { ) .specialValue(12600) .eut(RECIPE_UV) - .duration(20 * 200) + .duration(2 * 1425) .addTo(ICD); // Enriched Naquadah @@ -995,7 +995,7 @@ public void loadRecipes() { ) .specialValue(12600) .eut(RECIPE_UV) - .duration(20 * 50) + .duration(2 * 228) .addTo(ICD); // Naquadria @@ -1018,7 +1018,7 @@ public void loadRecipes() { ) .specialValue(12600) .eut(RECIPE_UV) - .duration(20 * 8) + .duration(2 * 100) .addTo(ICD); // endregion diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/system/DysonSphereProgram/logic/DSP_DataCell.java b/src/main/java/com/Nxer/TwistSpaceTechnology/system/DysonSphereProgram/logic/DSP_DataCell.java index 669e7405..3ae2588e 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/system/DysonSphereProgram/logic/DSP_DataCell.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/system/DysonSphereProgram/logic/DSP_DataCell.java @@ -128,7 +128,6 @@ public boolean tryDecreaseUsedPowerPoint(long amount){ * @return True means success;

False means nothing happened, request failed.

*/ public boolean tryUsePowerPoint(long amount){ - // TODO add Big Integer calculation if (this.canUsePowerPoint(amount)){ markDataDirty(); this.markDirty(); From 484bdf872801490f38239edbef0d282a95976a73 Mon Sep 17 00:00:00 2001 From: Nxer <306803661@qq.com> Date: Mon, 11 Mar 2024 18:19:12 +0800 Subject: [PATCH 6/6] adjust again --- .../machineRecipe/IntensifyChemicalDistorterRecipePool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java index f171046d..ac55d8a8 100644 --- a/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java +++ b/src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/IntensifyChemicalDistorterRecipePool.java @@ -951,7 +951,7 @@ public void loadRecipes() { .itemInputs( copyAmount(0, Materials.Gold.getNanite(1)), setStackSize(MyMaterial.naquadahEarth.get(OrePrefixes.dust,1), 480), - setStackSize(Materials.Sodium.getDust(1), 1128) + setStackSize(Materials.Sodium.getDust(1), 112) ) .fluidInputs(Materials.Fluorine.getGas(1000*800)) .itemOutputs( @@ -980,7 +980,7 @@ public void loadRecipes() { .itemInputs( copyAmount(0, Materials.Gold.getNanite(1)), setStackSize(MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust,1), 220), - setStackSize(Materials.Sulfur.getDust(1), 102) + setStackSize(Materials.Sulfur.getDust(1), 10) ) .fluidInputs(Materials.Oxygen.getGas(1000*288)) .itemOutputs( @@ -1004,7 +1004,7 @@ public void loadRecipes() { .itemInputs( copyAmount(0, Materials.Gold.getNanite(1)), setStackSize(MyMaterial.naquadriaEarth.get(OrePrefixes.dust,1), 100), - setStackSize(Materials.Phosphorus.getDust(1), 95) + setStackSize(Materials.Phosphorus.getDust(1), 9) ) .itemOutputs( MyMaterial.enrichedNaquadahEarth.get(OrePrefixes.dust, 50),