diff options
36 files changed, 128 insertions, 122 deletions
diff --git a/.classpath b/.classpath index 49638592b2..956388a675 100644 --- a/.classpath +++ b/.classpath @@ -9,6 +9,5 @@ <classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/> <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/> <classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/> - <classpathentry kind="lib" path="libs/joml-jdk8-1.9.16.jar" sourcepath="libs/JOML-1.9.16.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock Binary files differindex 61bc620fff..64a848656e 100644 --- a/.gradle/2.0/taskArtifacts/cache.properties.lock +++ b/.gradle/2.0/taskArtifacts/cache.properties.lock diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin Binary files differindex 05ddaaf444..48c630deaf 100644 --- a/.gradle/2.0/taskArtifacts/fileHashes.bin +++ b/.gradle/2.0/taskArtifacts/fileHashes.bin diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin Binary files differindex 97416717d2..eedafbeb8e 100644 --- a/.gradle/2.0/taskArtifacts/fileSnapshots.bin +++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin Binary files differindex b6c1e22668..1a18cd63f4 100644 --- a/.gradle/2.0/taskArtifacts/outputFileStates.bin +++ b/.gradle/2.0/taskArtifacts/outputFileStates.bin diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin Binary files differindex 3b2f4a9f40..e61afc5a45 100644 --- a/.gradle/2.0/taskArtifacts/taskArtifacts.bin +++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin diff --git a/config/IC2.ini b/config/IC2.ini index 34fe6da562..ede344d5b8 100644 --- a/config/IC2.ini +++ b/config/IC2.ini @@ -1,5 +1,5 @@ ; ic2 general config
-; created Jul 1, 2019 9:51:39 PM
+; created Jul 2, 2019 12:59:46 AM
;---
[worldgen]
diff --git a/config/splash.properties b/config/splash.properties index 21e90a2892..511a10ba56 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Mon Jul 01 21:51:29 CEST 2019 +#Tue Jul 02 00:59:32 CEST 2019 logoTexture=textures/gui/title/mojang.png background=0xFFFFFF font=0x0 diff --git a/logs/2019-07-01-1.log.gz b/logs/2019-07-01-1.log.gz Binary files differindex b1ce1ecd1a..43c1f5c16f 100644 --- a/logs/2019-07-01-1.log.gz +++ b/logs/2019-07-01-1.log.gz diff --git a/logs/2019-07-01-2.log.gz b/logs/2019-07-01-2.log.gz Binary files differindex a9ef2b8eed..f22aba1013 100644 --- a/logs/2019-07-01-2.log.gz +++ b/logs/2019-07-01-2.log.gz diff --git a/logs/2019-07-01-3.log.gz b/logs/2019-07-01-3.log.gz Binary files differindex 111fe9811c..f37dd6c7f3 100644 --- a/logs/2019-07-01-3.log.gz +++ b/logs/2019-07-01-3.log.gz diff --git a/logs/2019-07-01-4.log.gz b/logs/2019-07-01-4.log.gz Binary files differindex 43c1f5c16f..63f7628ca6 100644 --- a/logs/2019-07-01-4.log.gz +++ b/logs/2019-07-01-4.log.gz diff --git a/logs/2019-07-01-5.log.gz b/logs/2019-07-01-5.log.gz Binary files differindex f22aba1013..abc1f0b34b 100644 --- a/logs/2019-07-01-5.log.gz +++ b/logs/2019-07-01-5.log.gz diff --git a/logs/2019-07-01-6.log.gz b/logs/2019-07-01-6.log.gz Binary files differindex f37dd6c7f3..bf523bf526 100644 --- a/logs/2019-07-01-6.log.gz +++ b/logs/2019-07-01-6.log.gz diff --git a/logs/2019-07-01-7.log.gz b/logs/2019-07-01-7.log.gz Binary files differindex 63f7628ca6..c1d987b573 100644 --- a/logs/2019-07-01-7.log.gz +++ b/logs/2019-07-01-7.log.gz diff --git a/logs/2019-07-02-1.log.gz b/logs/2019-07-02-1.log.gz Binary files differnew file mode 100644 index 0000000000..1bf9c843e9 --- /dev/null +++ b/logs/2019-07-02-1.log.gz diff --git a/saves/NEI/local/New World/NEI.dat b/saves/NEI/local/New World/NEI.dat Binary files differindex a175c5f790..23b37443e4 100644 --- a/saves/NEI/local/New World/NEI.dat +++ b/saves/NEI/local/New World/NEI.dat diff --git a/saves/New World/DIM-1/data/villages.dat b/saves/New World/DIM-1/data/villages.dat Binary files differindex 2ceba3a031..0ba4f2cee3 100644 --- a/saves/New World/DIM-1/data/villages.dat +++ b/saves/New World/DIM-1/data/villages.dat diff --git a/saves/New World/DIM1/data/villages.dat b/saves/New World/DIM1/data/villages.dat Binary files differindex 2ceba3a031..0ba4f2cee3 100644 --- a/saves/New World/DIM1/data/villages.dat +++ b/saves/New World/DIM1/data/villages.dat diff --git a/saves/New World/data/villages.dat b/saves/New World/data/villages.dat Binary files differindex 2ceba3a031..0ba4f2cee3 100644 --- a/saves/New World/data/villages.dat +++ b/saves/New World/data/villages.dat diff --git a/saves/New World/level.dat b/saves/New World/level.dat Binary files differindex 9874c1e8ea..6ab4b7fba3 100644 --- a/saves/New World/level.dat +++ b/saves/New World/level.dat diff --git a/saves/New World/level.dat_old b/saves/New World/level.dat_old Binary files differindex 969f2be759..342e6d40fe 100644 --- a/saves/New World/level.dat_old +++ b/saves/New World/level.dat_old diff --git a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat Binary files differindex 737a8aecf4..a61914b7ba 100644 --- a/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat +++ b/saves/New World/playerdata/ddc68fe4-0789-360b-a837-3dcbb936da65.dat diff --git a/saves/New World/region/r.0.-1.mca b/saves/New World/region/r.0.-1.mca Binary files differindex bb45a59b3f..528d4d3c9d 100644 --- a/saves/New World/region/r.0.-1.mca +++ b/saves/New World/region/r.0.-1.mca diff --git a/saves/New World/region/r.0.0.mca b/saves/New World/region/r.0.0.mca Binary files differindex 61ed32fa61..36568aa9b2 100644 --- a/saves/New World/region/r.0.0.mca +++ b/saves/New World/region/r.0.0.mca diff --git a/saves/New World/session.lock b/saves/New World/session.lock Binary files differindex 878b37a530..3d53a3c426 100644 --- a/saves/New World/session.lock +++ b/saves/New World/session.lock diff --git a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json b/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json index bea6b63000..b2854fe622 100644 --- a/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json +++ b/saves/New World/stats/ddc68fe4-0789-360b-a837-3dcbb936da65.json @@ -1 +1 @@ -{"stat.flyOneCm":89340,"stat.walkOneCm":327994,"stat.jump":382,"stat.useItem.323":8,"stat.playOneMinute":635974,"achievement.openInventory":260,"stat.climbOneCm":2320,"stat.leaveGame":1,"stat.useItem.3":43,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}}
\ No newline at end of file +{"stat.flyOneCm":98449,"stat.walkOneCm":341502,"stat.jump":413,"stat.useItem.323":8,"stat.playOneMinute":640171,"achievement.openInventory":266,"stat.climbOneCm":2320,"stat.leaveGame":1,"stat.useItem.3":47,"achievement.exploreAllBiomes":{"value":0,"progress":["Swampland"]}}
\ No newline at end of file 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(); +} |