Refactoring & cleaning

This commit is contained in:
ProfessorProspector 2018-09-16 13:48:38 -07:00
parent 874559c21e
commit e5736669ca
200 changed files with 1382 additions and 1596 deletions

View file

@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
import reborncore.client.gui.slots.SlotFilteredVoid;
import reborncore.common.container.RebornContainer;
import reborncore.common.util.Inventory;
import techreborn.init.TRIngredients;
import techreborn.init.TRContent;
public class ContainerDestructoPack extends RebornContainer {
@ -51,7 +51,7 @@ public class ContainerDestructoPack extends RebornContainer {
private void buildContainer() {
this.addSlotToContainer(
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { TRIngredients.Parts.MACHINE_PARTS.getStack() }));
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { TRContent.Parts.MACHINE_PARTS.getStack() }));
int i;
for (i = 0; i < 3; ++i) {

View file

@ -39,7 +39,7 @@ import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.tile.TileLegacyMachineBase;
import techreborn.Core;
import techreborn.TechReborn;
import techreborn.client.container.builder.slot.FilteredSlot;
import techreborn.client.container.builder.slot.FurnaceFuelSlot;
import techreborn.client.container.builder.slot.UpgradeSlot;
@ -143,7 +143,7 @@ public class ContainerTileInventoryBuilder {
((TilePowerAcceptor) this.tile)::setExtraPowerStoage)
.syncIntegerValue(() -> (int) ((TilePowerAcceptor) this.tile).getPowerChange(),
((TilePowerAcceptor) this.tile)::setPowerChange);
Core.logHelper.error(this.tile + " is not an instance of TilePowerAcceptor! Energy cannot be synced.");
TechReborn.LOGGER.error(this.tile + " is not an instance of TilePowerAcceptor! Energy cannot be synced.");
return this;
}
@ -156,7 +156,7 @@ public class ContainerTileInventoryBuilder {
.syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentNeededTicks,
(currentNeededTicks) -> ((IRecipeCrafterProvider) this.tile)
.getRecipeCrafter().currentNeededTicks = currentNeededTicks);
Core.logHelper
TechReborn.LOGGER
.error(this.tile + " is not an instance of IRecipeCrafterProvider! Craft progress cannot be synced.");
return this;
}

View file

@ -24,18 +24,12 @@
package techreborn.client.container.builder.slot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.IItemHandler;
import reborncore.api.tile.IUpgrade;
import reborncore.api.tile.IUpgradeable;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.util.Inventory;
import techreborn.client.container.IRightClickHandler;
import techreborn.client.container.builder.BuiltContainer;
public class UpgradeSlot extends BaseSlot implements IRightClickHandler {
public class UpgradeSlot extends BaseSlot {
public UpgradeSlot(final IItemHandler inventory, final int index, final int xPosition, final int yPosition) {
super(inventory, index, xPosition, yPosition);
@ -50,25 +44,4 @@ public class UpgradeSlot extends BaseSlot implements IRightClickHandler {
public int getSlotStackLimit() {
return 1;
}
@Override
public boolean handleRightClick(int slotID, EntityPlayer player, BuiltContainer container) {
if (inventory instanceof Inventory) {
Inventory inv = (Inventory) inventory;
TileEntity tileEntity = inv.getTile();
if (tileEntity instanceof IUpgradeable) {
IUpgradeable upgradeable = (IUpgradeable) tileEntity;
if (upgradeable.canBeUpgraded()) {
ItemStack stack = upgradeable.getUpgradeInvetory().getStackInSlot(slotID);
if (!stack.isEmpty() && stack.getItem() instanceof IUpgrade) {
if (player.world.isRemote) {
((IUpgrade) stack.getItem()).handleRightClick(tileEntity, stack, container, slotID);
}
}
}
}
}
return true;
}
}