fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java
+3 -3
View File
@@ -5,7 +5,7 @@ package appeng.fluids.client.gui;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.implementations.GuiUpgradeable;
import appeng.client.gui.widgets.GuiTabButton;
@@ -25,9 +25,9 @@ public class GuiFluidFormationPlane extends GuiUpgradeable
private final PartFluidFormationPlane plane;
private GuiTabButton priority;
public GuiFluidFormationPlane( InventoryPlayer inventoryPlayer, PartFluidFormationPlane te )
public GuiFluidFormationPlane( PlayerInventory PlayerInventory, PartFluidFormationPlane te )
{
super( new ContainerFluidFormationPlane( inventoryPlayer, te ) );
super( new ContainerFluidFormationPlane( PlayerInventory, te ) );
this.ySize = 251;
this.plane = te;
}
src/main/java/appeng/fluids/client/gui/GuiFluidIO.java
+3 -3
View File
@@ -19,7 +19,7 @@
package appeng.fluids.client.gui;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.implementations.GuiUpgradeable;
import appeng.core.localization.GuiText;
@@ -40,9 +40,9 @@ public class GuiFluidIO extends GuiUpgradeable
{
private final PartSharedFluidBus bus;
public GuiFluidIO( InventoryPlayer inventoryPlayer, PartSharedFluidBus te )
public GuiFluidIO( PlayerInventory PlayerInventory, PartSharedFluidBus te )
{
super( new ContainerFluidIO( inventoryPlayer, te ) );
super( new ContainerFluidIO( PlayerInventory, te ) );
this.bus = te;
}
src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java
+2 -2
View File
@@ -22,7 +22,7 @@ package appeng.fluids.client.gui;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.client.gui.implementations.GuiUpgradeable;
import appeng.client.gui.widgets.GuiTabButton;
@@ -45,7 +45,7 @@ public class GuiFluidInterface extends GuiUpgradeable
private final IFluidInterfaceHost host;
private GuiTabButton priority;
public GuiFluidInterface( final InventoryPlayer ip, final IFluidInterfaceHost te )
public GuiFluidInterface( final PlayerInventory ip, final IFluidInterfaceHost te )
{
super( new ContainerFluidInterface( ip, te ) );
this.ySize = 231;
src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java
+3 -3
View File
@@ -5,7 +5,7 @@ package appeng.fluids.client.gui;
import java.io.IOException;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
@@ -36,9 +36,9 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable
private GuiButton minus100;
private GuiButton minus1000;
public GuiFluidLevelEmitter( final InventoryPlayer inventoryPlayer, final PartFluidLevelEmitter te )
public GuiFluidLevelEmitter( final PlayerInventory PlayerInventory, final PartFluidLevelEmitter te )
{
super( new ContainerFluidLevelEmitter( inventoryPlayer, te ) );
super( new ContainerFluidLevelEmitter( PlayerInventory, te ) );
this.levelEmitter = te;
}
src/main/java/appeng/fluids/client/gui/GuiFluidStorageBus.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import appeng.api.config.AccessRestriction;
import appeng.api.config.ActionItems;
@@ -62,9 +62,9 @@ public class GuiFluidStorageBus extends GuiUpgradeable
private GuiImgButton clear;
private final PartFluidStorageBus bus;
public GuiFluidStorageBus( InventoryPlayer inventoryPlayer, PartFluidStorageBus te )
public GuiFluidStorageBus( PlayerInventory PlayerInventory, PartFluidStorageBus te )
{
super( new ContainerFluidStorageBus( inventoryPlayer, te ) );
super( new ContainerFluidStorageBus( PlayerInventory, te ) );
this.ySize = 251;
this.bus = te;
}
src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java
+4 -4
View File
@@ -29,7 +29,7 @@ import java.util.Locale;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.ClickType;
import net.minecraft.inventory.Slot;
import net.minecraft.util.text.TextFormatting;
@@ -81,12 +81,12 @@ public class GuiFluidTerminal extends AEBaseMEGui implements ISortSource, IConfi
private GuiImgButton sortByBox;
private GuiImgButton sortDirBox;
public GuiFluidTerminal( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiFluidTerminal( final PlayerInventory PlayerInventory, final ITerminalHost te )
{
this( inventoryPlayer, te, new ContainerFluidTerminal( inventoryPlayer, te ) );
this( PlayerInventory, te, new ContainerFluidTerminal( PlayerInventory, te ) );
}
public GuiFluidTerminal( InventoryPlayer inventoryPlayer, final ITerminalHost te, final ContainerFluidTerminal c )
public GuiFluidTerminal( PlayerInventory PlayerInventory, final ITerminalHost te, final ContainerFluidTerminal c )
{
super( c );
this.terminal = te;
src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java
+2 -2
View File
@@ -8,7 +8,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -59,7 +59,7 @@ public class GuiFluidSlot extends GuiCustomSlot
}
@Override
public boolean canClick( final EntityPlayer player )
public boolean canClick( final PlayerEntity player )
{
final ItemStack mouseStack = player.inventory.getItemStack();
return mouseStack.isEmpty() || mouseStack.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null );
src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java
+3 -3
View File
@@ -24,8 +24,8 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.util.AEColor;
@@ -33,7 +33,7 @@ import appeng.client.gui.widgets.ITooltip;
import appeng.fluids.util.IAEFluidTank;
@SideOnly( Side.CLIENT )
@OnlyIn( Dist.CLIENT )
public class GuiFluidTank extends GuiButton implements ITooltip
{
private final IAEFluidTank tank;