Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix-goodgen-controller-textures'…
Browse files Browse the repository at this point in the history
… into dev
  • Loading branch information
Dream-Master committed Dec 28, 2024
2 parents 28e2e1d + 948a316 commit b3cfb94
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
3 changes: 3 additions & 0 deletions src/main/java/goodgenerator/loader/Loaders.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.render.TextureFactory;
import kekztech.common.blocks.BlockTFFTStorageField;

public class Loaders {

Expand Down Expand Up @@ -518,6 +519,8 @@ public static void addTexturePage() {
.of(magneticFluxCasing, 0);
Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][10] = TextureFactory
.of(gravityStabilizationCasing, 0);
Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][127] = TextureFactory
.of(BlockTFFTStorageField.TFFTCasingIcon.INSTANCE);
}
}

Expand Down
10 changes: 0 additions & 10 deletions src/main/java/kekztech/common/blocks/BlockTFFTStorageField.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
import net.minecraft.util.ResourceLocation;

import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.IIconContainer;
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTUtility;
import kekztech.KekzCore;
import kekztech.common.itemBlocks.ItemBlockTFFTStorageField;
import kekztech.common.tileentities.MTETankTFFT;
Expand Down Expand Up @@ -47,13 +44,6 @@ public ResourceLocation getTextureFile() {
}
}

// I guess glodblock won't mind
static {
GTUtility.addTexturePage((byte) 12);
Textures.BlockIcons
.setCasingTexture((byte) 12, (byte) 127, TextureFactory.of(BlockTFFTStorageField.TFFTCasingIcon.INSTANCE));
}

private BlockTFFTStorageField() {
super(Material.iron);
}
Expand Down

0 comments on commit b3cfb94

Please sign in to comment.