aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2023-01-10 18:22:06 +0000
committerGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2023-01-10 18:22:06 +0000
commitba7a094133f4dedc3176836101ee5b31c0b541fe (patch)
treeb1d773580648959d16abd28b902b7c99ca5875cf /src/main/java
parent7193265d8e78ff3f13fe10054fce497037864846 (diff)
downloadGT5-Unofficial-ba7a094133f4dedc3176836101ee5b31c0b541fe.tar.gz
GT5-Unofficial-ba7a094133f4dedc3176836101ee5b31c0b541fe.tar.bz2
GT5-Unofficial-ba7a094133f4dedc3176836101ee5b31c0b541fe.zip
Fully purge useless unused checks/class/block. Refactor block storage.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/TT_Block_SpacetimeCompressionFieldGenerators.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/TT_Block_StabilisationFieldGenerators.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/TT_Block_TimeAccelerationFieldGenerators.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java66
6 files changed, 40 insertions, 63 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index 0c32c0300f..f69a343de7 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -39,14 +39,14 @@ public class ThingsLoader implements Runnable {
TT_Container_Casings.sBlockCasingsBA0 = new GT_Block_CasingsBA0();
TecTech.LOGGER.info("Nikolai's Casing registered");
- TT_Block_SpacetimeCompressionFieldGenerators.SpacetimeCompressionFieldGenerators =
+ TT_Container_Casings.SpacetimeCompressionFieldGenerators =
new SpacetimeCompressionFieldCasing();
TecTech.LOGGER.info("Spacetime Compression Field Casings registered.");
- TT_Block_TimeAccelerationFieldGenerators.TimeAccelerationFieldGenerator = new TimeAccelerationFieldCasing();
+ TT_Container_Casings.TimeAccelerationFieldGenerator = new TimeAccelerationFieldCasing();
TecTech.LOGGER.info("Time Acceleration Field Casings registered.");
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators = new StabilisationFieldCasing();
+ TT_Container_Casings.StabilisationFieldGenerators = new StabilisationFieldCasing();
QuantumGlassBlock.run();
TecTech.LOGGER.info("Quantum Glass registered");
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_SpacetimeCompressionFieldGenerators.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_SpacetimeCompressionFieldGenerators.java
deleted file mode 100644
index d2edebf786..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_SpacetimeCompressionFieldGenerators.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.technus.tectech.thing.casing;
-
-import net.minecraft.block.Block;
-
-public class TT_Block_SpacetimeCompressionFieldGenerators {
- public static Block SpacetimeCompressionFieldGenerators;
-
- private TT_Block_SpacetimeCompressionFieldGenerators() {}
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_StabilisationFieldGenerators.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_StabilisationFieldGenerators.java
deleted file mode 100644
index a3561cf082..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_StabilisationFieldGenerators.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.technus.tectech.thing.casing;
-
-import net.minecraft.block.Block;
-
-public class TT_Block_StabilisationFieldGenerators {
- public static Block StabilisationFieldGenerators;
-
- private TT_Block_StabilisationFieldGenerators() {}
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_TimeAccelerationFieldGenerators.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_TimeAccelerationFieldGenerators.java
deleted file mode 100644
index ecb070aa5c..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Block_TimeAccelerationFieldGenerators.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.technus.tectech.thing.casing;
-
-import net.minecraft.block.Block;
-
-public class TT_Block_TimeAccelerationFieldGenerators {
- public static Block TimeAccelerationFieldGenerator;
-
- private TT_Block_TimeAccelerationFieldGenerators() {}
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
index 97779cd6ba..787db51d1c 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
@@ -12,6 +12,10 @@ public final class TT_Container_Casings {
public static Block sBlockCasingsBA0;
public static Block sBlockCasingsNH;
+ public static Block TimeAccelerationFieldGenerator;
+ public static Block SpacetimeCompressionFieldGenerators;
+ public static Block StabilisationFieldGenerators;
+
// Do NOT delete, it will break. The IDE is a liar.
public static Block eyeOfHarmonyRenderBlock = new EyeOfHarmonyBlock();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index b0b7b2fd2d..5b572b430a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -15,9 +15,9 @@ import static net.minecraft.util.EnumChatFormatting.*;
import appeng.util.ReadableNumberConverter;
import com.github.technus.tectech.recipe.EyeOfHarmonyRecipe;
import com.github.technus.tectech.thing.block.TileEyeOfHarmony;
-import com.github.technus.tectech.thing.casing.TT_Block_SpacetimeCompressionFieldGenerators;
-import com.github.technus.tectech.thing.casing.TT_Block_StabilisationFieldGenerators;
-import com.github.technus.tectech.thing.casing.TT_Block_TimeAccelerationFieldGenerators;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
import com.github.technus.tectech.util.CommonValues;
@@ -1248,45 +1248,45 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
'A',
ofBlocksTiered(
(block, meta) -> block
- == TT_Block_SpacetimeCompressionFieldGenerators
+ == TT_Container_Casings
.SpacetimeCompressionFieldGenerators
? meta
: -1,
ImmutableList.of(
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
0),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
1),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
2),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
3),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
4),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
5),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
6),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
7),
Pair.of(
- TT_Block_SpacetimeCompressionFieldGenerators
+ TT_Container_Casings
.SpacetimeCompressionFieldGenerators,
8)),
-1,
@@ -1296,36 +1296,36 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
'S',
ofBlocksTiered(
(block, meta) ->
- block == TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators
+ block == TT_Container_Casings.StabilisationFieldGenerators
? meta
: -1,
ImmutableList.of(
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
0),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
1),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
2),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
3),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
4),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
5),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
6),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
7),
Pair.of(
- TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+ TT_Container_Casings.StabilisationFieldGenerators,
8)),
-1,
(t, meta) -> t.stabilisationFieldMetadata = meta,
@@ -1336,45 +1336,45 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
'E',
ofBlocksTiered(
(block, meta) -> block
- == TT_Block_TimeAccelerationFieldGenerators
+ == TT_Container_Casings
.TimeAccelerationFieldGenerator
? meta
: -1,
ImmutableList.of(
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
0),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
1),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
2),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
3),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
4),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
5),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
6),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
7),
Pair.of(
- TT_Block_TimeAccelerationFieldGenerators
+ TT_Container_Casings
.TimeAccelerationFieldGenerator,
8)),
-1,
generated by cgit (git 2.46.0) at 2025-03-10 17:43:17 +0000