aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/covers
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2022-04-18 11:16:31 -0700
committerGitHub <noreply@github.com>2022-04-18 20:16:31 +0200
commit44a1027dfa51af1864364c391e67686590ce347f (patch)
tree5f2fa25724841885d9e0cb721a7806812aca8016 /src/main/java/gregtech/common/covers
parentbb4cec9a73ec6c50199de6c48119ddd85e23b013 (diff)
downloadGT5-Unofficial-44a1027dfa51af1864364c391e67686590ce347f.tar.gz
GT5-Unofficial-44a1027dfa51af1864364c391e67686590ce347f.tar.bz2
GT5-Unofficial-44a1027dfa51af1864364c391e67686590ce347f.zip
Multitileentity precursor (#963)
* Refactors * Refactor CoverableTileEntity a bit more, pull out a CommonMetaTileEntity * Add an IDebugableTileEntity interface instead of checking various subclasses * Move more redstone related things to CoverableTileEntity * Add IGTENet * Final and dead code removal * Address a few comments, fix a few comments, remove some more dead code, and add some more finals. * fix bad rebase
Diffstat (limited to 'src/main/java/gregtech/common/covers')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java6
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java8
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java
index 592b6f322d..a227d3f530 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java
@@ -8,14 +8,16 @@ import net.minecraft.item.ItemStack;
public class GT_Cover_FacadeAE extends GT_Cover_FacadeBase {
@Override
protected Block getTargetBlock(ItemStack aFacadeStack) {
- Item item = aFacadeStack.getItem();
+ if(aFacadeStack == null) return null;
+ final Item item = aFacadeStack.getItem();
if (!(item instanceof IFacadeItem)) return null;
return ((IFacadeItem) item).getBlock(aFacadeStack);
}
@Override
protected int getTargetMeta(ItemStack aFacadeStack) {
- Item item = aFacadeStack.getItem();
+ if(aFacadeStack == null) return 0;
+ final Item item = aFacadeStack.getItem();
if (!(item instanceof IFacadeItem)) return 0;
return ((IFacadeItem) item).getMeta(aFacadeStack);
}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
index fa3c6624f8..17aafef79e 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
@@ -94,8 +94,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
@Override
public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) {
- aTileEntity.setCoverIDAtSide(aSide, GT_Utility.stackToInt(aCover));
- aTileEntity.setCoverDataAtSide(aSide, new FacadeData(GT_Utility.copyAmount(1, aCover), 0));
+ aTileEntity.setCoverIdAndDataAtSide(aSide, GT_Utility.stackToInt(aCover), new FacadeData(GT_Utility.copyAmount(1, aCover), 0));
if (aTileEntity.isClientSide())
GT_RenderingWorld.getInstance().register(aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord(), getTargetBlock(aCover), getTargetMeta(aCover));
}
@@ -111,7 +110,8 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
Block block = getTargetBlock(aCoverVariable.mStack);
if (block == null) return Textures.BlockIcons.ERROR_RENDERING[0];
// TODO: change this when *someone* made the block render in both pass
- if (block.getRenderBlockPass() != 0) return Textures.BlockIcons.ERROR_RENDERING[0];
+ if (block.getRenderBlockPass() != 0)
+ return Textures.BlockIcons.ERROR_RENDERING[0];
return TextureFactory.builder().setFromBlock(block, getTargetMeta(aCoverVariable.mStack)).useWorldCoord().setFromSide(ForgeDirection.getOrientation(aSide)).build();
}
@@ -207,7 +207,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
@Override
public NBTBase saveDataToNBT() {
NBTTagCompound tag = new NBTTagCompound();
- tag.setTag("mStack", mStack.writeToNBT(new NBTTagCompound()));
+ if(mStack != null) tag.setTag("mStack", mStack.writeToNBT(new NBTTagCompound()));
tag.setByte("mFlags", (byte) mFlags);
return tag;
}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 9492c8533d..457f27ae20 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -60,7 +60,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
if (fluid == null) return E;
final FluidStack sFluid = new FluidStack(fluid, 1000);
- return (String.format("Filtering Fluid: %s Mode: %s", sFluid.getLocalizedName(), getFilterMode(aCoverVariable.mFilterMode)));
+ return (String.format("Filtering Fluid: %s - %s", sFluid.getLocalizedName(), getFilterMode(aCoverVariable.mFilterMode)));
}
@Override