Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Commit e2d1aee

Browse files
committed
+ Added world accelerators from GT:NewHorizons.
1 parent ae8d09f commit e2d1aee

12 files changed

+489
-3
lines changed

src/Java/gtPlusPlus/GTplusplus.java

+11-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
3838
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
3939
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
40+
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
4041
import net.minecraft.launchwrapper.Launch;
4142
import net.minecraftforge.common.config.Configuration;
4243

@@ -111,6 +112,8 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) {
111112
true, "Diesel egines with different internals, they consume less fuel overall.");
112113
CORE.configSwitches.enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines",
113114
"gregtech", true, "These may be overpowered, Consult a local geologist.");
115+
CORE.configSwitches.enableMachine_WorldAccelerators = config.getBoolean("enableMachineWorldAccelerators",
116+
"gregtech", true, "These allow boosting Block/TileEntity Tick times [OP].");
114117

115118
// Multi machines
116119
CORE.configSwitches.enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter",
@@ -158,6 +161,13 @@ public static void handleConfigFile(final FMLPreInitializationEvent event) {
158161
//Biomes
159162
CORE.DARKBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
160163

164+
//Blacklisted Accelerator TileEntities
165+
GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = config.getStringList(
166+
"BlacklistedTileEntiyClassNames", "gregtech",
167+
GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames,
168+
"The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator");
169+
170+
161171
config.save();
162172
}
163173

@@ -169,8 +179,7 @@ public static void loadTextures() {
169179
Utils.LOG_WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
170180

171181
// Blocks
172-
Utils.LOG_WARNING(
173-
"Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
182+
Utils.LOG_WARNING("Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
174183
}
175184

176185
// Pre-Init

src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ public static void registerGregtechMachines() {
7171
GregtechIndustrialTreeFarm.run();
7272
GregtechIndustrialSifter.run();
7373
GregtechSimpleWasher.run();
74+
75+
//New Horizons Content
76+
NewHorizonsAccelerator.run();
7477
}
7578

7679
}

src/Java/gtPlusPlus/core/lib/CORE.java

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public static class configSwitches {
127127
public static boolean enableMachine_FluidTanks = true;
128128
public static boolean enableMachine_RocketEngines = true;
129129
public static boolean enableMachine_GeothermalEngines = true;
130+
public static boolean enableMachine_WorldAccelerators = true;
130131
public static boolean enableCustom_Pipes = true;
131132
public static boolean enableCustom_Cables = true;
132133

src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,19 @@ public enum GregtechItemList implements GregtechItemContainer {
180180
Old_Circuit_Board_Basic, Old_Circuit_Board_Advanced, Old_Circuit_Board_Elite,
181181
Old_Circuit_Parts_Crystal_Chip_Elite, Old_Circuit_Parts_Crystal_Chip_Master, Old_Circuit_Parts_Advanced,
182182
Old_Circuit_Parts_Wiring_Basic, Old_Circuit_Parts_Wiring_Advanced, Old_Circuit_Parts_Wiring_Elite,
183-
Old_Empty_Board_Basic, Old_Empty_Board_Elite, TESTITEM
183+
Old_Empty_Board_Basic, Old_Empty_Board_Elite,
184+
185+
186+
//Debug
187+
TESTITEM,
188+
189+
//Tick Accelerators from GTNH
190+
AcceleratorLV, AcceleratorMV, AcceleratorHV, AcceleratorEV,
191+
AcceleratorIV, AcceleratorLuV, AcceleratorZPM, AcceleratorUV
192+
193+
194+
195+
184196
;
185197

186198
public static final GregtechItemList[]

0 commit comments

Comments
 (0)