Skip to content

Commit

Permalink
sbobldes
Browse files Browse the repository at this point in the history
  • Loading branch information
screret committed Sep 29, 2024
1 parent 0a0fa4f commit dc2746a
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -50,7 +49,8 @@ public class ClientProxy extends CommonProxy {
public static final BiMap<ResourceLocation, BedrockFluidDefinition> CLIENT_FLUID_VEINS = HashBiMap.create();
public static final BiMap<ResourceLocation, BedrockOreDefinition> CLIENT_BEDROCK_ORE_VEINS = HashBiMap.create();

@Getter @Setter
@Getter
@Setter
private static long serverTickCount = -1L;

public ClientProxy() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Supplier<PipeModelRedirector>> model)
public record LaserStructure(String name, float renderThickness, boolean mirror,
Supplier<Supplier<PipeModelRedirector>> model)
implements IPipeStructure {

public static final LaserStructure NORMAL = new LaserStructure("laser_pipe_normal", 0.375f,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));

Expand Down

0 comments on commit dc2746a

Please sign in to comment.