Skip to content

Commit

Permalink
Merge pull request #312 from Nxer/main
Browse files Browse the repository at this point in the history
sync from main
  • Loading branch information
Nxer authored Mar 16, 2024
2 parents 7594109 + 1c8eb58 commit 17f369e
Show file tree
Hide file tree
Showing 9 changed files with 199 additions and 257 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,13 @@ public final class ValueEnum {
public static final int TickPerProgressing_WirelessMode_DeployedNanoCore = Config.TickPerProgressing_WirelessMode_DeployedNanoCore;
// endregion

// region Starcore Miner
public static final byte HeightValueLimit_StarcoreMiner = Config.HeightValueLimit_StarcoreMiner;
public static final int StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner = Config.StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner;
public static final int AmountOfOreStackPerMining_StarcoreMiner = Config.AmountOfOreStackPerMining_StarcoreMiner;
public static final int Eut_StarcoreMiner = Config.Eut_StarcoreMiner;
public static final int DurationPerMining_StarcoreMiner = Config.DurationPerMining_StarcoreMiner;

// endregion

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import static com.Nxer.TwistSpaceTechnology.util.Utils.filterValidMTEs;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;

import javax.annotation.Nonnull;

Expand Down Expand Up @@ -192,7 +190,7 @@ public ArrayList<ItemStack> getStoredInputsWithoutDualInputHatch() {

/**
* Forced get all input items, include all Dual Input Hatch slot.
*
*
* @return The items list.
*/
public ArrayList<ItemStack> getStoredInputsNoSeparation() {
Expand All @@ -205,10 +203,21 @@ public ArrayList<ItemStack> getStoredInputsNoSeparation() {
ItemStack[] items = inventoryIterator.next()
.getItemInputs();
if (items == null || items.length == 0) continue;
// rList.addAll(Arrays.asList(Arrays.stream(items).filter(Objects::nonNull).toArray(ItemStack[]::new)));
Arrays.stream(items)
.filter(Objects::nonNull)
.forEach(rList::add);

for (int i = 0; i < items.length; i++) {
if (items[i] != null) {
rList.add(items[i]);
}
}

// for (ItemStack i : items) {
// if (i == null) continue;
// rList.add(i);
// }

// Arrays.stream(items)
// .filter(Objects::nonNull)
// .forEach(rList::add);
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/Nxer/TwistSpaceTechnology/config/Config.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.Nxer.TwistSpaceTechnology.config;

import static com.Nxer.TwistSpaceTechnology.util.enums.TierEU.RECIPE_UHV;
import static com.Nxer.TwistSpaceTechnology.util.enums.TierEU.RECIPE_UIV;
import static com.Nxer.TwistSpaceTechnology.util.enums.TierEU.RECIPE_UMV;

import java.io.File;
Expand Down Expand Up @@ -270,6 +271,11 @@ public class Config {

// region StarcoreMiner
public static boolean Enable_StarcoreMiner = true;
public static byte HeightValueLimit_StarcoreMiner = 20;
public static int StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner = 131072;
public static int AmountOfOreStackPerMining_StarcoreMiner = 32;
public static int Eut_StarcoreMiner = (int) RECIPE_UIV;
public static int DurationPerMining_StarcoreMiner = 128;
// endregion

// region Infinite Air Hatch
Expand All @@ -290,6 +296,12 @@ public static void synchronizeConfiguration(File configFile) {

// region StarcoreMiner
Enable_StarcoreMiner = configuration.getBoolean("Enable_StarcoreMiner", StarcoreMiner, Enable_StarcoreMiner, "Enable Starcore Miner.");
HeightValueLimit_StarcoreMiner = (byte) configuration.getInt("HeightValueLimit_StarcoreMiner", StarcoreMiner, HeightValueLimit_StarcoreMiner, 1, 255, "The height value of Mining Pipe structure of a Starcore Miner need to reach. Type: byte");
StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner = configuration.getInt("StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner", StarcoreMiner, StackSizeOfEveryOreItemStackWhenMining_StarcoreMiner, 1, Integer.MAX_VALUE, "How many ores in one item stack when mining. Type: int");
AmountOfOreStackPerMining_StarcoreMiner = configuration.getInt("AmountOfOreStackPerMining_StarcoreMiner", StarcoreMiner, AmountOfOreStackPerMining_StarcoreMiner, 1, Integer.MAX_VALUE, "How many ore item stacks every mining output. Type: int");
Eut_StarcoreMiner = configuration.getInt("Eut_StarcoreMiner", StarcoreMiner, Eut_StarcoreMiner, 1, Integer.MAX_VALUE, "EU/t when Starcore Miner working. Type: int");
DurationPerMining_StarcoreMiner = configuration.getInt("DurationPerMining_StarcoreMiner", StarcoreMiner, DurationPerMining_StarcoreMiner, 1, Integer.MAX_VALUE, "How many ticks per mining cost. 20 tick = 1 second . Type: int");

// endregion

// region CoreDeviceOfHumanPowerGenerationFacility
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ public void loadRecipes() {
Materials.Bedrockium.getMolten(144 * 9 * 4),
Materials.VibrantAlloy.getMolten(144 * 9 * 145),
Materials.Electrotine.getMolten(144 * 9 * 1215),
Materials.ConductiveIron.getMolten(144 * 9 * 912),
FluidRegistry.getFluidStack("aluminumbrass.molten", 144 * 9 * 1824),
Materials.Aluminium.getMolten(144 * 9 * 1824),
Materials.Alumite.getMolten(144 * 9 * 229),
Materials.Ardite.getMolten(144 * 9 * 304),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
import static com.dreammaster.gthandler.CustomItemList.Transformer_UXV_UMV;
import static com.dreammaster.gthandler.CustomItemList.WiremillUV;
import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.megaMachines;
import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.voidminer;
import static com.github.technus.tectech.thing.CustomItemList.EOH_Infinite_Energy_Casing;
import static com.github.technus.tectech.thing.CustomItemList.EOH_Reinforced_Temporal_Casing;
import static com.github.technus.tectech.thing.CustomItemList.LASERpipe;
Expand Down Expand Up @@ -147,6 +148,9 @@
import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import com.github.technus.tectech.thing.casing.TT_Container_Casings;
import com.gtnewhorizons.gtnhintergalactic.block.IGBlocks;
import com.gtnewhorizons.gtnhintergalactic.item.IGItems;
import com.gtnewhorizons.gtnhintergalactic.item.ItemMiningDrones;

import appeng.items.materials.MaterialType;
import goodgenerator.items.MyMaterial;
Expand Down Expand Up @@ -1900,7 +1904,7 @@ public void loadRecipes() {

// endregion


// region CoreDeviceOfHumanPowerGenerationFacility
if (Config.Enable_CoreDeviceOfHumanPowerGenerationFacility) {
GT_Values.RA
.stdBuilder()
Expand All @@ -1921,6 +1925,43 @@ public void loadRecipes() {
.duration(20 * 900)
.addTo(assembler);
}
// endregion

// region StarcoreMiner
if (Config.Enable_StarcoreMiner) {
GT_Values.RA
.stdBuilder()
.metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Infinity, 1))
.metadata(RESEARCH_TIME, 8 * HOURS)
.itemInputs(
new ItemStack(IGBlocks.SpaceElevatorCasing, 64),
copyAmount(64, voidminer[2]),
new ItemStack(IGItems.MiningDrones, 18, ItemMiningDrones.DroneTiers.UEV.ordinal()),
SpaceWarper.get(18),

ItemList.EnergisedTesseract.get(64),
ItemList.Electric_Motor_UEV.get(64),
ItemList.Field_Generator_UEV.get(48),
ItemList.Sensor_UEV.get(64),

new Object[]{OrePrefixes.circuit.get(Materials.Optical), 64},
HighEnergyFlowCircuit.get(64),
eM_Power.get(64),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 64)
)
.fluidInputs(
new FluidStack(solderPlasma, 144*1024),
Materials.Quantium.getMolten(144*1024),
Materials.UUMatter.getFluid(1000*2048),
MyMaterial.metastableOganesson.getMolten(144*512)
)
.itemOutputs(GTCMItemList.StarcoreMiner.get(1))
.eut(RECIPE_UIV)
.duration(20 * 7200)
.addTo(assemblyLine);

}
// endregion

}
// spotless:on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public enum TextEnums {
NameCoreDeviceOfHumanPowerGenerationFacility("NameCoreDeviceOfHumanPowerGenerationFacility")
// endregion

// endregion

;

public static String tr(String key) {
Expand Down
9 changes: 9 additions & 0 deletions src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -863,3 +863,12 @@ Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller=Controller block for
Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01=§cThe use of "The Fast-Heater" is prohibited in the dormitories.
Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02=Upgrade coils for faster speeds.
NameStarcoreMiner=Starcore Miner
VoidMiner=Void Miner
Tooltip_Starcore_01=§o " Do you sell them ? "
Tooltip_Starcore_02=§o " I'm afraid not. "
Tooltip_Starcore_04=
Tooltip_Starcore_03=§o " But, maybe we could make a deal ? "
Tooltip_Starcore_05=To the depths, to gather for you the deepest riches of the planet.
Tooltip_Starcore_06=Each run produces 32 types of ore, 131072 of each type,
Tooltip_Starcore_07= and takes 6.4s, 31,457,280 EU/t (UIV).
Tooltip_Starcore_08=The mining access portion of the structure needs to extend at least to a height of 20 below.
9 changes: 9 additions & 0 deletions src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -863,3 +863,12 @@ Tooltip_CoreDeviceOfHumanPowerGenerationFacility_Controller=人类能源设施
Tooltip_CoreDeviceOfHumanPowerGenerationFacility_01=§c禁止在宿舍使用 "热得快"。
Tooltip_CoreDeviceOfHumanPowerGenerationFacility_02=升级线圈以获得更快的速度.
NameStarcoreMiner=星核钻机
VoidMiner=虚空采矿场
Tooltip_Starcore_01=§o " Do you sell them ? "
Tooltip_Starcore_02=§o " I'm afraid not. "
Tooltip_Starcore_04=
Tooltip_Starcore_03=§o " But, maybe we could make a deal ? "
Tooltip_Starcore_05=直达深处, 为你采集这个星球最深层的财富.
Tooltip_Starcore_06=每次运行产出 32 种矿石, 每种 131072个,
Tooltip_Starcore_07= 耗时 6.4s, 耗电 31,457,280 EU/t (UIV).
Tooltip_Starcore_08=结构中采矿通道部分需要至少延伸至高度20以下.

0 comments on commit 17f369e

Please sign in to comment.