aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/api
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-02-05 01:40:43 +0900
committerGitHub <noreply@github.com>2023-02-04 17:40:43 +0100
commitbb9da48b9975cb27e3b7c538bff2853a34b36fcd (patch)
tree9de91abf611bf119935df6322e27805cf835fafc /src/main/java/gtPlusPlus/api
parent8792eb5d9b70cbb1dc0b444cfd8524dfb4a0aa0c (diff)
downloadGT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.gz
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.bz2
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.zip
Remove redundant flags (#529)
* Remove CORE.GTNH * Remove LoadedMods.Gregtech * Remove LoadedMods.IndustrialCraft2 * Remove LoadedMods.MiscUtils * Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK * clean * Remove mention to GT versions * Fix assembler mode
Diffstat (limited to 'src/main/java/gtPlusPlus/api')
-rw-r--r--src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java45
1 files changed, 21 insertions, 24 deletions
diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
index dccb7371d5..61e582c7a3 100644
--- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
+++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java
@@ -10,7 +10,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
public class MaterialHelper {
@@ -38,30 +37,28 @@ public class MaterialHelper {
*/
public static boolean generateHexadecuplePipe(Materials aMaterial, String name, String displayName, int aID,
int baseCapacity, int heatCapacity, boolean gasProof) {
- if (Utils.getGregtechVersionAsInt() >= 50930) {
- try {
- Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
- Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
- new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class,
- int.class, boolean.class, int.class });
- if (constructor != null) {
- GT_MetaPipeEntity_Fluid aPipe;
- aPipe = constructor.newInstance(
- aID,
- "GT_Pipe_" + name + "_Hexadecuple",
- "Hexadecuple " + displayName + " Fluid Pipe",
- 1.0F,
- aMaterial,
- baseCapacity,
- heatCapacity,
- gasProof,
- 16);
- return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
- }
+ try {
+ Class<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class;
+ Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor(
+ new Class[] { int.class, String.class, String.class, float.class, Materials.class, int.class,
+ int.class, boolean.class, int.class });
+ if (constructor != null) {
+ GT_MetaPipeEntity_Fluid aPipe;
+ aPipe = constructor.newInstance(
+ aID,
+ "GT_Pipe_" + name + "_Hexadecuple",
+ "Hexadecuple " + displayName + " Fluid Pipe",
+ 1.0F,
+ aMaterial,
+ baseCapacity,
+ heatCapacity,
+ gasProof,
+ 16);
+ return GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L));
+ }
- } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
- | IllegalArgumentException | InvocationTargetException e) {}
- }
+ } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e) {}
return false;
}