aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/kekztech/GTRecipe.java1
-rw-r--r--src/main/java/kekztech/KekzCore.java2
-rw-r--r--src/main/java/reactor/items/HeatExchanger.java2
-rw-r--r--src/main/java/reactor/items/HeatVent.java63
-rw-r--r--src/main/java/tileentities/GTMTE_SOFuelCellMK1.java47
-rw-r--r--src/main/java/tileentities/GTMTE_SOFuelCellMK2.java47
-rw-r--r--src/main/java/util/Util.java (renamed from src/main/java/kekztech/Util.java)41
-rw-r--r--src/main/java/util/Vector3i.java32
-rw-r--r--src/main/java/util/Vector3ic.java8
9 files changed, 125 insertions, 118 deletions
diff --git a/src/main/java/kekztech/GTRecipe.java b/src/main/java/kekztech/GTRecipe.java
index 4b287499f5..2add4d3c0e 100644
--- a/src/main/java/kekztech/GTRecipe.java
+++ b/src/main/java/kekztech/GTRecipe.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import util.Util;
public class GTRecipe {
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 2eda746852..59f7ab4df3 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -6,7 +6,6 @@ import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -22,6 +21,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import tileentities.GTMTE_ModularNuclearReactor;
import tileentities.GTMTE_SOFuelCellMK1;
import tileentities.GTMTE_SOFuelCellMK2;
+import util.Util;
@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION,
dependencies = "required-after:IC2; "
diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java
index 33825b7ac6..48ca7d9fa5 100644
--- a/src/main/java/reactor/items/HeatExchanger.java
+++ b/src/main/java/reactor/items/HeatExchanger.java
@@ -4,8 +4,8 @@ import items.MetaItem_CraftingComponent;
import items.MetaItem_ReactorComponent;
import kekztech.GTRecipe;
import kekztech.Items;
-import kekztech.Util;
import net.minecraftforge.fluids.FluidRegistry;
+import util.Util;
public class HeatExchanger {
diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java
index 670efaeb86..8743876a78 100644
--- a/src/main/java/reactor/items/HeatVent.java
+++ b/src/main/java/reactor/items/HeatVent.java
@@ -1,11 +1,6 @@
package reactor.items;
-import items.MetaItem_CraftingComponent;
-import items.MetaItem_ReactorComponent;
import kekztech.GTRecipe;
-import kekztech.Items;
-import kekztech.Util;
-import net.minecraftforge.fluids.FluidRegistry;
public class HeatVent {
@@ -49,63 +44,7 @@ public class HeatVent {
};
public static final GTRecipe[] RECIPE = {
- // Heat Vents
- new GTRecipe().setDuration(200).setEUPerTick(120)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 2))
- // MV Motor
- .addInputItem(Util.getStackofAmountFromOreDict("rotorSteel", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDoubleSteel", 2))
- .addInputItem(Util.getStackofAmountFromOreDict("screwSteel", 8))
- .addInputItem(Util.getStackofAmountFromOreDict("circuitGood", 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.copper", 144))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1HeatVent.getMetaID())),
- new GTRecipe().setDuration(400).setEUPerTick(480)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 2))
- // HV Motor
- .addInputItem(Util.getStackofAmountFromOreDict("rotorAluminium", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDoubleAluminium", 2))
- .addInputItem(Util.getStackofAmountFromOreDict("screwAluminium", 8))
- .addInputItem(Util.getStackofAmountFromOreDict("circuitAdvanced", 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.silver", 144))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2HeatVent.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(7680)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 2))
- // EV Motor
- .addInputItem(Util.getStackofAmountFromOreDict("rotorTungstenSteel", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDoubleTungstenSteel", 2))
- .addInputItem(Util.getStackofAmountFromOreDict("screwTungsten", 8))
- .addInputItem(Util.getStackofAmountFromOreDict("circuitData", 1))
- .addInputFluid(FluidRegistry.getFluidStack("molten.gallium", 288))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T3HeatVent.getMetaID())),
- new GTRecipe().setDuration(400).setEUPerTick(30720)
- .addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.DiamondHeatPipe.getMetaID(), 2))
- // LuV Motor
- .addInputItem(Util.getStackofAmountFromOreDict("rotorHSSS", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("frameGTHSSS", 1))
- .addInputItem(Util.getStackofAmountFromOreDict("plateDoubleIridium", 6))
- .addInputItem(Util.getStackofAmountFromOreDict("screwOsmiridium", 24))
- .addInputItem(Util.getStackofAmountFromOreDict("circuitMaster", 1))
- .addInputFluid(FluidRegistry.getFluidStack("lubricant", 1000))
- .addInputFluid(FluidRegistry.getFluidStack("molten.gallium", 1152))
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T4HeatVent.getMetaID())),
- // Component Heat Vents
- new GTRecipe().setDuration(200).setEUPerTick(120)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1ComponentHeatVent.getMetaID())),
- new GTRecipe().setDuration(400).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2ComponentHeatVent.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T3ComponentHeatVent.getMetaID())),
- new GTRecipe().setDuration(1600).setEUPerTick(30720)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T4ComponentHeatVent.getMetaID())),
- // OC Heat Vents
- new GTRecipe().setDuration(200).setEUPerTick(120)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1OverclockedHeatVent.getMetaID())),
- new GTRecipe().setDuration(400).setEUPerTick(480)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2OverclockedHeatVent.getMetaID())),
- new GTRecipe().setDuration(800).setEUPerTick(7680)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T3OverclockedHeatVent.getMetaID())),
- new GTRecipe().setDuration(1600).setEUPerTick(30720)
- .addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T4OverclockedHeatVent.getMetaID())),
+
};
}
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
index 522da09b8f..74e95d2933 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK1.java
@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import org.joml.Vector3i;
-import org.joml.Vector3ic;
-
import blocks.Block_YSZUnit;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
@@ -20,13 +17,14 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
-import kekztech.Util;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
+import util.Vector3i;
+import util.Vector3ic;
public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
@@ -142,6 +140,41 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
return false;
}
+ public Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) {
+ final Vector3i offset = new Vector3i();
+
+ // either direction on z-axis
+ if(forgeDirection.x() == 0 && forgeDirection.z() == -1) {
+ offset.x = x;
+ offset.y = y;
+ offset.z = z;
+ }
+ if(forgeDirection.x() == 0 && forgeDirection.z() == 1) {
+ offset.x = -x;
+ offset.y = y;
+ offset.z = -z;
+ }
+ // either direction on x-axis
+ if(forgeDirection.x() == -1 && forgeDirection.z() == 0) {
+ offset.x = z;
+ offset.y = y;
+ offset.z = -x;
+ }
+ if(forgeDirection.x() == 1 && forgeDirection.z() == 0) {
+ offset.x = -z;
+ offset.y = y;
+ offset.z = x;
+ }
+ // either direction on y-axis
+ if(forgeDirection.y() == -1) {
+ offset.x = x;
+ offset.y = z;
+ offset.z = y;
+ }
+
+ return offset;
+ }
+
@Override
public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {
// Figure out the vector for the direction the back face of the controller is facing
@@ -161,7 +194,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
}
// Get next TE
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, 0);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, 0);
IGregTechTileEntity currentTE =
thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());
@@ -187,7 +220,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
for(int X = -1; X <= 1; X++) {
for(int Y = -1; Y <= 1; Y++) {
for(int Z = -1; Z >= -3; Z--) {
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, Z);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);
if(X == 0 && Y == 0) {
if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
.equals(Block_YSZUnit.getInstance().getUnlocalizedName())) {
@@ -229,7 +262,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_MultiBlockBase {
for(int X = -1; X <= 1; X++) {
for(int Y = -1; Y <= 1; Y++) {
// Get next TE
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, -4);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, -4);
IGregTechTileEntity currentTE =
thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
diff --git a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
index c645ce464a..1b1c36a124 100644
--- a/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/tileentities/GTMTE_SOFuelCellMK2.java
@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import org.joml.Vector3i;
-import org.joml.Vector3ic;
-
import blocks.Block_GDCUnit;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
@@ -20,13 +17,14 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import kekztech.Util;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import util.Vector3i;
+import util.Vector3ic;
public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
@@ -141,6 +139,41 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
return false;
}
+ public Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) {
+ final Vector3i offset = new Vector3i();
+
+ // either direction on z-axis
+ if(forgeDirection.x() == 0 && forgeDirection.z() == -1) {
+ offset.x = x;
+ offset.y = y;
+ offset.z = z;
+ }
+ if(forgeDirection.x() == 0 && forgeDirection.z() == 1) {
+ offset.x = -x;
+ offset.y = y;
+ offset.z = -z;
+ }
+ // either direction on x-axis
+ if(forgeDirection.x() == -1 && forgeDirection.z() == 0) {
+ offset.x = z;
+ offset.y = y;
+ offset.z = -x;
+ }
+ if(forgeDirection.x() == 1 && forgeDirection.z() == 0) {
+ offset.x = -z;
+ offset.y = y;
+ offset.z = x;
+ }
+ // either direction on y-axis
+ if(forgeDirection.y() == -1) {
+ offset.x = x;
+ offset.y = z;
+ offset.z = y;
+ }
+
+ return offset;
+ }
+
@Override
public boolean checkMachine(IGregTechTileEntity thisController, ItemStack guiSlotItem) {
// Figure out the vector for the direction the back face of the controller is facing
@@ -160,7 +193,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
}
// Get next TE
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, 0);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, 0);
IGregTechTileEntity currentTE =
thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());
@@ -186,7 +219,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
for(int X = -1; X <= 1; X++) {
for(int Y = -1; Y <= 1; Y++) {
for(int Z = -1; Z >= -3; Z--) {
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, Z);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, Z);
if(X == 0 && Y == 0) {
if(!thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName()
.equals(Block_GDCUnit.getInstance().getUnlocalizedName())) {
@@ -228,7 +261,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_MultiBlockBase {
for(int X = -1; X <= 1; X++) {
for(int Y = -1; Y <= 1; Y++) {
// Get next TE
- final Vector3ic offset = Util.rotateOffsetVector(forgeDirection, X, Y, -4);
+ final Vector3ic offset = rotateOffsetVector(forgeDirection, X, Y, -4);
IGregTechTileEntity currentTE =
thisController.getIGregTechTileEntityOffset(offset.x(), offset.y(), offset.z());// x, y ,z
diff --git a/src/main/java/kekztech/Util.java b/src/main/java/util/Util.java
index 78dee44f75..76232d6e47 100644
--- a/src/main/java/kekztech/Util.java
+++ b/src/main/java/util/Util.java
@@ -1,12 +1,9 @@
-package kekztech;
+package util;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.joml.Vector3i;
-import org.joml.Vector3ic;
-
import items.ErrorItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -14,42 +11,6 @@ import net.minecraftforge.oredict.OreDictionary;
public class Util {
- public static Vector3ic rotateOffsetVector(Vector3ic forgeDirection, int x, int y, int z) {
- final Vector3i offset = new Vector3i();
-
- // either direction on z-axis
- if(forgeDirection.x() == 0 && forgeDirection.z() == -1) {
- offset.x = x;
- offset.y = y;
- offset.z = z;
- }
- if(forgeDirection.x() == 0 && forgeDirection.z() == 1) {
- offset.x = -x;
- offset.y = y;
- offset.z = -z;
- }
- // either direction on x-axis
- if(forgeDirection.x() == -1 && forgeDirection.z() == 0) {
- offset.x = z;
- offset.y = y;
- offset.z = -x;
- }
- if(forgeDirection.x() == 1 && forgeDirection.z() == 0) {
- offset.x = -z;
- offset.y = y;
- offset.z = x;
- }
- // either direction on y-axis
- if(forgeDirection.y() == -1) {
- offset.x = x;
- offset.y = z;
- offset.z = y;
- }
-
- return offset;
- }
-
- @Deprecated
public static ItemStack getStackofAmountFromOreDict(String oredictName, final int amount){
final ArrayList<ItemStack> list = OreDictionary.getOres(oredictName);
if(!list.isEmpty()) {
diff --git a/src/main/java/util/Vector3i.java b/src/main/java/util/Vector3i.java
new file mode 100644
index 0000000000..ff2b017551
--- /dev/null
+++ b/src/main/java/util/Vector3i.java
@@ -0,0 +1,32 @@
+package util;
+
+public class Vector3i implements Vector3ic {
+
+ public int x, y, z;
+
+ public Vector3i() {
+ x = 1;
+ y = 1;
+ z = 1;
+ }
+
+ public Vector3i(int x, int y, int z) {
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ }
+
+ public int x() {
+ return x;
+ }
+
+ public int y() {
+ return y;
+ }
+
+ public int z() {
+ return z;
+ }
+
+
+}
diff --git a/src/main/java/util/Vector3ic.java b/src/main/java/util/Vector3ic.java
new file mode 100644
index 0000000000..102418bc98
--- /dev/null
+++ b/src/main/java/util/Vector3ic.java
@@ -0,0 +1,8 @@
+package util;
+
+public interface Vector3ic {
+
+ public int x();
+ public int y();
+ public int z();
+}
generated by cgit (git 2.46.0) at 2025-03-09 12:48:57 +0000