aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/GT_Mod.java37
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java15
3 files changed, 55 insertions, 7 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 9fc77ef626..9798dc2d7e 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -63,7 +63,42 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-@Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "after:dreamcraft; required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl; after:UndergroundBiomes; after:TConstruct; after:Translocator;")
+@Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false,
+ dependencies = " required-after:IC2;" +
+ " after:dreamcraft;"+
+ " after:Forestry;" +
+ " after:PFAAGeologica;" +
+ " after:Thaumcraft;" +
+ " after:Railcraft;" +
+ " after:appliedenergistics2;" +
+ " after:ThermalExpansion;" +
+ " after:TwilightForest;" +
+ " after:harvestcraft;" +
+ " after:magicalcrops;" +
+ " after:BuildCraft|Transport;" +
+ " after:BuildCraft|Silicon;" +
+ " after:BuildCraft|Factory;" +
+ " after:BuildCraft|Energy;" +
+ " after:BuildCraft|Core;" +
+ " after:BuildCraft|Builders;" +
+ " after:GalacticraftCore;" +
+ " after:GalacticraftMars;" +
+ " after:GalacticraftPlanets;" +
+ " after:ThermalExpansion|Transport;" +
+ " after:ThermalExpansion|Energy;" +
+ " after:ThermalExpansion|Factory;" +
+ " after:RedPowerCore;" +
+ " after:RedPowerBase;" +
+ " after:RedPowerMachine;" +
+ " after:RedPowerCompat;" +
+ " after:RedPowerWiring;" +
+ " after:RedPowerLogic;" +
+ " after:RedPowerLighting;" +
+ " after:RedPowerWorld;" +
+ " after:RedPowerControl;" +
+ " after:UndergroundBiomes;" +
+ " after:TConstruct;" +
+ " after:Translocator;")
public class GT_Mod implements IGT_Mod {
public static final int VERSION = 509, SUBVERSION = 31;
public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION);
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index fa4e4accd2..daa02d8b85 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1539,7 +1539,7 @@ public class GT_Utility {
startWorld.onEntityRemoved(entity);
}
- entity.setLocationAndAngles(aX, aY, aY, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch);
((WorldServer) destinationWorld).theChunkProviderServer.loadChunk((int) aX >> 4, (int) aZ >> 4);
@@ -1560,17 +1560,17 @@ public class GT_Utility {
destinationWorld.spawnEntityInWorld(entity);
entity.setWorld(destinationWorld);
}
- entity.setLocationAndAngles(aX, aY, aY, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch);
destinationWorld.updateEntityWithOptionalForce(entity, false);
- entity.setLocationAndAngles(aX, aY, aY, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch);
if ((entity instanceof EntityPlayerMP)) {
EntityPlayerMP player = (EntityPlayerMP) entity;
if (interDimensional) {
player.mcServer.getConfigurationManager().func_72375_a(player, (WorldServer) destinationWorld);
}
- player.playerNetServerHandler.setPlayerLocation(aX, aY, aY, player.rotationYaw, player.rotationPitch);
+ player.playerNetServerHandler.setPlayerLocation(aX, aY, aZ, player.rotationYaw, player.rotationPitch);
}
destinationWorld.updateEntityWithOptionalForce(entity, false);
@@ -1588,7 +1588,7 @@ public class GT_Utility {
player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel));
FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, startWorld.provider.dimensionId, destinationWorld.provider.dimensionId);
}
- entity.setLocationAndAngles(aX, aY, aY, entity.rotationYaw, entity.rotationPitch);
+ entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch);
destinationWorld.theProfiler.endSection();
entity.fallDistance = 0;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 224c9d185e..7fdb9689a9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -34,6 +34,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.fluids.FluidStack;
+import java.util.List;
+
import static gregtech.api.enums.GT_Values.V;
public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
@@ -257,6 +259,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+
if (mFluid != null) {//Was if null -> Materials.Nitrogen.getPlasma(0);
mFluid = null;
}
@@ -293,7 +296,17 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
}
}
- for (Object tObject : getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2))) {
+ List entities_in_box = getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(
+ Entity.class,AxisAlignedBB.getBoundingBox(
+ getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(),2) - 1,
+ getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1,
+ getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1,
+ getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2,
+ getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2,
+ getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2)
+ );
+
+ for (Object tObject : entities_in_box) {
if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) {
Entity tEntity = (Entity) tObject;
// System.out.println("teleport"+(Math.pow(tDistance, 1.5)));
generated by cgit (git 2.46.0) at 2025-03-05 19:26:41 +0000