diff options
Diffstat (limited to 'src/main/java/gregtech/api/multitileentity')
7 files changed, 59 insertions, 14 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java index 13d2385381..7129fd0aab 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java @@ -322,6 +322,7 @@ public class MultiTileEntityBlock extends Block implements IDebugableBlock, ITil @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { + // TODO: MTE(Texture) return null; } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java index feb2a0a0f5..852ffa3c8e 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java @@ -103,6 +103,7 @@ public class MultiTileEntityBlockInternal extends Block implements IRenderedBloc @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { + // TODO: MTE(Texture) return null; } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java index ba5938769c..e6740a0663 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java @@ -1,11 +1,11 @@ package gregtech.api.multitileentity; import gregtech.api.enums.Materials; -import gregtech.api.multitileentity.interfaces.IMultiTileEntity; +import gregtech.api.multitileentity.base.BaseMultiTileEntity; import gregtech.api.util.GT_Util; import net.minecraft.block.material.Material; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Tuple; import java.lang.ref.WeakReference; @@ -17,9 +17,9 @@ public class MultiTileEntityClassContainer { private String mCategoryName; public final short mID; - public Class<? extends TileEntity> mClass; + public Class<? extends BaseMultiTileEntity> mClass; public MultiTileEntityBlock mBlock; - public TileEntity mCanonicalTileEntity; + public BaseMultiTileEntity mCanonicalTileEntity; public NBTTagCompound mParameters; // These have defaults @@ -28,7 +28,7 @@ public class MultiTileEntityClassContainer { public boolean mHidden = false; - public MultiTileEntityClassContainer(MultiTileEntityRegistry aRegistry, int aID, Class<? extends TileEntity> aClass) { + public MultiTileEntityClassContainer(MultiTileEntityRegistry aRegistry, int aID, Class<? extends BaseMultiTileEntity> aClass) { /* Start the Builder */ mRegistry = new WeakReference<>(aRegistry); mID = (short) aID; @@ -44,7 +44,7 @@ public class MultiTileEntityClassContainer { mParameters.setInteger(NBT.COLOR, GT_Util.getRGBInt(Materials.get(mParameters.getString(NBT.MATERIAL)).getRGBA())); try {mCanonicalTileEntity = mClass.newInstance();} catch (Throwable e) {throw new IllegalArgumentException(e);} - if (mCanonicalTileEntity instanceof IMultiTileEntity) ((IMultiTileEntity) mCanonicalTileEntity).initFromNBT(mParameters, mID, (short) -1); + mCanonicalTileEntity.initFromNBT(mParameters, mID, (short) -1); return registry != null && registry.add(this.mLocalized, this.mCategoryName, this) != null; } @@ -79,6 +79,8 @@ public class MultiTileEntityClassContainer { return this; } + /* These methods are builder methods for commonly used NBT tags */ + public MultiTileEntityClassContainer material(Material aMaterial) { mParameters.setString(NBT.MATERIAL, aMaterial.toString()); return this; @@ -94,4 +96,10 @@ public class MultiTileEntityClassContainer { return this; } + public MultiTileEntityClassContainer setNBT(Tuple... aTags) { + /* Merge in arbitrary NBT tuples of (key, value). Useful for anything for which a custom method has not yet been exposed */ + mParameters = GT_Util.fuseNBT(mParameters, GT_Util.makeNBT(aTags)); + return this; + } + } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java index 3e05efaf70..0bb9af1daa 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java @@ -5,6 +5,7 @@ import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.multitileentity.base.BaseMultiTileEntity; import gregtech.api.multitileentity.interfaces.IMultiTileEntity; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Util; @@ -87,7 +88,7 @@ public class MultiTileEntityRegistry { return NAMED_REGISTRIES.get(aRegistryName); } - public MultiTileEntityClassContainer create(int aID, Class<? extends TileEntity> aClass) { + public MultiTileEntityClassContainer create(int aID, Class<? extends BaseMultiTileEntity> aClass) { return new MultiTileEntityClassContainer(this, aID, aClass); } @@ -115,7 +116,7 @@ public class MultiTileEntityRegistry { tFailed = true; } if (mRegistry.containsKey(aClassContainer.mID)) { - GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class Container uses occupied MetaData!"); + GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: Class Container uses occupied MetaData! (" + aClassContainer.mID + ")"); tFailed = true; } } @@ -132,7 +133,7 @@ public class MultiTileEntityRegistry { mRegistrations.add(aClassContainer); if (sRegisteredTileEntities.add(aClassContainer.mCanonicalTileEntity.getClass())) { - if (aClassContainer.mCanonicalTileEntity instanceof IMultiTileEntity) ((IMultiTileEntity)aClassContainer.mCanonicalTileEntity).onRegistrationFirst(this, aClassContainer.mID); + aClassContainer.mCanonicalTileEntity.onRegistrationFirst(this, aClassContainer.mID); } // // TODO: Recipe // if (aRecipe != null && aRecipe.length > 1) { diff --git a/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java index f479b8150f..96a04b6147 100644 --- a/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/base/BaseMultiTileEntity.java @@ -7,6 +7,8 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregtechWailaProvider; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; @@ -20,11 +22,14 @@ import gregtech.api.net.GT_Packet_New; import gregtech.api.net.GT_Packet_TileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.XSTR; +import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Util; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; +import gregtech.common.render.GT_MultiTexture; +import gregtech.common.render.GT_RenderedTexture; import gregtech.common.render.IRenderedBlock; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -53,17 +58,20 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import static gregtech.GT_Mod.GT_FML_LOGGER; +import static gregtech.api.enums.GT_Values.emptyIconContainerArray; import static gregtech.api.enums.GT_Values.NBT; import static gregtech.api.enums.GT_Values.OPOS; import static gregtech.api.enums.GT_Values.SIDE_WEST; import static gregtech.api.enums.GT_Values.VALID_SIDES; public abstract class BaseMultiTileEntity extends CoverableTileEntity implements IMultiTileEntity, IHasWorldObjectAndCoords, IRenderedBlock, IGregtechWailaProvider { + + public IIconContainer[] mTextures = emptyIconContainerArray, mTexturesFront = emptyIconContainerArray; + // Makes a Bounding Box without having to constantly specify the Offset Coordinates. protected static final float[] PX_BOX = {0, 0, 0, 1, 1, 1}; @@ -151,6 +159,21 @@ public abstract class BaseMultiTileEntity extends CoverableTileEntity implements readCoverNBT(aNBT); readMultiTileNBT(aNBT); + if(GregTech_API.sBlockIcons == null && aNBT.hasKey(NBT.TEXTURE)) { + // Loading the registry + final String textureName = aNBT.getString(NBT.TEXTURE); + mTextures = new IIconContainer[] { + new Textures.BlockIcons.CustomIcon("machines/multiblockparts/"+textureName+"/bottom"), + new Textures.BlockIcons.CustomIcon("machines/multiblockparts/"+textureName+"/top"), + new Textures.BlockIcons.CustomIcon("machines/multiblockparts/"+textureName+"/side"), + }; + } else { + // Loading an instance + final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID()); + if(tCanonicalTileEntity instanceof BaseMultiTileEntity) + mTextures = ((BaseMultiTileEntity)tCanonicalTileEntity).mTextures; + } + if (mCoverData == null || mCoverData.length != 6) mCoverData = new ISerializableObject[6]; if (mCoverSides.length != 6) mCoverSides = new int[]{0, 0, 0, 0, 0, 0}; if (mSidedRedstone.length != 6) mSidedRedstone = new byte[]{15, 15, 15, 15, 15, 15}; @@ -298,14 +321,21 @@ public abstract class BaseMultiTileEntity extends CoverableTileEntity implements final ITexture[] textureUncovered = getTexture(aBlock, aSide, true, aRenderPass); if (coverTexture != null) { - final ITexture[] textureCovered = Arrays.copyOf(textureUncovered, textureUncovered.length + 1); - textureCovered[textureUncovered.length] = coverTexture; - return textureCovered; + return new ITexture[]{ + GT_MultiTexture.get(textureUncovered), + coverTexture + }; } else { return textureUncovered; } } + @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { + // Top, bottom or side + aSide = (byte)Math.min(aSide, 2); + return new ITexture[]{TextureFactory.of(mTextures[aSide])}; + } + @Override public void setCustomName(String aName) { mCustomName = aName; diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index 41b6a74aef..3997b5af71 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -95,6 +95,7 @@ public class MultiTileBasicMachine extends BaseTickableMultiTileEntity { @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { + // TODO: MTE(Texture) return new ITexture[0]; } diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 9b5c76ef8f..e64ace1452 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -9,6 +9,7 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_CoverBehaviorBase; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; +import gregtech.common.render.GT_MultiTexture; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import net.minecraft.block.Block; @@ -188,7 +189,9 @@ public class MultiBlockPart extends BaseNontickableMultiTileEntity implements IM @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { - final ITexture baseTexture = MACHINE_CASINGS[1][2]; + // TODO: MTE(Texture) +// final ITexture baseTexture = MACHINE_CASINGS[1][2]; + final ITexture baseTexture = TextureFactory.of(super.getTexture(aBlock, aSide, isActive, aRenderPass)); if(mMode != 0 && aSide == mFacing) { if(mMode == getModeOrdinal(ITEM_IN)) return new ITexture[]{ baseTexture, TextureFactory.of(OVERLAY_PIPE_IN), TextureFactory.of(ITEM_IN_SIGN) }; |