diff options
author | Glease <4586901+Glease@users.noreply.github.com> | 2021-06-11 03:09:49 +0800 |
---|---|---|
committer | Glease <4586901+Glease@users.noreply.github.com> | 2021-07-30 14:38:59 +0800 |
commit | 05c9015847ed770492152f93dee6beae45e61b4e (patch) | |
tree | 08027daf197bc890367b0eab57e27d4b3232105c /src | |
parent | 03a45da45fdd85f1276416c2586a98eba79a9b50 (diff) | |
download | GT5-Unofficial-05c9015847ed770492152f93dee6beae45e61b4e.tar.gz GT5-Unofficial-05c9015847ed770492152f93dee6beae45e61b4e.tar.bz2 GT5-Unofficial-05c9015847ed770492152f93dee6beae45e61b4e.zip |
Fix rebase derp
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/GT_Client.java | 3 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 8e06207267..3a2fc8b50f 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -26,6 +26,7 @@ import gregtech.api.interfaces.tileentity.ITurnable; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.net.GT_Packet_ClientPreference; import gregtech.api.objects.GT_ItemStack; +import gregtech.api.util.GT_ClientPreference; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_PlayedSound; import gregtech.api.util.GT_Recipe; @@ -46,7 +47,6 @@ import ic2.api.tile.IWrenchable; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -56,7 +56,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.client.event.DrawBlockHighlightEvent; -import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index 8916c9f42a..f1bfbe80f0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -354,7 +354,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_En } @Override - public IStructureDefinition<GT_MetaTileEntity_DrillerBase> getStructureDefinition() { + public final IStructureDefinition<GT_MetaTileEntity_DrillerBase> getStructureDefinition() { return STRUCTURE_DEFINITION; } |