Skip to content

Commit

Permalink
GT++ REMOVE 32x
Browse files Browse the repository at this point in the history
fix advanced large gas turbine defaulting to steel casing instead of hss-s casing
make xl turbines use turbine casing
remove duplicate qft textures
revert force field glass top texture (doesnt have occlusion so lazy solution was making it a blank texture :/ )
  • Loading branch information
BlueHero233 committed Sep 24, 2024
1 parent 8aec74a commit ac97445
Show file tree
Hide file tree
Showing 59 changed files with 16 additions and 86 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/common/blocks/BlockCasings8.java
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,6 @@ public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, in
}
}

return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ public SpecialCasingItemBlock(Block par1) {

@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
int aMeta = aStack.getItemDamage();
if (aMeta < 10) {
// aList.add("Tier: "+GT_Values.VN[aMeta]);
}
super.addInformation(aStack, aPlayer, aList, aF3_H);
}
}
Expand Down Expand Up @@ -97,9 +93,9 @@ public static IIcon getStaticIcon(final int ordinalSide, final byte aMeta) {
return switch (aMeta) {
case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon();
case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
case 2 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon();
case 3 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon();
case 4 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon();
case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon();
case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,25 @@ public ResourceLocation getTextureFile() {
// spotless:off
public static final CustomIcon Casing_Coil_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL");
public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon(
"NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic");
"qft/NeutronPulseManipulator") : new CustomIcon("qft/NeutronPulseManipulatorStatic");
public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon(
"CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic");
"qft/CosmicFabricManipulator") : new CustomIcon("qft/CosmicFabricManipulatorStatic");
public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon(
"InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic");
"qft/InfinityInfusedManipulator") : new CustomIcon("qft/InfinityInfusedManipulatorStatic");
public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon(
"SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic");
public static final CustomIcon Manipulator_Top = new CustomIcon("Manipulator_Top");
"qft/SpaceTimeContinuumRipper") : new CustomIcon("qft/SpaceTimeContinuumRipperStatic");
public static final CustomIcon Manipulator_Top = new CustomIcon("qft/Manipulator_Top");
public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon(
"NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic");
"qft/NeutronShieldingCore") : new CustomIcon("qft/NeutronShieldingCoreStatic");
public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon(
"CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic");
"qft/CosmicFabricShieldingCore") : new CustomIcon("qft/CosmicFabricShieldingCoreStatic");
public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon(
"InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic");
"qft/InfinityInfusedShieldingCore") : new CustomIcon("qft/InfinityInfusedShieldingCoreStatic");
public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon(
"SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic");
public static final CustomIcon ForceFieldGlass = new CustomIcon("ForceFieldGlass");
public static final CustomIcon ForceField = new CustomIcon("rendering/ForceField");
public static final CustomIcon Blank = new CustomIcon("Blank");
"qft/SpaceTimeBendingCore") : new CustomIcon("qft/SpaceTimeBendingCoreStatic");
public static final CustomIcon ForceFieldGlass = new CustomIcon("qft/ForceFieldGlass");
public static final CustomIcon ForceField = new CustomIcon("qft/ForceField");
public static final CustomIcon Blank = new CustomIcon("qft/Blank");
//spotless:on

// MACHINE_CASING_FARM_MANAGER_STRUCTURAL
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

Diff not rendered.

This file was deleted.

Diff not rendered.

0 comments on commit ac97445

Please sign in to comment.