diff --git a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/logic/TemperatureLogic.java b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/logic/TemperatureLogic.java index 568481c783..426804d363 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/logic/TemperatureLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/logic/TemperatureLogic.java @@ -15,9 +15,6 @@ import com.gregtechceu.gtceu.client.ClientProxy; import com.gregtechceu.gtceu.client.particle.GTOverheatParticle; -import com.lowdragmc.lowdraglib.Platform; - -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/block/PipeBlock.java b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/block/PipeBlock.java index 7363cd496e..0134f33845 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/block/PipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/block/PipeBlock.java @@ -21,10 +21,8 @@ import com.gregtechceu.gtceu.utils.EntityDamageUtil; import com.gregtechceu.gtceu.utils.GTUtil; -import com.lowdragmc.lowdraglib.LDLib; import com.lowdragmc.lowdraglib.Platform; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/tile/PipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/tile/PipeBlockEntity.java index 58fb110afb..db51b7cc3c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/tile/PipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/api/graphnet/pipenet/physical/tile/PipeBlockEntity.java @@ -45,7 +45,6 @@ import com.lowdragmc.lowdraglib.syncdata.field.FieldManagedStorage; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleOptions; diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java index fbfc18bd43..328bd058a6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java @@ -21,8 +21,6 @@ import com.lowdragmc.lowdraglib.gui.compass.CompassManager; import com.lowdragmc.lowdraglib.gui.compass.component.RecipeComponent; -import lombok.Getter; -import lombok.Setter; import net.minecraft.client.model.BoatModel; import net.minecraft.client.model.ChestBoatModel; import net.minecraft.client.renderer.blockentity.HangingSignRenderer; @@ -33,11 +31,12 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.*; -import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import lombok.Getter; +import lombok.Setter; /** * @author KilaBash @@ -50,7 +49,8 @@ public class ClientProxy extends CommonProxy { public static final BiMap CLIENT_FLUID_VEINS = HashBiMap.create(); public static final BiMap CLIENT_BEDROCK_ORE_VEINS = HashBiMap.create(); - @Getter @Setter + @Getter + @Setter private static long serverTickCount = -1L; public ClientProxy() { diff --git a/src/main/java/com/gregtechceu/gtceu/client/particle/GTOverheatParticle.java b/src/main/java/com/gregtechceu/gtceu/client/particle/GTOverheatParticle.java index 8eb68cc6aa..708d9733c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/particle/GTOverheatParticle.java +++ b/src/main/java/com/gregtechceu/gtceu/client/particle/GTOverheatParticle.java @@ -14,7 +14,6 @@ import com.lowdragmc.shimmer.client.shader.RenderUtils; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/com/gregtechceu/gtceu/client/particle/GTParticleManager.java b/src/main/java/com/gregtechceu/gtceu/client/particle/GTParticleManager.java index 1f4e997694..82b49170da 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/particle/GTParticleManager.java +++ b/src/main/java/com/gregtechceu/gtceu/client/particle/GTParticleManager.java @@ -12,7 +12,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.CustomizeGuiOverlayEvent; import net.minecraftforge.client.event.RenderLevelStageEvent; import net.minecraftforge.event.TickEvent; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModel.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModel.java index 37130de7dd..2b35ecba5f 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModel.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModel.java @@ -20,8 +20,6 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.data.ModelData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModelRegistry.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModelRegistry.java index 7cb019bf8b..2aefabfbd6 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModelRegistry.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/pipe/PipeModelRegistry.java @@ -11,13 +11,13 @@ import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import com.google.common.collect.Tables; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/gregtechceu/gtceu/common/network/packets/SPacketSyncTickCount.java b/src/main/java/com/gregtechceu/gtceu/common/network/packets/SPacketSyncTickCount.java index a1a8719f3a..28dc0229c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/network/packets/SPacketSyncTickCount.java +++ b/src/main/java/com/gregtechceu/gtceu/common/network/packets/SPacketSyncTickCount.java @@ -1,12 +1,15 @@ package com.gregtechceu.gtceu.common.network.packets; import com.gregtechceu.gtceu.client.ClientProxy; + import com.lowdragmc.lowdraglib.Platform; import com.lowdragmc.lowdraglib.networking.IHandlerContext; import com.lowdragmc.lowdraglib.networking.IPacket; -import lombok.AllArgsConstructor; + import net.minecraft.network.FriendlyByteBuf; +import lombok.AllArgsConstructor; + @AllArgsConstructor public class SPacketSyncTickCount implements IPacket { diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableBlock.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableBlock.java index bddaedb9cc..e5b5e642a3 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableBlock.java @@ -27,10 +27,10 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; - -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.LevelChunk; + +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import org.jetbrains.annotations.Nullable; import java.util.Map; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableStructure.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableStructure.java index 3a251697cb..4b71f9822b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableStructure.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/cable/CableStructure.java @@ -12,6 +12,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +41,8 @@ public record CableStructure(String name, int material, int costFactor, TagPrefi public static final CableStructure CABLE_DOUBLE = new CableStructure("double_cable", 2, 1, TagPrefix.cableGtDouble, WIRE_DOUBLE, INSULATION_BURN_TEMP, 0.375f, () -> () -> PipeModelRegistry.getCableModel(2)); public static final CableStructure CABLE_QUADRUPLE = new CableStructure("quadruple_cable", 4, 1, - TagPrefix.cableGtQuadruple, WIRE_QUADRUPLE, INSULATION_BURN_TEMP, 0.5f, () -> () -> PipeModelRegistry.getCableModel(3)); + TagPrefix.cableGtQuadruple, WIRE_QUADRUPLE, INSULATION_BURN_TEMP, 0.5f, + () -> () -> PipeModelRegistry.getCableModel(3)); public static final CableStructure CABLE_OCTAL = new CableStructure("octal_cable", 8, 1, TagPrefix.cableGtOctal, WIRE_OCTAL, INSULATION_BURN_TEMP, 0.75f, () -> () -> PipeModelRegistry.getCableModel(4)); public static final CableStructure CABLE_HEX = new CableStructure("hex_cable", 16, 1, TagPrefix.cableGtHex, diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/duct/DuctStructure.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/duct/DuctStructure.java index 27c114875c..9f4b81ab0d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/duct/DuctStructure.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/duct/DuctStructure.java @@ -7,6 +7,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import org.jetbrains.annotations.NotNull; public record DuctStructure(String name, float renderThickness, float rateMultiplier) implements IPipeStructure { diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/laser/LaserStructure.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/laser/LaserStructure.java index 44a9a488be..1d95756fc5 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/laser/LaserStructure.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/laser/LaserStructure.java @@ -10,14 +10,15 @@ import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import net.minecraft.core.Direction; - import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; -public record LaserStructure(String name, float renderThickness, boolean mirror, Supplier> model) +public record LaserStructure(String name, float renderThickness, boolean mirror, + Supplier> model) implements IPipeStructure { public static final LaserStructure NORMAL = new LaserStructure("laser_pipe_normal", 0.375f, diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/optical/OpticalStructure.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/optical/OpticalStructure.java index f006f9a16b..1f920b0c97 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/optical/OpticalStructure.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/optical/OpticalStructure.java @@ -10,9 +10,9 @@ import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; import net.minecraft.core.Direction; - import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/pipe/MaterialPipeStructure.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/pipe/MaterialPipeStructure.java index 118659598e..7079d3b8f9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/pipe/MaterialPipeStructure.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/block/pipe/MaterialPipeStructure.java @@ -9,6 +9,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; + import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; @@ -38,9 +39,11 @@ public record MaterialPipeStructure(String name, int material, int channelCount, public static final MaterialPipeStructure SMALL_RESTRICTIVE = new MaterialPipeStructure("small_restrictive", 2, 1, true, TagPrefix.pipeSmallRestrictive, 0.375f, () -> () -> PipeModelRegistry.getPipeRestrictiveModel(1)); public static final MaterialPipeStructure NORMAL_RESTRICTIVE = new MaterialPipeStructure("normal_restrictive", - 6, 1, true, TagPrefix.pipeNormalRestrictive, 0.5f, () -> () -> PipeModelRegistry.getPipeRestrictiveModel(2)); + 6, 1, true, TagPrefix.pipeNormalRestrictive, 0.5f, + () -> () -> PipeModelRegistry.getPipeRestrictiveModel(2)); public static final MaterialPipeStructure LARGE_RESTRICTIVE = new MaterialPipeStructure("large_restrictive", - 12, 1, true, TagPrefix.pipeLargeRestrictive, 0.75f, () -> () -> PipeModelRegistry.getPipeRestrictiveModel(3)); + 12, 1, true, TagPrefix.pipeLargeRestrictive, 0.75f, + () -> () -> PipeModelRegistry.getPipeRestrictiveModel(3)); public static final MaterialPipeStructure HUGE_RESTRICTIVE = new MaterialPipeStructure("huge_restrictive", 24, 1, true, TagPrefix.pipeHugeRestrictive, 0.875f, () -> () -> PipeModelRegistry.getPipeRestrictiveModel(4));