Skip to content

add glowing texture for everything that should glow #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

add glowing texture for everything that should glow #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e41a191
glowing texture
kuzuanpa Jul 29, 2024
808f540
glowing texture for battery(only code change), burning boxes and magi…
kuzuanpa Jul 30, 2024
8eab45e
glowing texture for energy converters, transformers and storages
kuzuanpa Jul 31, 2024
05403f8
glowing texture for basic machines
kuzuanpa Sep 14, 2024
6af6384
codes for glowing texture of basic machines
kuzuanpa Sep 14, 2024
0c17060
rename things
kuzuanpa Sep 15, 2024
2aace4a
fix some missing and wrong texture
kuzuanpa Sep 15, 2024
1280a3a
fix
kuzuanpa Sep 15, 2024
3e1463e
fix
kuzuanpa Sep 15, 2024
2a0ee99
fix
kuzuanpa Sep 15, 2024
2dc00db
remove USE_GLOWING_TEXTURE
kuzuanpa Sep 27, 2024
2635318
empty texture for the remove of USE_GLOWING_TEXTURE
kuzuanpa Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 0 additions & 23 deletions .run/gregtech6 [assemble].run.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/main/java/gregapi/data/CS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,7 @@ public class CS {
, NBT_COLOR = "gt.color" // Integer
, NBT_PAINTED = "gt.painted" // Boolean
, NBT_TEXTURE = "gt.texture" // String
, NBT_USE_GLOWING_TEXTURE = "gt.texture.glowing" // Boolean
, NBT_DESIGNS = "gt.designs" // Number
, NBT_DESIGN = "gt.design" // Number
, NBT_GUI = "gt.gui" // String
Expand Down
46 changes: 33 additions & 13 deletions src/main/java/gregapi/tileentity/machines/MultiTileEntityBasicMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,19 @@ public class MultiTileEntityBasicMachine extends TileEntityBase09FacingSingle im
public byte mFluidInputs = 127, mFluidOutputs = 127, mFluidAutoInput = SIDE_UNDEFINED, mFluidAutoOutput = SIDE_UNDEFINED;
public short mEfficiency = 10000;
public int mParallel = 1;
public long mEnergy = 0, mInputMin = 16, mInput = 32, mInputMax = 64, mMinEnergy = 0, mOutputEnergy = 0, mChargeRequirement = 0;
public long mEnergy = 0, mInputMin = 16, mInput = 32, mInputMax = 64, mMinEnergy = 0, mOutputEnergy = 0, mOutputEnergyLast=0, mChargeRequirement = 0;
public TagData mEnergyTypeAccepted = TD.Energy.TU, mEnergyTypeEmitted = TD.Energy.QU, mEnergyTypeCharged = TD.Energy.TU;
public Recipe mLastRecipe = null, mCurrentRecipe = null;
public FluidTankGT[] mTanksInput = ZL_FT, mTanksOutput = ZL_FT;
public ItemStack[] mOutputItems = ZL_IS;
public FluidStack[] mOutputFluids = ZL_FS;
public IIconContainer[] mTexturesMaterial = L6_IICONCONTAINER, mTexturesInactive = L6_IICONCONTAINER, mTexturesActive = L6_IICONCONTAINER, mTexturesRunning = L6_IICONCONTAINER;
public IIconContainer[] mTexturesMaterial = L6_IICONCONTAINER, mTexturesInactive = L6_IICONCONTAINER, mTexturesActive = L6_IICONCONTAINER, mTexturesRunning = L6_IICONCONTAINER, mTexturesActiveGlow = L6_IICONCONTAINER, mTexturesRunningGlow = L6_IICONCONTAINER;

public String mGUITexture = "";
public RecipeMap mRecipes = RM.Furnace;
public long mProgress = 0, mMaxProgress = 0;
public boolean mSuccessful = F, mActive = F, mRunning = F;

@Override
public void readFromNBT2(NBTTagCompound aNBT) {
super.readFromNBT2(aNBT);
Expand Down Expand Up @@ -152,7 +152,7 @@ public void readFromNBT2(NBTTagCompound aNBT) {
if (aNBT.hasKey(NBT_ENERGY_EMITTED_SIDES)) mEnergyOutput = aNBT.getByte(NBT_ENERGY_EMITTED_SIDES);
if (aNBT.hasKey(NBT_OUTPUT)) mOutputEnergy = aNBT.getLong(NBT_OUTPUT);
if (aNBT.hasKey(NBT_INPUT_EU)) mChargeRequirement = aNBT.getLong(NBT_INPUT_EU);

long tCapacity = 1000;
if (aNBT.hasKey(NBT_TANK_CAPACITY)) tCapacity = UT.Code.bindInt(aNBT.getLong(NBT_TANK_CAPACITY));
mTanksInput = new FluidTankGT[mRecipes.mInputFluidCount];
Expand Down Expand Up @@ -200,15 +200,35 @@ public void readFromNBT2(NBTTagCompound aNBT) {
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running/front"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running/right"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running/back")};

mTexturesActiveGlow = new IIconContainer[] {
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/bottom"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/top"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/left"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/front"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/right"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_active_glowing/back")};
mTexturesRunningGlow = new IIconContainer[] {
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/bottom"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/top"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/left"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/front"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/right"),
new Textures.BlockIcons.CustomIcon("machines/basicmachines/"+tTextureName+"/overlay_running_glowing/back")};

} else {
TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
if (tCanonicalTileEntity instanceof MultiTileEntityBasicMachine) {
mTexturesMaterial = ((MultiTileEntityBasicMachine)tCanonicalTileEntity).mTexturesMaterial;
mTexturesInactive = ((MultiTileEntityBasicMachine)tCanonicalTileEntity).mTexturesInactive;
mTexturesRunning = ((MultiTileEntityBasicMachine)tCanonicalTileEntity).mTexturesRunning;
mTexturesActive = ((MultiTileEntityBasicMachine)tCanonicalTileEntity).mTexturesActive;
mTexturesMaterial = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesMaterial;
mTexturesInactive = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesInactive;
mTexturesRunning = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesRunning;
mTexturesActive = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesActive;

mTexturesRunningGlow = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesRunningGlow;
mTexturesActiveGlow = ((MultiTileEntityBasicMachine) tCanonicalTileEntity).mTexturesActiveGlow;

} else {
mTexturesMaterial = mTexturesInactive = mTexturesRunning = mTexturesActive = L6_IICONCONTAINER;
mTexturesMaterial = mTexturesInactive = mTexturesRunning = mTexturesActive =mTexturesActiveGlow =mTexturesRunningGlow = L6_IICONCONTAINER;
}
}
}
Expand Down Expand Up @@ -458,7 +478,7 @@ public void onTick2(long aTimer, boolean aIsServerSide) {
doWork(aTimer);

if (mTimer % 600 == 5 && mRunning) doDefaultStructuralChecks();

for (int i = 0; i < mTanksInput .length; i++) slot(mRecipes.mInputItemsCount + mRecipes.mOutputItemsCount + 1 + i , FL.display(mTanksInput [i], T, T));
for (int i = 0; i < mTanksOutput.length; i++) slot(mRecipes.mInputItemsCount + mRecipes.mOutputItemsCount + 1 + i + mTanksInput.length , FL.display(mTanksOutput[i], T, T));
}
Expand Down Expand Up @@ -503,7 +523,7 @@ public long doInject(TagData aEnergyType, byte aSide, long aSize, long aAmount,
}
return 0;
}

