Skip to content

Commit bb71518

Browse files
authored
Merge pull request #500 from SymmetricDevs/tm/poly-tank
Make poly tank use dedicated texture
2 parents a551dce + 8e643d6 commit bb71518

File tree

9 files changed

+13
-10
lines changed

9 files changed

+13
-10
lines changed

src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public SusyTextures(){
9292
public static final OrientedOverlayRenderer STRAND_COOLER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/strand_cooler");
9393
public static final OrientedOverlayRenderer GAS_ATOMIZER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/gas_atomizer");
9494
public static final OrientedOverlayRenderer METALLURGICAL_CONVERTER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/metallurgical_converter");
95-
95+
public static final OrientedOverlayRenderer POLYMERIZATION_TANK_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/polymerization_tank");
9696

9797
public static final SimpleOverlayRenderer SILICON_CARBIDE_CASING = new SimpleOverlayRenderer("multiblock_casing/silicon_carbide_casing");
9898
public static final SimpleOverlayRenderer MONEL_500_CASING = new SimpleOverlayRenderer("multiblock_casing/monel_500_casing");

src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public class SuSyMetaTileEntities {
100100
public static SimpleMachineMetaTileEntity[] ZONE_REFINER;
101101
public static SimpleMachineMetaTileEntity[] TUBE_FURNACE;
102102
public static MetaTileEntityFluidizedBedReactor FLUIDIZED_BED_REACTOR;
103-
public static MetaTileEntityPolmyerizationTank POLYMERIZATION_TANK;
103+
public static MetaTileEntityPolymerizationTank POLYMERIZATION_TANK;
104104
public static MetaTileEntityElectrolyticCell ELECTROLYTIC_CELL;
105105

106106
// Machines for Oil Overhaul
@@ -278,7 +278,7 @@ public static void init() {
278278
registerSimpleMTE(TUBE_FURNACE, 12, 14720, "tube_furnace", SuSyRecipeMaps.TUBE_FURNACE_RECIPES, SusyTextures.TUBE_FURNACE_OVERLAY, true, GTUtility.defaultTankSizeFunction);
279279

280280
FLUIDIZED_BED_REACTOR = registerMetaTileEntity(14619, new MetaTileEntityFluidizedBedReactor(susyId("fluidized_bed_reactor")));
281-
POLYMERIZATION_TANK = registerMetaTileEntity(14620, new MetaTileEntityPolmyerizationTank(susyId("polymerization_tank")));
281+
POLYMERIZATION_TANK = registerMetaTileEntity(14620, new MetaTileEntityPolymerizationTank(susyId("polymerization_tank")));
282282
ELECTROLYTIC_CELL = registerMetaTileEntity(14634, new MetaTileEntityElectrolyticCell(susyId("electrolytic_cell")));
283283
GRAVITY_SEPARATOR = registerMetaTileEntity(15052, new MetaTileEntityGravitySeparator(susyId("gravity_separator")));
284284

src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolmyerizationTank.java renamed to src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityPolymerizationTank.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,34 @@
1919
import net.minecraft.item.ItemStack;
2020
import net.minecraft.util.ResourceLocation;
2121
import net.minecraft.world.World;
22+
import org.jetbrains.annotations.NotNull;
2223
import supersymmetry.api.recipes.SuSyRecipeMaps;
24+
import supersymmetry.client.renderer.textures.SusyTextures;
2325

2426
import javax.annotation.Nonnull;
2527
import javax.annotation.Nullable;
2628
import java.util.List;
2729

28-
public class MetaTileEntityPolmyerizationTank extends RecipeMapMultiblockController {
29-
public MetaTileEntityPolmyerizationTank(ResourceLocation metaTileEntityId) {
30+
public class MetaTileEntityPolymerizationTank extends RecipeMapMultiblockController {
31+
public MetaTileEntityPolymerizationTank(ResourceLocation metaTileEntityId) {
3032
super(metaTileEntityId, SuSyRecipeMaps.POLYMERIZATION_RECIPES);
3133
this.recipeMapWorkable = new MultiblockRecipeLogic(this, true);
3234
}
3335

3436
public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
35-
return new MetaTileEntityPolmyerizationTank(this.metaTileEntityId);
37+
return new MetaTileEntityPolymerizationTank(this.metaTileEntityId);
3638
}
3739

40+
@NotNull
3841
protected BlockPattern createStructurePattern() {
3942
return FactoryBlockPattern.start()
4043
.aisle("F F", "XXX", "XXX", "XXX", "XXX")
4144
.aisle(" ", "XPX", "XPX", "XPX", "XPX")
4245
.aisle("F F", "XSX", "XXX", "XXX", "XXX")
4346
.where('S', this.selfPredicate())
4447
.where('F', frames(Materials.Steel))
45-
.where('P', states(this.getPipeCasingState()))
46-
.where('X', states(this.getCasingState()).setMinGlobalLimited(18)
48+
.where('P', states(getPipeCasingState()))
49+
.where('X', states(getCasingState()).setMinGlobalLimited(18)
4750
.or(this.autoAbilities(true, true, true, true, true, true, false)))
4851
.build();
4952
}
@@ -59,13 +62,13 @@ protected static IBlockState getPipeCasingState() {
5962
return MetaBlocks.BOILER_CASING.getState(BoilerCasingType.STEEL_PIPE);
6063
}
6164

62-
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
65+
public void addInformation(ItemStack stack, @Nullable World player, @NotNull List<String> tooltip, boolean advanced) {
6366
super.addInformation(stack, player, tooltip, advanced);
6467
tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc", new Object[0]));
6568
}
6669

6770
@Nonnull
6871
protected ICubeRenderer getFrontOverlay() {
69-
return Textures.LARGE_CHEMICAL_REACTOR_OVERLAY;
72+
return SusyTextures.POLYMERIZATION_TANK_OVERLAY;
7073
}
7174
}
245 Bytes
Loading
267 Bytes
Loading
203 Bytes
Loading
217 Bytes
Loading
252 Bytes
Loading
203 Bytes
Loading

0 commit comments

Comments
 (0)