diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
commit | 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch) | |
tree | 1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/common/misc | |
parent | f8cc82edeb9810c45cba762d733a2c909a302faa (diff) | |
download | GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2 GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/common/misc')
5 files changed, 213 insertions, 152 deletions
diff --git a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java b/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java index b05e25e1c8..6e40e5860c 100644 --- a/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java +++ b/src/main/java/gregtech/common/misc/GT_ClientPollutionMap.java @@ -5,6 +5,7 @@ import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.util.MathHelper; public class GT_ClientPollutionMap { + private static final byte RADIUS = 24; private static final byte DISTANCE_RELOAD_MAP = 5; // When player moved x chunks, shift the map to new center. private static final byte SIZE = RADIUS * 2 + 1; // Area to keep stored. @@ -50,14 +51,14 @@ public class GT_ClientPollutionMap { int relX = chunkX - x0 + RADIUS; if (relX >= SIZE || relX < 0) // out of bounds - return; + return; int relZ = chunkZ - z0 + RADIUS; if (relZ >= SIZE || relZ < 0) // out of bounds - return; + return; pollution = pollution / 225; if (pollution > Short.MAX_VALUE) // Sanity - chunkMatrix[relX][relZ] = Short.MAX_VALUE; // Max pollution = 7,3mill + chunkMatrix[relX][relZ] = Short.MAX_VALUE; // Max pollution = 7,3mill else if (pollution < 0) chunkMatrix[relX][relZ] = 0; else chunkMatrix[relX][relZ] = (short) (pollution); } @@ -99,43 +100,39 @@ public class GT_ClientPollutionMap { int xDiff = chunkX - x0; int zDiff = chunkZ - z0; boolean[] allEmpty = new boolean[SIZE]; // skip check z row if its empty. - if (xDiff > 0) - for (byte x = 0; x < SIZE; x++) { - int xOff = x + xDiff; - if (xOff < SIZE) { - chunkMatrix[x] = chunkMatrix[xOff].clone(); - } else { - chunkMatrix[x] = new short[SIZE]; - allEmpty[x] = true; - } + if (xDiff > 0) for (byte x = 0; x < SIZE; x++) { + int xOff = x + xDiff; + if (xOff < SIZE) { + chunkMatrix[x] = chunkMatrix[xOff].clone(); + } else { + chunkMatrix[x] = new short[SIZE]; + allEmpty[x] = true; } - else if (xDiff < 0) - for (byte x = SIZE - 1; x >= 0; x--) { - int xOff = x + xDiff; - if (xOff > 0) { - chunkMatrix[x] = chunkMatrix[xOff].clone(); - } else { - chunkMatrix[x] = new short[SIZE]; - allEmpty[x] = true; - } + } + else if (xDiff < 0) for (byte x = SIZE - 1; x >= 0; x--) { + int xOff = x + xDiff; + if (xOff > 0) { + chunkMatrix[x] = chunkMatrix[xOff].clone(); + } else { + chunkMatrix[x] = new short[SIZE]; + allEmpty[x] = true; } + } - if (zDiff > 0) - for (byte x = 0; x < SIZE; x++) { - if (allEmpty[x]) continue; - for (int z = 0; z < SIZE; z++) { - int zOff = z + zDiff; - chunkMatrix[x][z] = (zOff < SIZE) ? chunkMatrix[x][zOff] : 0; - } + if (zDiff > 0) for (byte x = 0; x < SIZE; x++) { + if (allEmpty[x]) continue; + for (int z = 0; z < SIZE; z++) { + int zOff = z + zDiff; + chunkMatrix[x][z] = (zOff < SIZE) ? chunkMatrix[x][zOff] : 0; } - else if (zDiff < 0) - for (byte x = 0; x < SIZE; x++) { - if (allEmpty[x]) continue; - for (int z = SIZE - 1; z >= 0; z--) { - int zOff = z + zDiff; - chunkMatrix[x][z] = (zOff > 0) ? chunkMatrix[x][zOff] : 0; - } + } + else if (zDiff < 0) for (byte x = 0; x < SIZE; x++) { + if (allEmpty[x]) continue; + for (int z = SIZE - 1; z >= 0; z--) { + int zOff = z + zDiff; + chunkMatrix[x][z] = (zOff > 0) ? chunkMatrix[x][zOff] : 0; } + } x0 = chunkX; z0 = chunkZ; diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java index 8c896253fa..c2af60523d 100644 --- a/src/main/java/gregtech/common/misc/GT_Command.java +++ b/src/main/java/gregtech/common/misc/GT_Command.java @@ -1,22 +1,25 @@ package gregtech.common.misc; -import com.gtnewhorizon.structurelib.StructureLib; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; -import gregtech.api.interfaces.IGlobalWirelessEnergy; -import gregtech.api.objects.GT_ChunkManager; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Pollution; import java.lang.reflect.Field; import java.math.BigInteger; import java.util.*; import java.util.stream.Stream; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.EnumChatFormatting; +import com.gtnewhorizon.structurelib.StructureLib; + +import gregtech.GT_Mod; +import gregtech.api.enums.GT_Values; +import gregtech.api.interfaces.IGlobalWirelessEnergy; +import gregtech.api.objects.GT_ChunkManager; +import gregtech.api.util.GT_Utility; +import gregtech.common.GT_Pollution; + public final class GT_Command extends CommandBase implements IGlobalWirelessEnergy { @Override @@ -30,16 +33,18 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner } private void printHelp(ICommandSender sender) { - sender.addChatMessage(new ChatComponentText( - "Usage: gt <toggle|chunks|pollution|global_energy_add|global_energy_set|global_energy_join>")); + sender.addChatMessage( + new ChatComponentText( + "Usage: gt <toggle|chunks|pollution|global_energy_add|global_energy_set|global_energy_join>")); sender.addChatMessage(new ChatComponentText("\"toggle D1\" - toggles general.Debug (D1)")); sender.addChatMessage(new ChatComponentText("\"toggle D2\" - toggles general.Debug2 (D2)")); sender.addChatMessage(new ChatComponentText("\"toggle debugCleanroom\" - toggles cleanroom debug log")); sender.addChatMessage(new ChatComponentText("\"toggle debugDriller\" - toggles oil drill debug log")); sender.addChatMessage(new ChatComponentText("\"toggle debugBlockPump\" - Possible issues with pumps")); sender.addChatMessage(new ChatComponentText("\"toggle debugBlockMiner\" - Possible issues with miners")); - sender.addChatMessage(new ChatComponentText( - "\"toggle debugEntityCramming\" - How long it takes and how many entities it finds")); + sender.addChatMessage( + new ChatComponentText( + "\"toggle debugEntityCramming\" - How long it takes and how many entities it finds")); sender.addChatMessage(new ChatComponentText("\"toggle debugWorldGen\" - toggles generic worldgen debug")); sender.addChatMessage(new ChatComponentText("\"toggle debugOrevein\" - toggles worldgen ore vein debug")); sender.addChatMessage(new ChatComponentText("\"toggle debugSmallOres\" - toggles worldgen small vein debug")); @@ -47,73 +52,88 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner sender.addChatMessage(new ChatComponentText("\"toggle debugChunkloaders\" - toggles chunkloaders debug")); sender.addChatMessage(new ChatComponentText("\"toggle debugMulti\" - toggles structurelib debug")); sender.addChatMessage(new ChatComponentText("\"chunks\" - print a list of the force loaded chunks")); - sender.addChatMessage(new ChatComponentText( - "\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, " - + "\n if <amount> isnt specified, will add" + GT_Mod.gregtechproxy.mPollutionSmogLimit - + "gibbl.")); + sender.addChatMessage( + new ChatComponentText( + "\"pollution <amount>\" - adds the <amount> of the pollution to the current chunk, " + + "\n if <amount> isnt specified, will add" + + GT_Mod.gregtechproxy.mPollutionSmogLimit + + "gibbl.")); sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + " --- Global wireless EU controls ---")); sender.addChatMessage(new ChatComponentText("Allows you to set the amount of EU in a users wireless network.")); - sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_set " - + EnumChatFormatting.BLUE + "[Name] " + EnumChatFormatting.LIGHT_PURPLE + "[EU]")); - sender.addChatMessage(new ChatComponentText( - "Allows you to add EU to a users wireless network. Also accepts negative numbers.")); - sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_add " - + EnumChatFormatting.BLUE + "[Name] " + EnumChatFormatting.LIGHT_PURPLE + "[EU]")); + sender.addChatMessage( + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_set " + + EnumChatFormatting.BLUE + + "[Name] " + + EnumChatFormatting.LIGHT_PURPLE + + "[EU]")); + sender.addChatMessage( + new ChatComponentText( + "Allows you to add EU to a users wireless network. Also accepts negative numbers.")); + sender.addChatMessage( + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_add " + + EnumChatFormatting.BLUE + + "[Name] " + + EnumChatFormatting.LIGHT_PURPLE + + "[EU]")); sender.addChatMessage( new ChatComponentText( "Allows you to join two users together into one network. Can be undone by writing the users name twice.")); - sender.addChatMessage(new ChatComponentText("Usage:" + EnumChatFormatting.RED + " global_energy_join " - + EnumChatFormatting.BLUE + "[User joining] [User to join]")); + sender.addChatMessage( + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_join " + + EnumChatFormatting.BLUE + + "[User joining] [User to join]")); sender.addChatMessage(new ChatComponentText("Shows the amount of EU in a users energy network.")); - sender.addChatMessage(new ChatComponentText( - "Usage:" + EnumChatFormatting.RED + " global_energy_display " + EnumChatFormatting.BLUE + "[Name]")); + sender.addChatMessage( + new ChatComponentText( + "Usage:" + EnumChatFormatting.RED + + " global_energy_display " + + EnumChatFormatting.BLUE + + "[Name]")); } @Override public List addTabCompletionOptions(ICommandSender sender, String[] ss) { List<String> l = new ArrayList<>(); String test = ss.length == 0 ? "" : ss[0].trim(); - if (ss.length == 0 - || ss.length == 1 - && (test.isEmpty() - || Stream.of( - "toggle", - "chunks", - "pollution", - "global_energy_add", - "global_energy_set", - "global_energy_join", - "global_energy_display") - .anyMatch(s -> s.startsWith(test)))) { + if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream.of( + "toggle", + "chunks", + "pollution", + "global_energy_add", + "global_energy_set", + "global_energy_join", + "global_energy_display").anyMatch(s -> s.startsWith(test)))) { Stream.of( - "toggle", - "chunks", - "pollution", - "global_energy_add", - "global_energy_set", - "global_energy_join", - "global_energy_display") - .filter(s -> test.isEmpty() || s.startsWith(test)) - .forEach(l::add); + "toggle", + "chunks", + "pollution", + "global_energy_add", + "global_energy_set", + "global_energy_join", + "global_energy_display").filter(s -> test.isEmpty() || s.startsWith(test)).forEach(l::add); } else if (test.equals("toggle")) { String test1 = ss[1].trim(); Stream.of( - "D1", - "D2", - "debugCleanroom", - "debugDriller", - "debugBlockPump", - "debugBlockMiner", - "debugWorldGen", - "debugEntityCramming", - "debugOrevein", - "debugSmallOres", - "debugStones", - "debugChunkloaders", - "debugMulti", - "debugWorldData") - .filter(s -> test1.isEmpty() || s.startsWith(test1)) - .forEach(l::add); + "D1", + "D2", + "debugCleanroom", + "debugDriller", + "debugBlockPump", + "debugBlockMiner", + "debugWorldGen", + "debugEntityCramming", + "debugOrevein", + "debugSmallOres", + "debugStones", + "debugChunkloaders", + "debugMulti", + "debugWorldData").filter(s -> test1.isEmpty() || s.startsWith(test1)).forEach(l::add); } return l; } @@ -155,10 +175,11 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner break; case "pollution": ChunkCoordinates coordinates = sender.getPlayerCoordinates(); - int amount = - (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit : Integer.parseInt(strings[1]); + int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit + : Integer.parseInt(strings[1]); GT_Pollution.addPollution( - sender.getEntityWorld().getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), amount); + sender.getEntityWorld().getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), + amount); break; case "global_energy_add": { String username = strings[1]; @@ -179,19 +200,26 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner + GT_Utility.formatNumbers(new BigInteger(EU_String)) + EnumChatFormatting.RESET; - if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String))) - sender.addChatMessage(new ChatComponentText("Successfully added " + EU_string_formatted - + "EU to the global energy network of " + formatted_username + ".")); - else - sender.addChatMessage(new ChatComponentText( - "Failed to add " + EU_string_formatted + "EU to the global energy map of " - + formatted_username + ". Insufficient energy in network. ")); + if (addEUToGlobalEnergyMap(uuid, new BigInteger(EU_String))) sender.addChatMessage( + new ChatComponentText( + "Successfully added " + EU_string_formatted + + "EU to the global energy network of " + + formatted_username + + ".")); + else sender.addChatMessage( + new ChatComponentText( + "Failed to add " + EU_string_formatted + + "EU to the global energy map of " + + formatted_username + + ". Insufficient energy in network. ")); sender.addChatMessage( - new ChatComponentText(formatted_username + " currently has " + EnumChatFormatting.RED - + GT_Utility.formatNumbers( - new BigInteger(getUserEU(uuid).toString())) - + EnumChatFormatting.RESET + "EU in their network.")); + new ChatComponentText( + formatted_username + " currently has " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(new BigInteger(getUserEU(uuid).toString())) + + EnumChatFormatting.RESET + + "EU in their network.")); break; } @@ -219,9 +247,14 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner setUserEU(uuid, new BigInteger(EU_String_0)); - sender.addChatMessage(new ChatComponentText("Successfully set " + formatted_username - + "'s global energy network to " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(new BigInteger(EU_String_0)) + EnumChatFormatting.RESET + "EU.")); + sender.addChatMessage( + new ChatComponentText( + "Successfully set " + formatted_username + + "'s global energy network to " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(new BigInteger(EU_String_0)) + + EnumChatFormatting.RESET + + "EU.")); break; } @@ -240,11 +273,16 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid_1.equals("") && uuid_0.equals("")) { if (username_0.equals(username_1)) { - sender.addChatMessage(new ChatComponentText( - "User " + formatted_username_0 + " has no global energy network.")); + sender.addChatMessage( + new ChatComponentText( + "User " + formatted_username_0 + " has no global energy network.")); } else { - sender.addChatMessage(new ChatComponentText("User " + formatted_username_0 + " and " - + formatted_username_1 + " have no global energy networks.")); + sender.addChatMessage( + new ChatComponentText( + "User " + formatted_username_0 + + " and " + + formatted_username_1 + + " have no global energy networks.")); } break; } @@ -263,18 +301,24 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner if (uuid_0.equals(uuid_1)) { joinUserNetwork(uuid_0, uuid_1); - sender.addChatMessage(new ChatComponentText( - "User " + formatted_username_0 + " has rejoined their own global energy network.")); + sender.addChatMessage( + new ChatComponentText( + "User " + formatted_username_0 + " has rejoined their own global energy network.")); break; } joinUserNetwork(uuid_0, uuid_1); - sender.addChatMessage(new ChatComponentText( - "Success! " + formatted_username_0 + " has joined " + formatted_username_1 + ".")); - sender.addChatMessage(new ChatComponentText( - "To undo this simply join your own network again with /gt global_energy_join " - + formatted_username_0 + " " + formatted_username_0 + ".")); + sender.addChatMessage( + new ChatComponentText( + "Success! " + formatted_username_0 + " has joined " + formatted_username_1 + ".")); + sender.addChatMessage( + new ChatComponentText( + "To undo this simply join your own network again with /gt global_energy_join " + + formatted_username_0 + + " " + + formatted_username_0 + + ".")); break; } @@ -292,9 +336,14 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner break; } - sender.addChatMessage(new ChatComponentText("User " + formatted_username + " has " - + EnumChatFormatting.RED + GT_Utility.formatNumbers(getUserEU(uuid)) + EnumChatFormatting.RESET - + "EU in their network.")); + sender.addChatMessage( + new ChatComponentText( + "User " + formatted_username + + " has " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(getUserEU(uuid)) + + EnumChatFormatting.RESET + + "EU in their network.")); break; } diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java index 35a47fed87..9edee98725 100644 --- a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java +++ b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java @@ -2,25 +2,28 @@ package gregtech.common.misc; import static gregtech.api.enums.GT_Values.debugBlockMiner; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_TileEntity_Ores; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.FakePlayer; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; +import gregtech.common.blocks.GT_TileEntity_Ores; + /** @author Relvl on 27.01.2022 */ @SuppressWarnings("ObjectEquality") public class GT_DrillingLogicDelegate { + public static final ItemStack MINING_PIPE_STACK = GT_ModHandler.getIC2Item("miningPipe", 0); public static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE_STACK); - public static final Block MINING_PIPE_TIP_BLOCK = - GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0)); + public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility + .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0)); /** The owner machine pointer */ private final GT_IDrillingLogicDelegateOwner owner; @@ -140,9 +143,13 @@ public class GT_DrillingLogicDelegate { owner.getBaseMetaTileEntity().getWorld().setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); } // Remove the old pipe tip - aBaseMetaTileEntity - .getWorld() - .setBlock(xCoord, actualDrillY, zCoord, Blocks.air, 0, /*send to client without neighbour updates*/ 2); + aBaseMetaTileEntity.getWorld().setBlock( + xCoord, + actualDrillY, + zCoord, + Blocks.air, + 0, + /* send to client without neighbour updates */ 2); // Return the pipe back to the machine (inputs allowed for this case!) owner.pushOutputs(MINING_PIPE_STACK, 1, false, true); @@ -176,17 +183,19 @@ public class GT_DrillingLogicDelegate { } ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData); - te.getWorld() - .setBlock( - x, - y, - z, - Block.getBlockFromItem(cobble.getItem()), - cobble.getItemDamage(), /*cause updates(1) + send to client(2)*/ - 3); + te.getWorld().setBlock( + x, + y, + z, + Block.getBlockFromItem(cobble.getItem()), + cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ + 3); } - /** Returns NEGATIVE (eg -5) depth of current drilling Y world level. RELATIVELY TO MINER ENTITY! This means '(miner world Y) + depth = (actual world Y)'. */ + /** + * Returns NEGATIVE (eg -5) depth of current drilling Y world level. RELATIVELY TO MINER ENTITY! This means '(miner + * world Y) + depth = (actual world Y)'. + */ public int getTipDepth() { return tipDepth; } @@ -206,7 +215,10 @@ public class GT_DrillingLogicDelegate { } } - /** Creates and provides the Fake Player for owners. todo maybe will provide player owner uuid? im sure some servers not allow to fakers, in griefing reasons. */ + /** + * Creates and provides the Fake Player for owners. todo maybe will provide player owner uuid? im sure some servers + * not allow to fakers, in griefing reasons. + */ public FakePlayer getFakePlayer(IGregTechTileEntity te) { if (mFakePlayer == null) { mFakePlayer = GT_Utility.getFakePlayer(te); @@ -219,8 +231,8 @@ public class GT_DrillingLogicDelegate { } public boolean canFakePlayerInteract(IGregTechTileEntity te, int xCoord, int yCoord, int zCoord) { - return GT_Utility.setBlockByFakePlayer( - getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true); + return GT_Utility + .setBlockByFakePlayer(getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true); } /** Get target block drops. We need to encapsulate everyting of mining in this class. */ diff --git a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java b/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java index f290e8ac8c..9b10b6fcf0 100644 --- a/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java +++ b/src/main/java/gregtech/common/misc/GT_IDrillingLogicDelegateOwner.java @@ -1,9 +1,10 @@ package gregtech.common.misc; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; + /** @author Relvl on 27.01.2022 */ public interface GT_IDrillingLogicDelegateOwner extends IMetaTileEntity { diff --git a/src/main/java/gregtech/common/misc/GlobalEnergyWorldSavedData.java b/src/main/java/gregtech/common/misc/GlobalEnergyWorldSavedData.java index 621fb3beae..63cf6cfa60 100644 --- a/src/main/java/gregtech/common/misc/GlobalEnergyWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/GlobalEnergyWorldSavedData.java @@ -2,16 +2,18 @@ package gregtech.common.misc; import static gregtech.common.misc.GlobalVariableStorage.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.io.*; import java.math.BigInteger; import java.util.HashMap; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraft.world.storage.MapStorage; import net.minecraftforge.event.world.WorldEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class GlobalEnergyWorldSavedData extends WorldSavedData { public static GlobalEnergyWorldSavedData INSTANCE; |