@Override public boolean isEnergyType (TagData aEnergyType, byte aSide, boolean aEmitting) {return aEmitting ? aEnergyType == mEnergyTypeEmitted : aEnergyType == mEnergyTypeAccepted || aEnergyType == mEnergyTypeCharged;}
@Override public boolean isEnergyAcceptingFrom (TagData aEnergyType, byte aSide, boolean aTheoretical) {return (aTheoretical || !mStopped) && FACE_CONNECTED[FACING_ROTATIONS[mFacing][aSide]][mEnergyInputs] && super.isEnergyAcceptingFrom(aEnergyType, aSide, aTheoretical);}
@Override public boolean isEnergyEmittingTo (TagData aEnergyType, byte aSide, boolean aTheoretical) {return (aTheoretical || !mStopped) && (SIDES_INVALID[mEnergyOutput] || FACING_ROTATIONS[mFacing][aSide]==mEnergyOutput) && super.isEnergyEmittingTo (aEnergyType, aSide, aTheoretical);}
Expand Down Expand Up @@ -853,7 +873,7 @@ public boolean doActive(long aTimer, long aEnergy) {
((ITileEntityAdjacentInventoryUpdatable)tDelegator.mTileEntity).adjacentInventoryUpdated(tDelegator.mSideOfTileEntity, this);
}
}

onProcessFinished();
}
}
Expand Down Expand Up @@ -1008,7 +1028,7 @@ public void onProcessFinished() {/**/}
@Override public void setVisualData(byte aData) {mRunning=((aData&2)!=0); mActive=((aData&1)!=0);}
@Override public byte getDefaultSide() {return SIDE_FRONT;}
@Override public boolean[] getValidSides() {return mActive ? SIDES_THIS[mFacing] : SIDES_HORIZONTAL;}
@Override public ITexture getTexture2(Block aBlock, int aRenderPass, byte aSide, boolean[] aShouldSideBeRendered) {return aShouldSideBeRendered[aSide] ? BlockTextureMulti.get(BlockTextureDefault.get(mTexturesMaterial[FACING_ROTATIONS[mFacing][aSide]], mRGBa), BlockTextureDefault.get((mActive||worldObj==null?mTexturesActive:mRunning?mTexturesRunning:mTexturesInactive)[FACING_ROTATIONS[mFacing][aSide]])) : null;}
@Override public ITexture getTexture2(Block aBlock, int aRenderPass, byte aSide, boolean[] aShouldSideBeRendered) {return aShouldSideBeRendered[aSide] ? BlockTextureMulti.get(BlockTextureDefault.get(mTexturesMaterial[FACING_ROTATIONS[mFacing][aSide]], mRGBa), BlockTextureDefault.get( (mActive||worldObj==null?mTexturesActive:mRunning?mTexturesRunning:mTexturesInactive) [FACING_ROTATIONS[mFacing][aSide]]), (mActive||mRunning) ? BlockTextureDefault.get( (mActive||worldObj==null?mTexturesActiveGlow:mTexturesRunningGlow)[FACING_ROTATIONS[mFacing][aSide]],true) : null ) : null;}

@Override public boolean canSave(int aSlot) {return !IL.Display_Fluid.equal(slot(aSlot), T, T);}
@Override public boolean hasWork() {return mMaxProgress > 0 || mChargeRequirement > 0;}
Expand Down
Loading