GUI Refactoring and consolidation

This commit is contained in:
Sebastian Hartte
2020-06-14 18:00:02 +02:00
parent 9b19f5b0e2
commit fd7ed5bbf0
53 changed files with 1000 additions and 974 deletions
@@ -334,7 +334,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
}
@@ -250,7 +250,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
// nothing here..
}
@@ -27,7 +27,6 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraft.fluid.Fluid;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
@@ -63,8 +62,6 @@ import appeng.util.inv.WrapperChainedItemHandler;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.AEItemFilters;
import java.util.function.Predicate;
public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, IConfigurableObject
{
@@ -203,7 +200,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
this.addPower( 0 );
}
@@ -26,6 +26,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.api.config.Settings;
import appeng.recipes.handlers.InscriberRecipe;
import net.minecraft.item.ItemStack;
@@ -429,7 +430,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
}
@@ -304,7 +304,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
}
@@ -26,11 +26,8 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.block.storage.BlockChest;
import appeng.block.storage.DriveSlotState;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.fluids.container.ContainerFluidTerminal;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
@@ -39,7 +36,6 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidAttributes;
@@ -618,7 +614,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
}
@@ -221,7 +221,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
}
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
public void updateSetting(final IConfigManager manager, final Settings settingName, final Enum<?> newValue )
{
this.updateTask();
}