Update buildscript + apply spotless

This commit is contained in:
D-Cysteine committed 2023-01-26 06:03:07 -07:00
1 parent 30d3f3d87a
commit 3e237cf3ca
13 files changed
+214 -228

No files matched your search

@@ -38,28 +38,28 @@ public enum TravelSource {
}
},
TELEPORT_STAFF() {
@Override
public int getMaxDistanceTravelled() {
return Config.teleportStaffMaxDistance;
}
TELEPORT_STAFF() {
@Override
public int getMaxDistanceTravelled() {
return Config.teleportStaffMaxDistance;
}
@Override
public float getPowerCostPerBlockTraveledRF() {
return 0f;
}
},
TELEPORT_STAFF_BLINK() {
@Override
public int getMaxDistanceTravelled() {
return Config.teleportStaffMaxBlinkDistance;
}
@Override
public float getPowerCostPerBlockTraveledRF() {
return 0f;
}
},
TELEPORT_STAFF_BLINK() {
@Override
public int getMaxDistanceTravelled() {
return Config.teleportStaffMaxBlinkDistance;
}
@Override
public float getPowerCostPerBlockTraveledRF() {
return 0f;
}
},
@Override
public float getPowerCostPerBlockTraveledRF() {
return 0f;
}
},
TELEPAD(EnderIO.DOMAIN + ":telepad.teleport");
public static int getMaxDistance() {
@@ -76,9 +76,9 @@ public enum TravelSource {
TravelSource source = TravelController.instance.getTravelItemTravelSource(player);
if (source == null) {
return TravelSource.BLOCK.getMaxDistanceTravelledSq();
return TravelSource.BLOCK.getMaxDistanceTravelledSq();
} else {
return source.getMaxDistanceTravelledSq();
return source.getMaxDistanceTravelledSq();
}
}
@@ -157,7 +157,6 @@ public final class Config {
public static float travelAnchorZoomScale = 0.2f;
public static boolean travelStaffSearchOptimize = true;
/** The max distance for travelling to a Travel Anchor. */
public static int teleportStaffMaxDistance = 2048;
/** The max distance for travelling to player look. */
@@ -6,16 +6,11 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
import crazypants.enderio.api.teleport.TravelSource;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.List;
public class ItemTeleportStaff extends ItemInfiniteTravelStaff {
protected ItemTeleportStaff() {
@@ -52,7 +47,7 @@ public class ItemTeleportStaff extends ItemInfiniteTravelStaff {
if (world.isRemote) {
if (player.isSneaking()) {
TravelController.instance.activateTravelAccessable(
equipped, world, player, TravelSource.TELEPORT_STAFF);
equipped, world, player, TravelSource.TELEPORT_STAFF);
} else {
TravelController.instance.doTeleport(player);
}
@@ -36,7 +36,7 @@ import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
@@ -55,8 +55,6 @@ import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import javax.annotation.Nullable;
public class TravelController {
public static final TravelController instance = new TravelController();
@@ -116,10 +114,10 @@ public class TravelController {
public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source) {
if (!hasTarget()) {
PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source);
PacketHandler.INSTANCE.sendToServer(p);
// We have no way of knowing if it will succeed, so just return false.
return false;
PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source);
PacketHandler.INSTANCE.sendToServer(p);
// We have no way of knowing if it will succeed, so just return false.
return false;
}
BlockCoord target = selectedCoord;
TileEntity te = world.getTileEntity(target.x, target.y, target.z);
@@ -232,113 +230,110 @@ public class TravelController {
return false;
}
/** This is the teleport staff super-teleport. */
public boolean doTeleport(EntityPlayer player) {
TravelSource source = TravelSource.TELEPORT_STAFF_BLINK;
/** This is the teleport staff super-teleport. */
public boolean doTeleport(EntityPlayer player) {
TravelSource source = TravelSource.TELEPORT_STAFF_BLINK;
Vector3d eye = Util.getEyePositionEio(player);
Vector3d look = Util.getLookVecEio(player);
Vector3d eye = Util.getEyePositionEio(player);
Vector3d look = Util.getLookVecEio(player);
double playerHeight = player.yOffset;
// +2 to compensate for the standard distance decrement of -2
double teleDistance = Config.teleportStaffFailedBlinkDistance + 2;
Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z);
double playerHeight = player.yOffset;
// +2 to compensate for the standard distance decrement of -2
double teleDistance = Config.teleportStaffFailedBlinkDistance + 2;
Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z);
// rayTraceBlocks has a limit of 200 distance.
double maxDistance = Config.teleportStaffMaxBlinkDistance;
double currDistance = 0;
Vec3 pos = eye3;
boolean loop = true;
while (loop) {
double distance = 200;
if (maxDistance - currDistance < 200) {
distance = maxDistance - currDistance;
loop = false;
}
// rayTraceBlocks has a limit of 200 distance.
double maxDistance = Config.teleportStaffMaxBlinkDistance;
double currDistance = 0;
Vec3 pos = eye3;
boolean loop = true;
while (loop) {
double distance = 200;
if (maxDistance - currDistance < 200) {
distance = maxDistance - currDistance;
loop = false;
}
Vector3d sample = new Vector3d(look);
sample.scale(distance);
sample.add(eye);
Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
Vector3d sample = new Vector3d(look);
sample.scale(distance);
sample.add(eye);
Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
MovingObjectPosition p =
player.worldObj.rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
if (p != null) {
teleDistance =
VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
break;
}
MovingObjectPosition p =
player.worldObj.rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
if (p != null) {
teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
break;
}
pos = end;
currDistance += distance;
pos = end;
currDistance += distance;
}
Vector3d sample = new Vector3d(look);
sample.scale(Config.teleportStaffMaxBlinkDistance);
sample.add(eye);
Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
MovingObjectPosition p =
player.worldObj.rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
if (p != null) {
teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
}
double distanceIncrement = -2;
// Special case: if the targeted block is too close, we'll try to teleport through it.
if (teleDistance < 3) {
distanceIncrement = 2;
}
for (int i = 0; i < 8; i++) {
teleDistance += distanceIncrement;
sample.set(look);
sample.scale(teleDistance);
sample.add(eye);
// we test against our feets location
sample.y -= playerHeight;
if (doBlinkAround(player, source, sample, false)) {
return true;
}
}
return false;
}
Vector3d sample = new Vector3d(look);
sample.scale(Config.teleportStaffMaxBlinkDistance);
sample.add(eye);
Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z);
MovingObjectPosition p =
player.worldObj.rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled);
if (p != null) {
teleDistance =
VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5));
/** Returns empty optional if no travel destination was found. */
public Optional<BlockCoord> findTravelDestination(EntityPlayer player, TravelSource source) {
Vector3d eye = Util.getEyePositionEio(player);
Vector3d look = Util.getLookVecEio(player);
// Map of distance to coordinate for eligible travel destinations (within angle).
Map<Double, BlockCoord> distanceMap = new TreeMap<>();
boolean outOfRange = false;
for (BlockCoord p : travelDestinations) {
Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5);
block.sub(eye);
double distance = block.length();
if (distance > source.getMaxDistanceTravelled()) {
outOfRange = true;
continue;
}
block.normalize();
double angle = Math.acos(look.dot(block));
// Roughly 5 degrees
if (angle < 0.087) {
distanceMap.put(distance, p);
}
}
if (outOfRange && distanceMap.isEmpty()) {
player.addChatComponentMessage(new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
}
return distanceMap.values().stream().findFirst();
}
double distanceIncrement = -2;
// Special case: if the targeted block is too close, we'll try to teleport through it.
if (teleDistance < 3) {
distanceIncrement = 2;
}
for (int i = 0; i < 8; i++) {
teleDistance += distanceIncrement;
sample.set(look);
sample.scale(teleDistance);
sample.add(eye);
// we test against our feets location
sample.y -= playerHeight;
if (doBlinkAround(player, source, sample, false)) {
return true;
}
}
return false;
}
/** Returns empty optional if no travel destination was found. */
public Optional<BlockCoord> findTravelDestination(EntityPlayer player, TravelSource source) {
Vector3d eye = Util.getEyePositionEio(player);
Vector3d look = Util.getLookVecEio(player);
// Map of distance to coordinate for eligible travel destinations (within angle).
Map<Double, BlockCoord> distanceMap = new TreeMap<>();
boolean outOfRange = false;
for (BlockCoord p : travelDestinations) {
Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5);
block.sub(eye);
double distance = block.length();
if (distance > source.getMaxDistanceTravelled()) {
outOfRange = true;
continue;
}
block.normalize();
double angle = Math.acos(look.dot(block));
// Roughly 5 degrees
if (angle < 0.087) {
distanceMap.put(distance, p);
}
}
if (outOfRange && distanceMap.isEmpty()) {
player.addChatComponentMessage(
new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
}
return distanceMap.values().stream().findFirst();
}
private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) {
UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock);
if (ui == null) {
@@ -349,8 +344,7 @@ public class TravelController {
|| !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled);
}
private boolean doBlinkAround(
EntityPlayer player, TravelSource source, Vector3d sample, boolean conserveMomentum) {
private boolean doBlinkAround(EntityPlayer player, TravelSource source, Vector3d sample, boolean conserveMomentum) {
if (travelToLocation(
player,
source,
@@ -542,24 +536,24 @@ public class TravelController {
return getTravelItemTravelSource(ep) != null;
}
/** Returns null if no travel item is equipped. */
@Nullable
public TravelSource getTravelItemTravelSource(EntityPlayer ep) {
if (ep == null || ep.getCurrentEquippedItem() == null) {
return null;
/** Returns null if no travel item is equipped. */
@Nullable
public TravelSource getTravelItemTravelSource(EntityPlayer ep) {
if (ep == null || ep.getCurrentEquippedItem() == null) {
return null;
}
ItemStack equipped = ep.getCurrentEquippedItem();
if (equipped.getItem() instanceof ItemTravelStaff) {
if (((ItemTravelStaff) equipped.getItem()).isActive(ep, equipped)) {
return TravelSource.TELEPORT_STAFF;
}
} else if (equipped.getItem() instanceof IItemOfTravel) {
if (((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
return TravelSource.STAFF;
}
}
return null;
}
ItemStack equipped = ep.getCurrentEquippedItem();
if (equipped.getItem() instanceof ItemTravelStaff) {
if (((ItemTravelStaff) equipped.getItem()).isActive(ep, equipped)) {
return TravelSource.TELEPORT_STAFF;
}
} else if (equipped.getItem() instanceof IItemOfTravel) {
if (((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
return TravelSource.STAFF;
}
}
return null;
}
public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) {
return travelToLocation(player, source, selectedCoord, conserveMomentum);
@@ -900,7 +894,7 @@ public class TravelController {
private int getMaxTravelDistanceSqForPlayer(EntityPlayer player) {
TravelSource source = getTravelItemTravelSource(player);
if (source == null) {
return TravelSource.BLOCK.getMaxDistanceTravelledSq();
return TravelSource.BLOCK.getMaxDistanceTravelledSq();
}
return source.getMaxDistanceTravelledSq();
}
@@ -62,8 +62,10 @@ public class BlockTravelAnchor extends BlockEio
PacketHandler.INSTANCE.registerMessage(
PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(
PacketLongDistanceTravelEvent.class, PacketLongDistanceTravelEvent.class,
PacketHandler.nextID(), Side.SERVER);
PacketLongDistanceTravelEvent.class,
PacketLongDistanceTravelEvent.class,
PacketHandler.nextID(),
Side.SERVER);
PacketHandler.INSTANCE.registerMessage(
PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(
@@ -331,23 +331,23 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
this.visible = visible;
}
@Override
public void validate() {
super.validate();
if (isTravelSource()) {
TravelController.instance.travelDestinations.add(getLocation());
@Override
public void validate() {
super.validate();
if (isTravelSource()) {
TravelController.instance.travelDestinations.add(getLocation());
}
}
}
@Override
public void invalidate() {
super.invalidate();
TravelController.instance.travelDestinations.remove(getLocation());
}
@Override
public void invalidate() {
super.invalidate();
TravelController.instance.travelDestinations.remove(getLocation());
}
@Override
public void onChunkUnload() {
super.onChunkUnload();
TravelController.instance.travelDestinations.remove(getLocation());
}
@Override
public void onChunkUnload() {
super.onChunkUnload();
TravelController.instance.travelDestinations.remove(getLocation());
}
}
@@ -66,10 +66,9 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
Vector3d eye = Util.getEyePositionEio(Minecraft.getMinecraft().thePlayer);
Vector3d loc = new Vector3d(tileentity.xCoord + 0.5, tileentity.yCoord + 0.5, tileentity.zCoord + 0.5);
double maxDistance = TravelSource.BLOCK.getMaxDistanceTravelledSq();
TravelSource source =
TravelController.instance.getTravelItemTravelSource(Minecraft.getMinecraft().thePlayer);
TravelSource source = TravelController.instance.getTravelItemTravelSource(Minecraft.getMinecraft().thePlayer);
if (source != null) {
maxDistance = source.getMaxDistanceTravelledSq();
maxDistance = source.getMaxDistanceTravelledSq();
}
if (eye.distanceSquared(loc) > maxDistance) {
return;
@@ -11,6 +11,7 @@ import crazypants.enderio.api.teleport.TeleportEntityEvent;
import crazypants.enderio.api.teleport.TravelSource;
import crazypants.enderio.teleport.TravelController;
import io.netty.buffer.ByteBuf;
import java.util.Optional;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,9 +19,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.network.play.server.S12PacketEntityVelocity;
import net.minecraftforge.common.MinecraftForge;
import java.util.Optional;
public class PacketLongDistanceTravelEvent implements IMessage, IMessageHandler<PacketLongDistanceTravelEvent, IMessage> {
public class PacketLongDistanceTravelEvent
implements IMessage, IMessageHandler<PacketLongDistanceTravelEvent, IMessage> {
boolean conserveMotion;
int entityId;
@@ -28,8 +28,7 @@ public class PacketLongDistanceTravelEvent implements IMessage, IMessageHandler<
public PacketLongDistanceTravelEvent() {}
public PacketLongDistanceTravelEvent(
Entity entity, boolean conserveMotion, TravelSource source) {
public PacketLongDistanceTravelEvent(Entity entity, boolean conserveMotion, TravelSource source) {
this.conserveMotion = conserveMotion;
this.entityId = entity instanceof EntityPlayer ? -1 : entity.getEntityId();
this.source = source.ordinal();
@@ -62,13 +61,11 @@ public class PacketLongDistanceTravelEvent implements IMessage, IMessageHandler<
return null;
}
public static boolean doServerTeleport(
Entity toTp, boolean conserveMotion, TravelSource source) {
public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source) {
EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null;
Optional<BlockCoord> travelDestination =
TravelController.instance.findTravelDestination(player, source);
Optional<BlockCoord> travelDestination = TravelController.instance.findTravelDestination(player, source);
if (!travelDestination.isPresent()) {
return false;
return false;
}
BlockCoord destination = travelDestination.get();
int x = destination.x;
@@ -76,7 +73,7 @@ public class PacketLongDistanceTravelEvent implements IMessage, IMessageHandler<
int z = destination.z;
int powerUse = TravelController.instance.getRequiredPower(player, source, destination);
if (powerUse < 0) {
return false;
return false;
}
TeleportEntityEvent evt = new TeleportEntityEvent(toTp, source, x, y, z);
@@ -324,7 +324,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei
// this.inNetwork = pkt.func_148857_g().getBoolean("inNetwork");
}
@Override
@Override
public void invalidate() {
super.invalidate();
if (worldObj.isRemote) {