Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
Dream-Master authored Jan 25, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 600d10b + 4714e09 commit 7323aa0
Showing 113 changed files with 2,891 additions and 3,978 deletions.
Original file line number Diff line number Diff line change
@@ -74,5 +74,6 @@ public class GoodGeneratorRecipeMaps {
.dontUseProgressBar()
.addSpecialTexture(70, 11, 72, 40, GGUITextures.PICTURE_COMPONENT_ASSLINE)
.frontend(ComponentAssemblyLineFrontend::new)
.disableOptimize()
.build();
}
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.logic.ProcessingLogic;
import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
@@ -268,17 +267,16 @@ public boolean supportsVoidProtection() {
}

@Override
@SuppressWarnings("ALL")
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
int colorIndex, boolean aActive, boolean aRedstone) {
if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179),
new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder()
TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder()
.addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW)
.glow()
.build() };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179),
new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder()
TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder()
.addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW)
.glow()
.build() };
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@
import gregtech.api.metatileentity.implementations.MTEHatch;
import gregtech.api.metatileentity.implementations.MTEHatchDynamo;
import gregtech.api.metatileentity.implementations.MTEHatchInput;
import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.objects.XSTR;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
@@ -479,17 +478,16 @@ protected MultiblockTooltipBuilder createTooltip() {
}

@Override
@SuppressWarnings("ALL")
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
int colorIndex, boolean aActive, boolean aRedstone) {
if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536),
new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder()
TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder()
.addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW)
.glow()
.build() };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536),
new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) };
TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) };
}
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536) };
}
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@
import gregtech.api.metatileentity.implementations.MTEHatchInput;
import gregtech.api.metatileentity.implementations.MTEHatchMaintenance;
import gregtech.api.metatileentity.implementations.MTEHatchOutput;
import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResult;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
@@ -439,17 +438,16 @@ protected MultiblockTooltipBuilder createTooltip() {
}

@Override
@SuppressWarnings("ALL")
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
int colorIndex, boolean aActive, boolean aRedstone) {
if (side == facing) {
if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44),
new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), TextureFactory.builder()
TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), TextureFactory.builder()
.addIcon(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW)
.glow()
.build() };
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44),
new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) };
TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) };
}
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44) };
}
Loading

0 comments on commit 7323aa0

Please sign in to comment.