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
@@ -2,6 +2,7 @@
package appeng.parts.automation;
import appeng.api.config.Settings;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
@@ -52,7 +53,7 @@ public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends
}
@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.updateHandler();
this.getHost().markForSave();
@@ -470,7 +470,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
@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.configureWatchers();
}
@@ -21,6 +21,7 @@ package appeng.parts.automation;
import java.util.List;
import appeng.api.config.Settings;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
@@ -52,7 +53,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn
}
@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 )
{
}
@@ -22,6 +22,7 @@ package appeng.parts.misc;
import java.util.Collections;
import java.util.List;
import appeng.api.config.Settings;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.math.BlockPos;
@@ -144,7 +145,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
}
@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.resetCache( true );
this.getHost().markForSave();
@@ -26,7 +26,6 @@ import java.util.Objects;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerStorageBus;
import appeng.fluids.container.ContainerFluidInterface;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
@@ -171,7 +170,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, 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.resetCache( true );
this.getHost().markForSave();
@@ -47,7 +47,6 @@ import appeng.me.GridAccessException;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
@@ -147,7 +146,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
}
@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 )
{
}