diff --git a/build.gradle b/build.gradle index 2951a47c6..c9512b324 100644 --- a/build.gradle +++ b/build.gradle @@ -192,6 +192,27 @@ sourceSets { include 'appeng/capabilities/*' include 'appeng/container/slot/AppEngSlot*' include 'appeng/container/AEBaseContainer*' + include 'appeng/helpers/InventoryAction.java' + include 'appeng/container/guisync/**' + include 'appeng/core/sync/network/NetworkHandler.java' + include 'appeng/core/sync/packets/PacketProgressBar.java' + include 'appeng/container/slot/SlotDisabled.java' + include 'appeng/container/slot/SlotFake.java' + include 'appeng/container/slot/SlotInaccessible.java' + include 'appeng/container/slot/SlotPlayerHotBar.java' + include 'appeng/container/slot/SlotPlayerInv.java' + include 'appeng/core/sync/packets/PacketTargetItemStack.java' + include 'appeng/core/sync/packets/PacketSwapSlots.java' + include 'appeng/core/sync/packets/PacketInventoryAction.java' + include 'appeng/container/implementations/ContainerCraftAmount.java' + include 'appeng/core/sync/packets/PacketValueConfig.java' + include 'appeng/client/render/StackSizeRenderer.java' + include 'appeng/fluids/client/render/FluidStackSizeRenderer.java' + include 'appeng/core/localization/GuiText.java' + include 'appeng/util/ISlimReadableNumberConverter.java' + include 'appeng/util/IWideReadableNumberConverter.java' + include 'appeng/util/ReadableNumberConverter.java' + include 'appeng/container/slot/IOptionalSlot.java' } compileClasspath += sourceSets.api.output runtimeClasspath += sourceSets.api.output diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index 32facf77c..4c2ff8478 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -22,7 +22,6 @@ package appeng.block.storage; import javax.annotation.Nullable; import appeng.api.util.AEPartLocation; -import appeng.core.sync.GuiBridge; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/main/java/appeng/client/me/FluidRepo.java index 0939685eb..b26cdeb6a 100644 --- a/src/main/java/appeng/client/me/FluidRepo.java +++ b/src/main/java/appeng/client/me/FluidRepo.java @@ -37,6 +37,7 @@ import appeng.api.storage.data.IItemList; import appeng.client.gui.widgets.IScrollSource; import appeng.client.gui.widgets.ISortSource; import appeng.core.AEConfig; +import appeng.core.Api; import appeng.fluids.util.FluidSorters; import appeng.util.Platform; import appeng.util.prioritylist.IPartitionList; diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index fe9f61c2c..d4885d46a 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -93,12 +93,6 @@ public class SlotDisconnected extends AppEngSlot return ItemStack.EMPTY; } - @Override - public boolean isHere( final IInventory inv, final int slotIn ) - { - return false; - } - public ClientDCInternalInv getSlot() { return this.mySlot; diff --git a/src/main/java/appeng/client/me/SlotFluidME.java b/src/main/java/appeng/client/me/SlotFluidME.java index 7426371a8..ca86fc80c 100644 --- a/src/main/java/appeng/client/me/SlotFluidME.java +++ b/src/main/java/appeng/client/me/SlotFluidME.java @@ -98,12 +98,6 @@ public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot return ItemStack.EMPTY; } - @Override - public boolean isHere( final IInventory inv, final int slotIn ) - { - return false; - } - @Override public boolean canTakeStack( final PlayerEntity par1PlayerEntity ) { diff --git a/src/main/java/appeng/client/me/SlotME.java b/src/main/java/appeng/client/me/SlotME.java index 0b6bad807..15c6cfcb7 100644 --- a/src/main/java/appeng/client/me/SlotME.java +++ b/src/main/java/appeng/client/me/SlotME.java @@ -91,12 +91,6 @@ public class SlotME extends SlotItemHandler return ItemStack.EMPTY; } - @Override - public boolean isHere( final IInventory inv, final int slotIn ) - { - return false; - } - @Override public boolean canTakeStack( final PlayerEntity par1PlayerEntity ) { diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index 1cf878748..59ed5ac15 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -19,8 +19,8 @@ package appeng.client.render; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; import appeng.api.storage.data.IAEItemStack; import appeng.core.AEConfig; @@ -49,9 +49,6 @@ public class StackSizeRenderer final float inverseScaleFactor = 1.0f / scaleFactor; final int offset = AEConfig.instance().useTerminalUseLargeFont() ? 0 : -1; - final boolean unicodeFlag = fontRenderer.getUnicodeFlag(); - fontRenderer.setUnicodeFlag( false ); - if( aeStack.getStackSize() == 0 && aeStack.isCraftable() ) { final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft @@ -59,12 +56,12 @@ public class StackSizeRenderer RenderSystem.disableLighting(); RenderSystem.disableDepthTest(); RenderSystem.disableBlend(); - GlStateManager.pushMatrix(); - GlStateManager.scale( scaleFactor, scaleFactor, scaleFactor ); + RenderSystem.pushMatrix(); + RenderSystem.scalef( scaleFactor, scaleFactor, scaleFactor ); final int X = (int) ( ( (float) xPos + offset + 16.0f - fontRenderer.getStringWidth( craftLabelText ) * scaleFactor ) * inverseScaleFactor ); final int Y = (int) ( ( (float) yPos + offset + 16.0f - 7.0f * scaleFactor ) * inverseScaleFactor ); fontRenderer.drawStringWithShadow( craftLabelText, X, Y, 16777215 ); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderSystem.enableLighting(); RenderSystem.enableDepthTest(); RenderSystem.enableBlend(); @@ -77,18 +74,17 @@ public class StackSizeRenderer RenderSystem.disableLighting(); RenderSystem.disableDepthTest(); RenderSystem.disableBlend(); - GlStateManager.pushMatrix(); - GlStateManager.scale( scaleFactor, scaleFactor, scaleFactor ); + RenderSystem.pushMatrix(); + RenderSystem.scalef( scaleFactor, scaleFactor, scaleFactor ); final int X = (int) ( ( (float) xPos + offset + 16.0f - fontRenderer.getStringWidth( stackSize ) * scaleFactor ) * inverseScaleFactor ); final int Y = (int) ( ( (float) yPos + offset + 16.0f - 7.0f * scaleFactor ) * inverseScaleFactor ); fontRenderer.drawStringWithShadow( stackSize, X, Y, 16777215 ); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderSystem.enableLighting(); RenderSystem.enableDepthTest(); RenderSystem.enableBlend(); } - fontRenderer.setUnicodeFlag( unicodeFlag ); } } diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index f530d7757..d4c5be9aa 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -27,6 +27,8 @@ import java.util.HashSet; import java.util.List; import appeng.core.Api; +import appeng.core.sync.packets.PacketInventoryAction; +import appeng.core.sync.packets.PacketValueConfig; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -58,8 +60,6 @@ import appeng.client.me.SlotME; import appeng.container.guisync.GuiSync; import appeng.container.guisync.SyncData; import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; import appeng.container.slot.SlotDisabled; import appeng.container.slot.SlotFake; import appeng.container.slot.SlotInaccessible; @@ -67,9 +67,7 @@ import appeng.container.slot.SlotPlayerHotBar; import appeng.container.slot.SlotPlayerInv; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; -import appeng.core.sync.packets.PacketInventoryAction; import appeng.core.sync.packets.PacketTargetItemStack; -import appeng.core.sync.packets.PacketValueConfig; import appeng.helpers.ICustomNameObject; import appeng.helpers.InventoryAction; import appeng.me.helpers.PlayerSource; @@ -414,7 +412,7 @@ public abstract class AEBaseContainer extends Container { final AppEngSlot cs = (AppEngSlot) inventorySlot; - if( !( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) && !( cs instanceof SlotCraftingMatrix ) ) + if( !( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) /* FIXME && !( cs instanceof SlotCraftingMatrix ) */ ) { if( cs.isItemValid( tis ) ) { @@ -433,7 +431,7 @@ public abstract class AEBaseContainer extends Container { final AppEngSlot cs = (AppEngSlot) inventorySlot; - if( ( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) && !( cs instanceof SlotCraftingMatrix ) ) + if( ( cs.isPlayerSide() ) && !( cs instanceof SlotFake ) /* FIXME && !( cs instanceof SlotCraftingMatrix ) */ ) { if( cs.isItemValid( tis ) ) { @@ -663,18 +661,18 @@ public abstract class AEBaseContainer extends Container { final Slot s = this.getSlot( slot ); - if( s instanceof SlotCraftingTerm ) - { - switch( action ) - { - case CRAFT_SHIFT: - case CRAFT_ITEM: - case CRAFT_STACK: - ( (SlotCraftingTerm) s ).doClick( action, player ); - this.updateHeld( player ); - default: - } - } +// FIXME if( s instanceof SlotCraftingTerm ) +// FIXME { +// FIXME switch( action ) +// FIXME { +// FIXME case CRAFT_SHIFT: +// FIXME case CRAFT_ITEM: +// FIXME case CRAFT_STACK: +// FIXME ( (SlotCraftingTerm) s ).doClick( action, player ); +// FIXME this.updateHeld( player ); +// FIXME default: +// FIXME } +// FIXME } if( s instanceof SlotFake ) { @@ -747,7 +745,7 @@ public abstract class AEBaseContainer extends Container for( final Object j : this.inventorySlots ) { - if( j instanceof Slot && j.getClass() == s.getClass() && !( j instanceof SlotCraftingTerm ) ) + if( j instanceof Slot && j.getClass() == s.getClass() /* FIXME && !( j instanceof SlotCraftingTerm ) */ ) { from.add( (Slot) j ); } diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index d47f6617c..5e41c70c5 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -27,7 +27,6 @@ import appeng.container.AEBaseContainer; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketProgressBar; -import appeng.core.sync.packets.PacketValueConfig; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.IContainerListener; @@ -87,7 +86,7 @@ public class SyncData { if( o instanceof ServerPlayerEntity) { - NetworkHandler.instance().sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (ServerPlayerEntity) o ); + // FIXME NetworkHandler.instance().sendTo( new PacketValueConfig( "SyncDat." + this.channel, (String) val ), (ServerPlayerEntity) o ); } } else if( this.field.getType().isEnum() ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java index a0aaf168c..71b1160cf 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java @@ -22,6 +22,7 @@ package appeng.container.implementations; import javax.annotation.Nonnull; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; import net.minecraft.world.World; @@ -43,9 +44,8 @@ public class ContainerCraftAmount extends AEBaseContainer private final Slot craftingItem; private IAEItemStack itemToCreate; - public ContainerCraftAmount( final PlayerInventory ip, final ITerminalHost te ) - { - super( ip, te ); + public ContainerCraftAmount(ContainerType containerType, int id, PlayerInventory ip, final ITerminalHost te) { + super(containerType, id, ip, te); this.craftingItem = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); this.addSlot( this.getCraftingItem() ); diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index edec8dd5f..205783442 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import appeng.core.Api; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java index d98fd97ae..1e646d423 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java @@ -35,7 +35,6 @@ import appeng.container.ContainerOpenContext; import appeng.container.implementations.ContainerCraftAmount; import appeng.core.AppEng; import appeng.core.sync.AppEngPacket; -import appeng.core.sync.GuiBridge; import appeng.core.sync.network.INetworkInfo; import appeng.helpers.InventoryAction; import appeng.util.Platform; @@ -132,7 +131,7 @@ public class PacketInventoryAction extends AppEngPacket if( context != null ) { final TileEntity te = context.getTile(); - Platform.openGUI( sender, te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_AMOUNT ); + // FIXME Platform.openGUI( sender, te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_AMOUNT ); if( sender.openContainer instanceof ContainerCraftAmount ) { diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 9af6205d2..d14508129 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -19,40 +19,14 @@ package appeng.core.sync.packets; -import java.io.IOException; - -import io.netty.buffer.Unpooled; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Hand; - -import appeng.api.config.FuzzyMode; -import appeng.api.config.Settings; -import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigurableObject; -import appeng.client.gui.implementations.GuiCraftingCPU; -import appeng.container.AEBaseContainer; -import appeng.container.implementations.ContainerCellWorkbench; -import appeng.container.implementations.ContainerCraftConfirm; -import appeng.container.implementations.ContainerCraftingCPU; -import appeng.container.implementations.ContainerCraftingStatus; -import appeng.container.implementations.ContainerLevelEmitter; -import appeng.container.implementations.ContainerNetworkTool; -import appeng.container.implementations.ContainerPatternTerm; -import appeng.container.implementations.ContainerPriority; -import appeng.container.implementations.ContainerQuartzKnife; -import appeng.container.implementations.ContainerSecurityStation; -import appeng.container.implementations.ContainerStorageBus; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; -import appeng.fluids.container.ContainerFluidLevelEmitter; -import appeng.fluids.container.ContainerFluidStorageBus; -import appeng.helpers.IMouseWheelItem; +import io.netty.buffer.Unpooled; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.container.Container; +import net.minecraft.network.PacketBuffer; + +import java.io.IOException; public class PacketValueConfig extends AppEngPacket @@ -89,172 +63,172 @@ public class PacketValueConfig extends AppEngPacket { final Container c = player.openContainer; - if( this.Name.equals( "Item" ) && ( ( !player.getHeldItem( Hand.MAIN_HAND ).isEmpty() && player.getHeldItem( Hand.MAIN_HAND ).getItem() instanceof IMouseWheelItem ) || ( !player.getHeldItem( Hand.OFF_HAND ).isEmpty() && player.getHeldItem( Hand.OFF_HAND ).getItem() instanceof IMouseWheelItem ) ) ) - { - final Hand hand; - if( !player.getHeldItem( Hand.MAIN_HAND ).isEmpty() && player.getHeldItem( Hand.MAIN_HAND ).getItem() instanceof IMouseWheelItem ) - { - hand = Hand.MAIN_HAND; - } - else if( !player.getHeldItem( Hand.OFF_HAND ).isEmpty() && player.getHeldItem( Hand.OFF_HAND ).getItem() instanceof IMouseWheelItem ) - { - hand = Hand.OFF_HAND; - } - else - { - return; - } - - final ItemStack is = player.getHeldItem( hand ); - final IMouseWheelItem si = (IMouseWheelItem) is.getItem(); - si.onWheel( is, this.Value.equals( "WheelUp" ) ); - } - else if( this.Name.equals( "Terminal.Cpu" ) && c instanceof ContainerCraftingStatus ) - { - final ContainerCraftingStatus qk = (ContainerCraftingStatus) c; - qk.cycleCpu( this.Value.equals( "Next" ) ); - } - else if( this.Name.equals( "Terminal.Cpu" ) && c instanceof ContainerCraftConfirm ) - { - final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; - qk.cycleCpu( this.Value.equals( "Next" ) ); - } - else if( this.Name.equals( "Terminal.Start" ) && c instanceof ContainerCraftConfirm ) - { - final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; - qk.startJob(); - } - else if( this.Name.equals( "TileCrafting.Cancel" ) && c instanceof ContainerCraftingCPU ) - { - final ContainerCraftingCPU qk = (ContainerCraftingCPU) c; - qk.cancelCrafting(); - } - else if( this.Name.equals( "QuartzKnife.Name" ) && c instanceof ContainerQuartzKnife ) - { - final ContainerQuartzKnife qk = (ContainerQuartzKnife) c; - qk.setName( this.Value ); - } - else if( this.Name.equals( "TileSecurityStation.ToggleOption" ) && c instanceof ContainerSecurityStation ) - { - final ContainerSecurityStation sc = (ContainerSecurityStation) c; - sc.toggleSetting( this.Value, player ); - } - else if( this.Name.equals( "PriorityHost.Priority" ) && c instanceof ContainerPriority ) - { - final ContainerPriority pc = (ContainerPriority) c; - pc.setPriority( Integer.parseInt( this.Value ), player ); - } - else if( this.Name.equals( "LevelEmitter.Value" ) && c instanceof ContainerLevelEmitter ) - { - final ContainerLevelEmitter lvc = (ContainerLevelEmitter) c; - lvc.setLevel( Long.parseLong( this.Value ), player ); - } - else if( this.Name.equals( "FluidLevelEmitter.Value" ) && c instanceof ContainerFluidLevelEmitter ) - { - final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c; - lvc.setLevel( Long.parseLong( this.Value ), player ); - } - else if( this.Name.startsWith( "PatternTerminal." ) && c instanceof ContainerPatternTerm ) - { - final ContainerPatternTerm cpt = (ContainerPatternTerm) c; - if( this.Name.equals( "PatternTerminal.CraftMode" ) ) - { - cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) ); - } - else if( this.Name.equals( "PatternTerminal.Encode" ) ) - { - cpt.encode(); - } - else if( this.Name.equals( "PatternTerminal.Clear" ) ) - { - cpt.clear(); - } - else if( this.Name.equals( "PatternTerminal.Substitute" ) ) - { - cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) ); - } - } - else if( this.Name.startsWith( "StorageBus." ) ) - { - if( this.Name.equals( "StorageBus.Action" ) ) - { - if( this.Value.equals( "Partition" ) ) - { - if( c instanceof ContainerStorageBus ) - { - ( (ContainerStorageBus) c ).partition(); - } - else if( c instanceof ContainerFluidStorageBus ) - { - ( (ContainerFluidStorageBus) c ).partition(); - } - } - else if( this.Value.equals( "Clear" ) ) - { - if( c instanceof ContainerStorageBus ) - { - ( (ContainerStorageBus) c ).clear(); - } - else if( c instanceof ContainerFluidStorageBus ) - { - ( (ContainerFluidStorageBus) c ).clear(); - } - } - } - } - else if( this.Name.startsWith( "CellWorkbench." ) && c instanceof ContainerCellWorkbench ) - { - final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c; - if( this.Name.equals( "CellWorkbench.Action" ) ) - { - if( this.Value.equals( "CopyMode" ) ) - { - ccw.nextWorkBenchCopyMode(); - } - else if( this.Value.equals( "Partition" ) ) - { - ccw.partition(); - } - else if( this.Value.equals( "Clear" ) ) - { - ccw.clear(); - } - } - else if( this.Name.equals( "CellWorkbench.Fuzzy" ) ) - { - ccw.setFuzzy( FuzzyMode.valueOf( this.Value ) ); - } - } - else if( c instanceof ContainerNetworkTool ) - { - if( this.Name.equals( "NetworkTool" ) && this.Value.equals( "Toggle" ) ) - { - ( (ContainerNetworkTool) c ).toggleFacadeMode(); - } - } - else if( c instanceof IConfigurableObject ) - { - final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager(); - - for( final Settings e : cm.getSettings() ) - { - if( e.name().equals( this.Name ) ) - { - final Enum def = cm.getSetting( e ); - - try - { - cm.putSetting( e, Enum.valueOf( def.getClass(), this.Value ) ); - } - catch( final IllegalArgumentException err ) - { - // :P - } - - break; - } - } - } +// FIXME if( this.Name.equals( "Item" ) && ( ( !player.getHeldItem( Hand.MAIN_HAND ).isEmpty() && player.getHeldItem( Hand.MAIN_HAND ).getItem() instanceof IMouseWheelItem ) || ( !player.getHeldItem( Hand.OFF_HAND ).isEmpty() && player.getHeldItem( Hand.OFF_HAND ).getItem() instanceof IMouseWheelItem ) ) ) +// FIXME { +// FIXME final Hand hand; +// FIXME if( !player.getHeldItem( Hand.MAIN_HAND ).isEmpty() && player.getHeldItem( Hand.MAIN_HAND ).getItem() instanceof IMouseWheelItem ) +// FIXME { +// FIXME hand = Hand.MAIN_HAND; +// FIXME } +// FIXME else if( !player.getHeldItem( Hand.OFF_HAND ).isEmpty() && player.getHeldItem( Hand.OFF_HAND ).getItem() instanceof IMouseWheelItem ) +// FIXME { +// FIXME hand = Hand.OFF_HAND; +// FIXME } +// FIXME else +// FIXME { +// FIXME return; +// FIXME } +// FIXME +// FIXME final ItemStack is = player.getHeldItem( hand ); +// FIXME final IMouseWheelItem si = (IMouseWheelItem) is.getItem(); +// FIXME si.onWheel( is, this.Value.equals( "WheelUp" ) ); +// FIXME } +// FIXME else if( this.Name.equals( "Terminal.Cpu" ) && c instanceof ContainerCraftingStatus ) +// FIXME { +// FIXME final ContainerCraftingStatus qk = (ContainerCraftingStatus) c; +// FIXME qk.cycleCpu( this.Value.equals( "Next" ) ); +// FIXME } +// FIXME else if( this.Name.equals( "Terminal.Cpu" ) && c instanceof ContainerCraftConfirm ) +// FIXME { +// FIXME final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; +// FIXME qk.cycleCpu( this.Value.equals( "Next" ) ); +// FIXME } +// FIXME else if( this.Name.equals( "Terminal.Start" ) && c instanceof ContainerCraftConfirm ) +// FIXME { +// FIXME final ContainerCraftConfirm qk = (ContainerCraftConfirm) c; +// FIXME qk.startJob(); +// FIXME } +// FIXME else if( this.Name.equals( "TileCrafting.Cancel" ) && c instanceof ContainerCraftingCPU ) +// FIXME { +// FIXME final ContainerCraftingCPU qk = (ContainerCraftingCPU) c; +// FIXME qk.cancelCrafting(); +// FIXME } +// FIXME else if( this.Name.equals( "QuartzKnife.Name" ) && c instanceof ContainerQuartzKnife ) +// FIXME { +// FIXME final ContainerQuartzKnife qk = (ContainerQuartzKnife) c; +// FIXME qk.setName( this.Value ); +// FIXME } +// FIXME else if( this.Name.equals( "TileSecurityStation.ToggleOption" ) && c instanceof ContainerSecurityStation ) +// FIXME { +// FIXME final ContainerSecurityStation sc = (ContainerSecurityStation) c; +// FIXME sc.toggleSetting( this.Value, player ); +// FIXME } +// FIXME else if( this.Name.equals( "PriorityHost.Priority" ) && c instanceof ContainerPriority ) +// FIXME { +// FIXME final ContainerPriority pc = (ContainerPriority) c; +// FIXME pc.setPriority( Integer.parseInt( this.Value ), player ); +// FIXME } +// FIXME else if( this.Name.equals( "LevelEmitter.Value" ) && c instanceof ContainerLevelEmitter ) +// FIXME { +// FIXME final ContainerLevelEmitter lvc = (ContainerLevelEmitter) c; +// FIXME lvc.setLevel( Long.parseLong( this.Value ), player ); +// FIXME } +// FIXME else if( this.Name.equals( "FluidLevelEmitter.Value" ) && c instanceof ContainerFluidLevelEmitter ) +// FIXME { +// FIXME final ContainerFluidLevelEmitter lvc = (ContainerFluidLevelEmitter) c; +// FIXME lvc.setLevel( Long.parseLong( this.Value ), player ); +// FIXME } +// FIXME else if( this.Name.startsWith( "PatternTerminal." ) && c instanceof ContainerPatternTerm ) +// FIXME { +// FIXME final ContainerPatternTerm cpt = (ContainerPatternTerm) c; +// FIXME if( this.Name.equals( "PatternTerminal.CraftMode" ) ) +// FIXME { +// FIXME cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) ); +// FIXME } +// FIXME else if( this.Name.equals( "PatternTerminal.Encode" ) ) +// FIXME { +// FIXME cpt.encode(); +// FIXME } +// FIXME else if( this.Name.equals( "PatternTerminal.Clear" ) ) +// FIXME { +// FIXME cpt.clear(); +// FIXME } +// FIXME else if( this.Name.equals( "PatternTerminal.Substitute" ) ) +// FIXME { +// FIXME cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) ); +// FIXME } +// FIXME } +// FIXME else if( this.Name.startsWith( "StorageBus." ) ) +// FIXME { +// FIXME if( this.Name.equals( "StorageBus.Action" ) ) +// FIXME { +// FIXME if( this.Value.equals( "Partition" ) ) +// FIXME { +// FIXME if( c instanceof ContainerStorageBus ) +// FIXME { +// FIXME ( (ContainerStorageBus) c ).partition(); +// FIXME } +// FIXME else if( c instanceof ContainerFluidStorageBus ) +// FIXME { +// FIXME ( (ContainerFluidStorageBus) c ).partition(); +// FIXME } +// FIXME } +// FIXME else if( this.Value.equals( "Clear" ) ) +// FIXME { +// FIXME if( c instanceof ContainerStorageBus ) +// FIXME { +// FIXME ( (ContainerStorageBus) c ).clear(); +// FIXME } +// FIXME else if( c instanceof ContainerFluidStorageBus ) +// FIXME { +// FIXME ( (ContainerFluidStorageBus) c ).clear(); +// FIXME } +// FIXME } +// FIXME } +// FIXME } +// FIXME else if( this.Name.startsWith( "CellWorkbench." ) && c instanceof ContainerCellWorkbench ) +// FIXME { +// FIXME final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c; +// FIXME if( this.Name.equals( "CellWorkbench.Action" ) ) +// FIXME { +// FIXME if( this.Value.equals( "CopyMode" ) ) +// FIXME { +// FIXME ccw.nextWorkBenchCopyMode(); +// FIXME } +// FIXME else if( this.Value.equals( "Partition" ) ) +// FIXME { +// FIXME ccw.partition(); +// FIXME } +// FIXME else if( this.Value.equals( "Clear" ) ) +// FIXME { +// FIXME ccw.clear(); +// FIXME } +// FIXME } +// FIXME else if( this.Name.equals( "CellWorkbench.Fuzzy" ) ) +// FIXME { +// FIXME ccw.setFuzzy( FuzzyMode.valueOf( this.Value ) ); +// FIXME } +// FIXME } +// FIXME else if( c instanceof ContainerNetworkTool ) +// FIXME { +// FIXME if( this.Name.equals( "NetworkTool" ) && this.Value.equals( "Toggle" ) ) +// FIXME { +// FIXME ( (ContainerNetworkTool) c ).toggleFacadeMode(); +// FIXME } +// FIXME } +// FIXME else if( c instanceof IConfigurableObject ) +// FIXME { +// FIXME final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager(); +// FIXME +// FIXME for( final Settings e : cm.getSettings() ) +// FIXME { +// FIXME if( e.name().equals( this.Name ) ) +// FIXME { +// FIXME final Enum def = cm.getSetting( e ); +// FIXME +// FIXME try +// FIXME { +// FIXME cm.putSetting( e, Enum.valueOf( def.getClass(), this.Value ) ); +// FIXME } +// FIXME catch( final IllegalArgumentException err ) +// FIXME { +// FIXME // :P +// FIXME } +// FIXME +// FIXME break; +// FIXME } +// FIXME } +// FIXME } } @Override @@ -262,44 +236,44 @@ public class PacketValueConfig extends AppEngPacket { final Container c = player.openContainer; - if( this.Name.equals( "CustomName" ) && c instanceof AEBaseContainer ) - { - ( (AEBaseContainer) c ).setCustomName( this.Value ); - } - else if( this.Name.startsWith( "SyncDat." ) ) - { - ( (AEBaseContainer) c ).stringSync( Integer.parseInt( this.Name.substring( 8 ) ), this.Value ); - } - else if( this.Name.equals( "CraftingStatus" ) && this.Value.equals( "Clear" ) ) - { - final Screen gs = Minecraft.getInstance().currentScreen; - if( gs instanceof GuiCraftingCPU ) - { - ( (GuiCraftingCPU) gs ).clearItems(); - } - } - else if( c instanceof IConfigurableObject ) - { - final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager(); - - for( final Settings e : cm.getSettings() ) - { - if( e.name().equals( this.Name ) ) - { - final Enum def = cm.getSetting( e ); - - try - { - cm.putSetting( e, Enum.valueOf( def.getClass(), this.Value ) ); - } - catch( final IllegalArgumentException err ) - { - // :P - } - - break; - } - } - } +// FIXME if( this.Name.equals( "CustomName" ) && c instanceof AEBaseContainer ) +// FIXME { +// FIXME ( (AEBaseContainer) c ).setCustomName( this.Value ); +// FIXME } +// FIXME else if( this.Name.startsWith( "SyncDat." ) ) +// FIXME { +// FIXME ( (AEBaseContainer) c ).stringSync( Integer.parseInt( this.Name.substring( 8 ) ), this.Value ); +// FIXME } +// FIXME else if( this.Name.equals( "CraftingStatus" ) && this.Value.equals( "Clear" ) ) +// FIXME { +// FIXME final Screen gs = Minecraft.getInstance().currentScreen; +// FIXME if( gs instanceof GuiCraftingCPU ) +// FIXME { +// FIXME ( (GuiCraftingCPU) gs ).clearItems(); +// FIXME } +// FIXME } +// FIXME else if( c instanceof IConfigurableObject ) +// FIXME { +// FIXME final IConfigManager cm = ( (IConfigurableObject) c ).getConfigManager(); +// FIXME +// FIXME for( final Settings e : cm.getSettings() ) +// FIXME { +// FIXME if( e.name().equals( this.Name ) ) +// FIXME { +// FIXME final Enum def = cm.getSetting( e ); +// FIXME +// FIXME try +// FIXME { +// FIXME cm.putSetting( e, Enum.valueOf( def.getClass(), this.Value ) ); +// FIXME } +// FIXME catch( final IllegalArgumentException err ) +// FIXME { +// FIXME // :P +// FIXME } +// FIXME +// FIXME break; +// FIXME } +// FIXME } +// FIXME } } } diff --git a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java b/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java index f47b969fd..6bf02a1dc 100644 --- a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java +++ b/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java @@ -23,8 +23,8 @@ import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; import appeng.api.storage.data.IAEFluidStack; import appeng.core.AEConfig; @@ -56,9 +56,6 @@ public class FluidStackSizeRenderer final float inverseScaleFactor = 1.0f / scaleFactor; final int offset = AEConfig.instance().useTerminalUseLargeFont() ? 0 : -1; - final boolean unicodeFlag = fontRenderer.getUnicodeFlag(); - fontRenderer.setUnicodeFlag( false ); - if( aeStack.getStackSize() > 0 ) { final String stackSize = this.getToBeRenderedStackSize( aeStack.getStackSize() ); @@ -66,18 +63,16 @@ public class FluidStackSizeRenderer RenderSystem.disableLighting(); RenderSystem.disableDepthTest(); RenderSystem.disableBlend(); - GlStateManager.pushMatrix(); - GlStateManager.scale( scaleFactor, scaleFactor, scaleFactor ); + RenderSystem.pushMatrix(); + RenderSystem.scalef( scaleFactor, scaleFactor, scaleFactor ); final int X = (int) ( ( (float) xPos + offset + 16.0f - fontRenderer.getStringWidth( stackSize ) * scaleFactor ) * inverseScaleFactor ); final int Y = (int) ( ( (float) yPos + offset + 16.0f - 7.0f * scaleFactor ) * inverseScaleFactor ); fontRenderer.drawStringWithShadow( stackSize, X, Y, 16777215 ); - GlStateManager.popMatrix(); + RenderSystem.popMatrix(); RenderSystem.enableLighting(); RenderSystem.enableDepthTest(); RenderSystem.enableBlend(); } - - fontRenderer.setUnicodeFlag( unicodeFlag ); } } diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index f236445d1..877d74ba0 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -96,11 +96,11 @@ public class GridStorage implements IGridStorage public String getValue() { - final Grid currentGrid = (Grid) this.getGrid(); - if( currentGrid != null ) - { - currentGrid.saveState(); - } + // FIXME final Grid currentGrid = (Grid) this.getGrid(); + // FIXME if( currentGrid != null ) + // FIXME { + // FIXME currentGrid.saveState(); + // FIXME } try { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index b6970b3cd..c9a514510 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -46,8 +46,6 @@ import appeng.core.Api; import appeng.core.features.AEFeature; import appeng.core.stats.AeStats; import appeng.fluids.util.AEFluidStack; -import appeng.me.GridAccessException; -import appeng.me.GridNode; import appeng.util.helpers.ItemComparisonHelper; import appeng.util.item.AEItemStack;