Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit 047b7d0

Browse files
committed
Change casings
1 parent f96cced commit 047b7d0

File tree

10 files changed

+23
-26
lines changed

10 files changed

+23
-26
lines changed

src/main/java/net/htmlcsjs/htmlTech/api/materials/HTMaterials.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import gregtech.api.unification.material.properties.PropertyKey;
77

88
import static gregtech.api.unification.material.Materials.*;
9-
import static gregtech.api.unification.material.info.MaterialFlags.DECOMPOSITION_BY_ELECTROLYZING;
10-
import static gregtech.api.unification.material.info.MaterialFlags.GENERATE_FOIL;
9+
import static gregtech.api.unification.material.info.MaterialFlags.*;
1110
import static gregtech.api.unification.material.info.MaterialIconSet.SHINY;
1211

1312
public class HTMaterials {
@@ -36,14 +35,15 @@ public static void register() {
3635
.toolStats(128, 50, 2621440, 128)
3736
.build();
3837

39-
// Adding Flags to Materials
38+
// Adding Properties to Materials
4039
Diamond.setProperty(LASER, new LaserProperties((int) GTValues.V[5], 128, 2));
4140
Ruby.setProperty(LASER, new LaserProperties((int) GTValues.V[6], 256, 2));
4241

42+
// Adding Flags to Materials
4343
Protactinium.setHidden(false);
4444
Flerovium.setHidden(false);
45-
4645
RhodiumPlatedPalladium.addFlags(GENERATE_FOIL);
46+
Trinium.addFlags(GENERATE_FRAME);
4747
}
4848

4949
public static void init() {

src/main/java/net/htmlcsjs/htmlTech/client/HTTextures.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public class HTTextures {
1818
public static ResourceLocation HTMLTECH_CAPE;
1919
public static SimpleOverlayRenderer LASER_INPUT;
2020
public static SimpleOverlayRenderer LASER_OUTPUT;
21-
public static SimpleOverlayRenderer FLOPPA_CASING;
21+
public static SimpleOverlayRenderer NAQ_ALLOY_CASING;
2222

2323
public static void preInit() {
2424
LASER_INPUT = new SimpleOverlayRenderer("overlay/machine/overlay_laser_in");
2525
LASER_OUTPUT = new SimpleOverlayRenderer("overlay/machine/overlay_laser_out");
2626
HTMLTECH_CAPE = new ResourceLocation(HtmlTech.MODID, "textures/htmltech_cape.png");
27-
FLOPPA_CASING = new SimpleOverlayRenderer("casings/floppa_casing");
27+
NAQ_ALLOY_CASING = new SimpleOverlayRenderer("casings/naq_alloy_casing");
2828
LASER_PROJECTOR_OVERLAY = new OrientedOverlayRenderer("overlay/multi/laser_projector", FRONT);
2929
LASER_COLLECTOR_OVERLAY = new OrientedOverlayRenderer("overlay/multi/laser_collector", FRONT);
3030
LASER_REFLECTOR_OVERLAY = new OrientedOverlayRenderer("overlay/multi/laser_reflector", FRONT);

src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public BlockHTCasing() {
2020
this.setResistance(10.0F);
2121
this.setSoundType(SoundType.METAL);
2222
this.setHarvestLevel("pickaxe", 2);
23-
this.setDefaultState(this.getState(CasingType.PBI_CASING));
23+
this.setDefaultState(this.getState(CasingType.NAQ_ALLOY_CASING));
2424
}
2525

2626
@Override
@@ -29,7 +29,7 @@ public boolean canCreatureSpawn(@Nonnull IBlockState state, @Nonnull IBlockAcces
2929
}
3030

3131
public enum CasingType implements IStringSerializable {
32-
PBI_CASING("pbi_casing");
32+
NAQ_ALLOY_CASING("naq_alloy_casing");
3333

3434
private final String name;
3535

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/MetaTileEntityLaserCollector.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import gregtech.api.pattern.FactoryBlockPattern;
1616
import gregtech.api.util.GTUtility;
1717
import gregtech.client.renderer.ICubeRenderer;
18+
import gregtech.client.renderer.texture.Textures;
19+
import gregtech.common.blocks.BlockMetalCasing;
1820
import gregtech.common.blocks.BlockWireCoil;
1921
import gregtech.common.blocks.MetaBlocks;
2022
import net.htmlcsjs.htmlTech.api.capability.ILaserContainer;
2123
import net.htmlcsjs.htmlTech.api.capability.LaserContainerList;
2224
import net.htmlcsjs.htmlTech.api.metatileentity.multiblock.HTMultiblockWithDisplayBase;
2325
import net.htmlcsjs.htmlTech.client.HTTextures;
24-
import net.htmlcsjs.htmlTech.common.blocks.BlockHTCasing;
25-
import net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks;
2626
import net.htmlcsjs.htmlTech.common.metatileentity.multiblock.multiblockpart.HTMultiblockAbility;
2727
import net.minecraft.block.state.IBlockState;
2828
import net.minecraft.client.resources.I18n;
@@ -93,7 +93,7 @@ private void resetTileAbilities() {
9393

9494
@Override
9595
public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
96-
return HTTextures.FLOPPA_CASING;
96+
return Textures.ROBUST_HSSE_CASING;
9797
}
9898

9999
@Override
@@ -103,7 +103,7 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHo
103103

104104
@Nullable
105105
protected IBlockState getCasingState() {
106-
return HTMetaBlocks.HT_CASING.getState(BlockHTCasing.CasingType.PBI_CASING);
106+
return MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.HSSE_STURDY);
107107
}
108108

109109
@Nonnull

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/MetaTileEntityLaserProjector.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import gregtech.api.pattern.FactoryBlockPattern;
1616
import gregtech.api.util.GTUtility;
1717
import gregtech.client.renderer.ICubeRenderer;
18-
import gregtech.client.renderer.texture.Textures;
19-
import gregtech.common.blocks.BlockMetalCasing;
2018
import gregtech.common.blocks.BlockWireCoil;
2119
import gregtech.common.blocks.MetaBlocks;
2220
import net.htmlcsjs.htmlTech.api.capability.ILaserContainer;
2321
import net.htmlcsjs.htmlTech.api.capability.LaserContainerList;
2422
import net.htmlcsjs.htmlTech.api.metatileentity.multiblock.HTMultiblockWithDisplayBase;
2523
import net.htmlcsjs.htmlTech.client.HTTextures;
24+
import net.htmlcsjs.htmlTech.common.blocks.BlockHTCasing;
25+
import net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks;
2626
import net.htmlcsjs.htmlTech.common.metatileentity.multiblock.multiblockpart.HTMultiblockAbility;
2727
import net.minecraft.block.state.IBlockState;
2828
import net.minecraft.client.resources.I18n;
@@ -92,7 +92,7 @@ private void resetTileAbilities() {
9292

9393
@Override
9494
public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
95-
return Textures.INERT_PTFE_CASING;
95+
return HTTextures.NAQ_ALLOY_CASING;
9696
}
9797

9898
@Override
@@ -101,7 +101,7 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHo
101101
}
102102

103103
protected IBlockState getCasingState() {
104-
return MetaBlocks.METAL_CASING.getState(BlockMetalCasing.MetalCasingType.PTFE_INERT_CASING);
104+
return HTMetaBlocks.HT_CASING.getState(BlockHTCasing.CasingType.NAQ_ALLOY_CASING);
105105
}
106106

107107
@Nonnull

src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/LaserEquipmentLoader.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package net.htmlcsjs.htmlTech.loaders.recipe;
22

33
import gregtech.api.recipes.ingredients.IntCircuitIngredient;
4-
import gregtech.common.blocks.BlockMetalCasing;
5-
import gregtech.common.blocks.MetaBlocks;
64
import net.htmlcsjs.htmlTech.common.blocks.BlockHTCasing;
75

86
import static gregtech.api.GTValues.*;
97
import static gregtech.api.recipes.RecipeMaps.ASSEMBLER_RECIPES;
108
import static gregtech.api.unification.material.Materials.*;
11-
import static gregtech.api.unification.ore.OrePrefix.foil;
12-
import static gregtech.api.unification.ore.OrePrefix.wireFine;
9+
import static gregtech.api.unification.ore.OrePrefix.*;
1310
import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.HT_CASING;
1411
import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.LASER_PIPES;
1512

@@ -28,10 +25,10 @@ public static void init() {
2825

2926
ASSEMBLER_RECIPES.recipeBuilder()
3027
.EUt(16)
31-
.inputs(MetaBlocks.METAL_CASING.getItemVariant(BlockMetalCasing.MetalCasingType.ALUMINIUM_FROSTPROOF))
32-
.fluidInputs(Polybenzimidazole.getFluid(L))
28+
.input(plate, NaquadahAlloy, 6)
29+
.input(frameGt, Trinium)
3330
.notConsumable(new IntCircuitIngredient(6))
34-
.outputs(HT_CASING.getItemVariant(BlockHTCasing.CasingType.PBI_CASING))
31+
.outputs(HT_CASING.getItemVariant(BlockHTCasing.CasingType.NAQ_ALLOY_CASING))
3532
.duration(50)
3633
.buildAndRegister();
3734

244 Bytes
Loading
Binary file not shown.

src/main/resources/assets/htmltech/blockstates/casing.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
},
99
"variants": {
1010
"variant": {
11-
"pbi_casing": {
11+
"naq_alloy_casing": {
1212
"textures": {
13-
"all": "gregtech:blocks/casings/pbi_casing"
13+
"all": "gregtech:blocks/casings/naq_alloy_casing"
1414
}
1515
}
1616
}

src/main/resources/assets/htmltech/lang/en_us.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ htmltech.machine.laser_input_hatch.umv.name=UMV Laser Collecting Hatch
2828
htmltech.machine.laser_input_hatch.uxv.name=UXV Laser Collecting Hatch
2929
htmltech.machine.laser_input_hatch.max.name=MAX Laser Collecting Hatch
3030

31-
tile.htmltech_casing.pbi_casing.name=Heatproof Polybenzimidazole Coated Casing
31+
tile.htmltech_casing.naq_alloy_casing.name=Resistant Naquadah Alloy
3232

3333
item.material.oreprefix.laser=%s Laser
3434
material.floppa=FlOPPa

0 commit comments

Comments
 (0)