diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 3c37ec70c..31fcdde0e 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -82,7 +82,7 @@ public class BlockRubberLeaves extends BlockLeaves { @Override public boolean isOpaqueCube(IBlockState state) { if(!fancyLeaves()){ - return super.isOpaqueCube(state); + return state.isOpaqueCube(); } return false; } @@ -133,7 +133,7 @@ public class BlockRubberLeaves extends BlockLeaves { @Override public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { if(!fancyLeaves()){ - return super.shouldSideBeRendered(blockState, blockAccess, pos, side); + blockState.shouldSideBeRendered(blockAccess, pos, side); } return true; } diff --git a/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java b/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java index fa412afe5..ec38fc036 100644 --- a/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java +++ b/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java @@ -45,7 +45,6 @@ import techreborn.client.gui.slot.elements.SlotType; import javax.annotation.Nullable; import java.awt.*; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/techreborn/client/render/ModelDynamicCell.java b/src/main/java/techreborn/client/render/ModelDynamicCell.java index 9c3f3cdab..d4e181ad1 100644 --- a/src/main/java/techreborn/client/render/ModelDynamicCell.java +++ b/src/main/java/techreborn/client/render/ModelDynamicCell.java @@ -112,8 +112,8 @@ public class ModelDynamicCell implements IModel { TextureAtlasSprite fluidSprite = bakedTextureGetter.apply(sprite); if (fluid != null) { if (fluidSprite != null) { - builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color)); - builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color)); + builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color, -1)); + builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color, -1)); } } diff --git a/src/main/java/techreborn/command/TechRebornDevCommand.java b/src/main/java/techreborn/command/TechRebornDevCommand.java index f31706242..e131ceee3 100644 --- a/src/main/java/techreborn/command/TechRebornDevCommand.java +++ b/src/main/java/techreborn/command/TechRebornDevCommand.java @@ -26,7 +26,6 @@ package techreborn.command; import net.minecraft.block.Block; import net.minecraft.command.CommandBase; -import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index b37d204f6..bbefd043a 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -33,7 +33,6 @@ import reborncore.api.recipe.RecipeHandler; import techreborn.api.Reference; import techreborn.api.recipe.machines.ScrapboxRecipe; import techreborn.init.ModBlocks; -import techreborn.init.ModItems; import techreborn.items.DynamicCell; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 7f943daf8..88a200efc 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -28,7 +28,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemAxe; diff --git a/src/main/java/techreborn/packets/PacketAesu.java b/src/main/java/techreborn/packets/PacketAesu.java index 6589d2178..49f4fb5f2 100644 --- a/src/main/java/techreborn/packets/PacketAesu.java +++ b/src/main/java/techreborn/packets/PacketAesu.java @@ -31,8 +31,6 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.storage.TileAdjustableSU; -import java.io.IOException; - public class PacketAesu implements INetworkPacket { int buttonID; diff --git a/src/main/java/techreborn/packets/PacketFusionControlSize.java b/src/main/java/techreborn/packets/PacketFusionControlSize.java index 081adc754..9193ab84e 100644 --- a/src/main/java/techreborn/packets/PacketFusionControlSize.java +++ b/src/main/java/techreborn/packets/PacketFusionControlSize.java @@ -31,8 +31,6 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.fusionReactor.TileFusionControlComputer; -import java.io.IOException; - public class PacketFusionControlSize implements INetworkPacket { int sizeDelta; diff --git a/src/main/java/techreborn/packets/PacketIdsu.java b/src/main/java/techreborn/packets/PacketIdsu.java index 583a4d705..92324b218 100644 --- a/src/main/java/techreborn/packets/PacketIdsu.java +++ b/src/main/java/techreborn/packets/PacketIdsu.java @@ -30,8 +30,6 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.idsu.TileInterdimensionalSU; -import java.io.IOException; - public class PacketIdsu implements INetworkPacket { int buttonID; diff --git a/src/main/java/techreborn/packets/PacketRollingMachineLock.java b/src/main/java/techreborn/packets/PacketRollingMachineLock.java index 25b23f3fd..4d1438ff1 100644 --- a/src/main/java/techreborn/packets/PacketRollingMachineLock.java +++ b/src/main/java/techreborn/packets/PacketRollingMachineLock.java @@ -31,8 +31,6 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.tier1.TileRollingMachine; -import java.io.IOException; - public class PacketRollingMachineLock implements INetworkPacket { BlockPos machinePos; diff --git a/src/main/java/techreborn/packets/PacketSetRecipe.java b/src/main/java/techreborn/packets/PacketSetRecipe.java index 2995e8353..9e204f4eb 100644 --- a/src/main/java/techreborn/packets/PacketSetRecipe.java +++ b/src/main/java/techreborn/packets/PacketSetRecipe.java @@ -33,8 +33,6 @@ import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.INetworkPacket; import techreborn.tiles.tier1.TileAutoCraftingTable; -import java.io.IOException; - /** * Created by modmuss50 on 20/06/2017. */ diff --git a/src/main/java/techreborn/tiles/TileMachineCasing.java b/src/main/java/techreborn/tiles/TileMachineCasing.java index 53e714313..e206230c0 100644 --- a/src/main/java/techreborn/tiles/TileMachineCasing.java +++ b/src/main/java/techreborn/tiles/TileMachineCasing.java @@ -28,7 +28,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.api.IToolDrop; import reborncore.common.multiblock.MultiblockControllerBase; -import reborncore.common.multiblock.MultiblockValidationException; import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase; import techreborn.blocks.BlockMachineCasing; import techreborn.multiblocks.MultiBlockCasing; diff --git a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java index 66d3bc1a6..dc8139025 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java @@ -32,8 +32,6 @@ import reborncore.api.power.EnumPowerTier; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.init.ModBlocks; -import java.util.List; - /** * Created by modmuss50 on 25/02/2016. */ diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 5ae67d0e7..a938aab4c 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -28,7 +28,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Rotation; import net.minecraft.util.text.TextFormatting; import reborncore.api.IToolDrop; import reborncore.api.power.EnumPowerTier;