diff --git a/dependencies.gradle b/dependencies.gradle index 1cf0236c..7273b20a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,6 +45,11 @@ dependencies { implementation rfg.deobf("curse.maven:ulv-covers-635555:4912949") compileOnly rfg.deobf("curse.maven:nomi-labs-932060:5677263") + compileOnly rfg.deobf("curse.maven:thermal-foundation-222880:2926428") + //implementation rfg.deobf("curse.maven:cofh-world-271384:2920434") + //implementation rfg.deobf("curse.maven:cofh-core-69162:2920433") + //implementation rfg.deobf("curse.maven:redstone-flux-270789:2920436") + //For easier testing runtimeOnlyNonPublishable("curse.maven:nae2-884359:5380800") runtimeOnlyNonPublishable("curse.maven:spark-361579:3542217") diff --git a/src/main/java/com/zorbatron/zbgt/api/ZBGTAPI.java b/src/main/java/com/zorbatron/zbgt/api/ZBGTAPI.java index eabb9b56..f0b1496c 100644 --- a/src/main/java/com/zorbatron/zbgt/api/ZBGTAPI.java +++ b/src/main/java/com/zorbatron/zbgt/api/ZBGTAPI.java @@ -1,6 +1,7 @@ package com.zorbatron.zbgt.api; import net.minecraft.block.state.IBlockState; +import net.minecraftforge.fluids.FluidStack; import com.zorbatron.zbgt.api.util.ZBGTMods; import com.zorbatron.zbgt.common.ZBGTConfig; @@ -29,4 +30,7 @@ public class ZBGTAPI { public static final BaseCreativeTab TAB_ZBGT = new BaseCreativeTab("ZBGT", () -> ZBGTMetaItems.ZBGT_ITEM.getStackForm(), false); + + public static FluidStack pyrotheum; + public static FluidStack cryotheum; } diff --git a/src/main/java/com/zorbatron/zbgt/api/metatileentity/ZBGTMultiblockAbilities.java b/src/main/java/com/zorbatron/zbgt/api/metatileentity/ZBGTMultiblockAbilities.java new file mode 100644 index 00000000..f8de0677 --- /dev/null +++ b/src/main/java/com/zorbatron/zbgt/api/metatileentity/ZBGTMultiblockAbilities.java @@ -0,0 +1,12 @@ +package com.zorbatron.zbgt.api.metatileentity; + +import net.minecraftforge.fluids.IFluidTank; + +import gregtech.api.metatileentity.multiblock.MultiblockAbility; + +@SuppressWarnings("InstantiationOfUtilityClass") +public class ZBGTMultiblockAbilities { + + public static final MultiblockAbility PYROTHEUM_HATCH = new MultiblockAbility<>("pyrotheum_hatch"); + public static final MultiblockAbility CRYOTHEUM_HATCH = new MultiblockAbility<>("cryotheum_hatch"); +} diff --git a/src/main/java/com/zorbatron/zbgt/api/render/ZBGTTextures.java b/src/main/java/com/zorbatron/zbgt/api/render/ZBGTTextures.java index 9b87fec2..3415dc2d 100644 --- a/src/main/java/com/zorbatron/zbgt/api/render/ZBGTTextures.java +++ b/src/main/java/com/zorbatron/zbgt/api/render/ZBGTTextures.java @@ -14,6 +14,7 @@ public class ZBGTTextures { public static SimpleOverlayRenderer SWIRLY_INFINITY; public static SimpleOverlayRenderer YOTTANK_ME_HATCH; public static SimpleOverlayRenderer MAINTENANCE_OVERLAY_STERILE; + public static SimpleOverlayRenderer FLUID_INPUT_BLACK; // GUI overlays public static TextureArea ITEM_FLUID_OVERLAY; @@ -38,12 +39,16 @@ public class ZBGTTextures { public static ICubeRenderer YOTTANK_CASING; + public static SimpleOverlayRenderer VOLCANUS_CASING; + public static SimpleOverlayRenderer CRYOGENIC_CASING; + public static void preInit() { WATER_OVERLAY_INFINITY = new SimpleOverlayRenderer("overlay/machine/water_infinity"); ITEM_OVERLAY_INFINITY = new SimpleOverlayRenderer("overlay/machine/item_infinity"); SWIRLY_INFINITY = new SimpleOverlayRenderer("overlay/machine/swirly_infinity"); YOTTANK_ME_HATCH = new SimpleOverlayRenderer("overlay/machine/yottank_me_hatch"); MAINTENANCE_OVERLAY_STERILE = new SimpleOverlayRenderer("overlay/machine/overlay_maintenance_sterile"); + FLUID_INPUT_BLACK = new SimpleOverlayRenderer("overlay/machine/fluid_input_black"); ITEM_FLUID_OVERLAY = TextureArea.fullImage("textures/gui/widget/item_fluid.png"); AUTO_PULL = TextureArea.fullImage("textures/gui/widget/auto_pull.png"); @@ -64,6 +69,9 @@ public static void preInit() { IRIDIUM_CASING = new SimpleOverlayRenderer("casings/material/iridium"); YOTTANK_CASING = new SidedCubeRenderer("casings/yottank"); + + VOLCANUS_CASING = new SimpleOverlayRenderer("casings/misc/volcanus"); + CRYOGENIC_CASING = new SimpleOverlayRenderer("casings/misc/cryogenic"); } public static SimpleOverlayRenderer getPrassTextureByTier(int tier) { diff --git a/src/main/java/com/zorbatron/zbgt/api/unification/material/ZBGTMaterials.java b/src/main/java/com/zorbatron/zbgt/api/unification/material/ZBGTMaterials.java index 2522e05e..42d92653 100644 --- a/src/main/java/com/zorbatron/zbgt/api/unification/material/ZBGTMaterials.java +++ b/src/main/java/com/zorbatron/zbgt/api/unification/material/ZBGTMaterials.java @@ -26,6 +26,7 @@ public final class ZBGTMaterials { public static Material Luminessence; public static Material EglinSteelBase; public static Material Inconel792; + public static Material SnowPowder; // Second degree materials public static Material MAR_CE_M200; @@ -48,6 +49,10 @@ public final class ZBGTMaterials { public static Material EnergeticAlloy; public static Material VibrantAlloy; + public static Material Blizz; + public static Material Pyrotheum; + public static Material Cryotheum; + // Unknown Composition Materials public static Material SpecialCeramics; diff --git a/src/main/java/com/zorbatron/zbgt/api/unification/material/info/ZBGTMaterialIconSet.java b/src/main/java/com/zorbatron/zbgt/api/unification/material/info/ZBGTMaterialIconSet.java new file mode 100644 index 00000000..83b3c49a --- /dev/null +++ b/src/main/java/com/zorbatron/zbgt/api/unification/material/info/ZBGTMaterialIconSet.java @@ -0,0 +1,8 @@ +package com.zorbatron.zbgt.api.unification.material.info; + +import gregtech.api.unification.material.info.MaterialIconSet; + +public class ZBGTMaterialIconSet { + + public static final MaterialIconSet FIERY = new MaterialIconSet("fiery"); +} diff --git a/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTFirstDegreeMaterials.java b/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTFirstDegreeMaterials.java index 9f890850..61cf011d 100644 --- a/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTFirstDegreeMaterials.java +++ b/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTFirstDegreeMaterials.java @@ -8,6 +8,8 @@ import static gregtech.api.unification.material.info.MaterialIconSet.*; import com.zorbatron.zbgt.api.ZBGTAPI; +import com.zorbatron.zbgt.api.unification.material.info.ZBGTMaterialIconSet; +import com.zorbatron.zbgt.api.util.ZBGTMods; import gregtech.api.fluids.FluidBuilder; import gregtech.api.unification.material.Material; @@ -146,5 +148,27 @@ public static void register() { .blastStats(VA[HV], (int) (20 * 37.5))) .components(Nickel, 2, Niobium, 1, Aluminium, 2, Nichrome, 1) .build(); + + if (!ZBGTMods.THERMAL_FOUNDATION.isModLoaded()) { + Blizz = new Material.Builder(id++, zbgtId("blizz")) + .dust() + .flags(GENERATE_ROD) + .color(0xDCE9FF).iconSet(SHINY) + .build(); + + Pyrotheum = new Material.Builder(id++, zbgtId("pyrotheum")) + .dust().liquid(new FluidBuilder().temperature(4000)) + .color(0xFF9000).iconSet(ZBGTMaterialIconSet.FIERY) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(Redstone, 1, Blaze, 1, Sulfur, 1, Coal, 1) + .build(); + } else { + id += 2; + } + + SnowPowder = new Material.Builder(id++, zbgtId("snowpowder")) + .dust() + .color(0xFAFAFA).iconSet(FINE) + .build(); } } diff --git a/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTSecondDegreeMaterials.java b/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTSecondDegreeMaterials.java index 194bdd07..f59b7ebb 100644 --- a/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTSecondDegreeMaterials.java +++ b/src/main/java/com/zorbatron/zbgt/api/unification/material/materials/ZBGTSecondDegreeMaterials.java @@ -8,6 +8,7 @@ import static gregtech.api.unification.material.info.MaterialIconSet.*; import com.zorbatron.zbgt.api.ZBGTAPI; +import com.zorbatron.zbgt.api.util.ZBGTMods; import gregicality.multiblocks.api.unification.GCYMMaterialFlags; import gregtech.api.fluids.FluidBuilder; @@ -101,5 +102,16 @@ public static void register() { .flags(EXT_METAL, DECOMPOSITION_BY_CENTRIFUGING) .components(EglinSteelBase, 10, Sulfur, 1, Silicon, 4, Carbon, 1) .build(); + + if (!ZBGTMods.THERMAL_FOUNDATION.isModLoaded()) { + Cryotheum = new Material.Builder(id++, zbgtId("cryotheum")) + .dust().liquid(new FluidBuilder().temperature(5)) + .color(0x0094CB).iconSet(SHINY) + .flags(DECOMPOSITION_BY_CENTRIFUGING) + .components(Redstone, 1, SnowPowder, 1, Saltpeter, 1, Blizz, 1) + .build(); + } else { + id++; + } } } diff --git a/src/main/java/com/zorbatron/zbgt/api/util/ZBGTMods.java b/src/main/java/com/zorbatron/zbgt/api/util/ZBGTMods.java index 40268909..3a1ef2d9 100644 --- a/src/main/java/com/zorbatron/zbgt/api/util/ZBGTMods.java +++ b/src/main/java/com/zorbatron/zbgt/api/util/ZBGTMods.java @@ -6,7 +6,8 @@ public enum ZBGTMods { GCYM(Names.GCYM), ULV_COVERS(Names.ULV_COVERS), - NOMI_LABS(Names.NOMI_LABS); + NOMI_LABS(Names.NOMI_LABS), + THERMAL_FOUNDATION(Names.THERMAL_FOUNDATION); private final String ID; private Boolean modLoaded; @@ -27,5 +28,6 @@ public static class Names { public static final String GCYM = "gcym"; public static final String ULV_COVERS = "ulv_covers"; public static final String NOMI_LABS = "nomilabs"; + public static final String THERMAL_FOUNDATION = "thermalfoundation"; } } diff --git a/src/main/java/com/zorbatron/zbgt/common/CommonProxy.java b/src/main/java/com/zorbatron/zbgt/common/CommonProxy.java index 54a5244e..f313c5e3 100644 --- a/src/main/java/com/zorbatron/zbgt/common/CommonProxy.java +++ b/src/main/java/com/zorbatron/zbgt/common/CommonProxy.java @@ -11,16 +11,19 @@ import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.ConfigManager; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; import com.zorbatron.zbgt.ZBGTCore; +import com.zorbatron.zbgt.api.ZBGTAPI; import com.zorbatron.zbgt.api.recipes.ZBGTRecipeMaps; import com.zorbatron.zbgt.api.recipes.properties.CoALProperty; import com.zorbatron.zbgt.api.unification.material.ZBGTMaterials; import com.zorbatron.zbgt.api.util.ZBGTLog; +import com.zorbatron.zbgt.api.util.ZBGTMods; import com.zorbatron.zbgt.api.worldgen.CustomOreVeins; import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks; import com.zorbatron.zbgt.common.covers.ZBGTCovers; @@ -50,6 +53,13 @@ public void postInit() throws IOException { if (ZBGTConfig.worldGenerationSettings.enableOreGeneration) { CustomOreVeins.init(); } + + ZBGTAPI.pyrotheum = ZBGTMods.THERMAL_FOUNDATION.isModLoaded() ? + FluidRegistry.getFluidStack("pyrotheum", 1) : + ZBGTMaterials.Pyrotheum.getFluid(1); + ZBGTAPI.cryotheum = ZBGTMods.THERMAL_FOUNDATION.isModLoaded() ? + FluidRegistry.getFluidStack("cryotheum", 1) : + ZBGTMaterials.Cryotheum.getFluid(1); } @SubscribeEvent diff --git a/src/main/java/com/zorbatron/zbgt/common/block/blocks/MiscCasing.java b/src/main/java/com/zorbatron/zbgt/common/block/blocks/MiscCasing.java index e8c05e20..88ae437a 100644 --- a/src/main/java/com/zorbatron/zbgt/common/block/blocks/MiscCasing.java +++ b/src/main/java/com/zorbatron/zbgt/common/block/blocks/MiscCasing.java @@ -30,7 +30,9 @@ public enum CasingType implements IStringSerializable { COMPACT_FUSION_COIL_1("compact_fusion_coil_1"), COMPACT_FUSION_COIL_2("compact_fusion_coil_2"), COMPACT_FUSION_COIL_3("compact_fusion_coil_3"), - COMPACT_FUSION_COIL_4("compact_fusion_coil_4"); + COMPACT_FUSION_COIL_4("compact_fusion_coil_4"), + VOLCANUS_CASING("volcanus_casing"), + CRYOGENIC_CASING("cryogenic_casing"); private final String name; diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java index 5e66aa0b..706d0b42 100644 --- a/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/ZBGTMetaTileEntities.java @@ -4,9 +4,12 @@ import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; import com.zorbatron.zbgt.api.ZBGTAPI; +import com.zorbatron.zbgt.api.metatileentity.ZBGTMultiblockAbilities; import com.zorbatron.zbgt.common.metatileentities.multi.MetaTileEntityYOTTank; import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCircuitAssemblyLine; import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCoAL; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityCryogenicFreezer; +import com.zorbatron.zbgt.common.metatileentities.multi.electric.MetaTileEntityVolcanus; import com.zorbatron.zbgt.common.metatileentities.multi.electric.large.*; import com.zorbatron.zbgt.common.metatileentities.multi.electric.mega.*; import com.zorbatron.zbgt.common.metatileentities.multi.electric.quad.*; @@ -30,6 +33,8 @@ public class ZBGTMetaTileEntities { public static MetaTileEntityLargeParallelHatch[] ZBGT_PARALLEL_HATCHES = new MetaTileEntityLargeParallelHatch[7]; public static MetaTileEntityYOTTankMEHatch YOTTANK_ME_HATCH; public static MetaTileEntitySterileCleaningHatch STERILE_CLEANING_HATCH; + public static MetaTileEntityFilteredHatch PYROTHEUM_HEATING_HATCH; + public static MetaTileEntityFilteredHatch CRYOTHEUM_COOLING_HATCH; public static MetaTileEntityMegaEBF MEGA_EBF; public static MetaTileEntityMegaLCR MEGA_LCR; @@ -52,6 +57,9 @@ public class ZBGTMetaTileEntities { public static MetaTileEntityLargeAirCollector LARGE_AIR_COLLECTOR; public static MetaTileEntityLargeAlloySmelter LARGE_ALLOY_SMELTER; + public static MetaTileEntityVolcanus VOLCANUS; + public static MetaTileEntityCryogenicFreezer CRYOGENIC_FREEZER; + public static void init() { MachineItemBlock.addCreativeTab(ZBGTAPI.TAB_ZBGT); @@ -104,6 +112,13 @@ public static void init() { STERILE_CLEANING_HATCH = registerMetaTileEntity(18018, new MetaTileEntitySterileCleaningHatch(zbgtId("sterile_cleaning_hatch"))); + PYROTHEUM_HEATING_HATCH = registerMetaTileEntity(18019, + new MetaTileEntityFilteredHatch(zbgtId("pyrotheum_heating_hatch"), GTValues.IV, + ZBGTMultiblockAbilities.PYROTHEUM_HATCH, () -> ZBGTAPI.pyrotheum, 128_000)); + CRYOTHEUM_COOLING_HATCH = registerMetaTileEntity(18020, + new MetaTileEntityFilteredHatch(zbgtId("cryotheum_cooling_hatch"), GTValues.IV, + ZBGTMultiblockAbilities.CRYOTHEUM_HATCH, () -> ZBGTAPI.cryotheum, 128_000)); + // 18050-18099 (50) reserved for multiblocks MEGA_EBF = registerMetaTileEntity(18050, new MetaTileEntityMegaEBF(zbgtId("mega_ebf"))); @@ -154,5 +169,10 @@ public static void init() { CAL = registerMetaTileEntity(18070, new MetaTileEntityCircuitAssemblyLine(zbgtId("cal"))); + + VOLCANUS = registerMetaTileEntity(18071, + new MetaTileEntityVolcanus(zbgtId("volcanus"))); + CRYOGENIC_FREEZER = registerMetaTileEntity(18072, + new MetaTileEntityCryogenicFreezer(zbgtId("cryogenic_freezer"))); } } diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java new file mode 100644 index 00000000..e01a847d --- /dev/null +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityCryogenicFreezer.java @@ -0,0 +1,111 @@ +package com.zorbatron.zbgt.common.metatileentities.multi.electric; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.jetbrains.annotations.NotNull; + +import com.zorbatron.zbgt.api.metatileentity.ZBGTMultiblockAbilities; +import com.zorbatron.zbgt.api.render.ZBGTTextures; +import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks; +import com.zorbatron.zbgt.common.block.blocks.MiscCasing; + +import gregtech.api.capability.impl.MultiblockRecipeLogic; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.pattern.PatternMatchContext; +import gregtech.api.recipes.Recipe; +import gregtech.api.recipes.RecipeMaps; +import gregtech.client.renderer.ICubeRenderer; + +public class MetaTileEntityCryogenicFreezer extends RecipeMapMultiblockController { + + private final int CRYOTHEUM_DRAIN_AMOUNT = 10; + + private IFluidTank cryotheumTank; + + public MetaTileEntityCryogenicFreezer(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, RecipeMaps.VACUUM_RECIPES); + recipeMapWorkable = new MultiblockRecipeLogic(this) { + + @Override + protected boolean shouldSearchForRecipes() { + return hasCryotheum() && super.shouldSearchForRecipes(); + } + + @Override + protected boolean canProgressRecipe() { + return hasCryotheum() && super.canProgressRecipe(); + } + }; + recipeMapWorkable.setSpeedBonus(0.5); + recipeMapWorkable.setParallelLimit(4); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityCryogenicFreezer(metaTileEntityId); + } + + @Override + protected void updateFormedValid() { + super.updateFormedValid(); + + if (isActive() && getOffsetTimer() % 20 == 0) { + cryotheumTank.drain(CRYOTHEUM_DRAIN_AMOUNT, true); + } + } + + @Override + protected void formStructure(PatternMatchContext context) { + super.formStructure(context); + + cryotheumTank = getAbilities(ZBGTMultiblockAbilities.CRYOTHEUM_HATCH).get(0); + } + + @Override + public boolean checkRecipe(@NotNull Recipe recipe, boolean consumeIfSuccess) { + return cryotheumTank.getFluidAmount() != 0; + } + + @Override + protected @NotNull BlockPattern createStructurePattern() { + return FactoryBlockPattern.start() + .aisle("XXX", "XXX", "XXX") + .aisle("XXX", "X#X", "XXX") + .aisle("XXX", "XSX", "XXX") + .where('S', selfPredicate()) + .where('X', states(getCasing()).setMinGlobalLimited(10) + .or(autoAbilities(true, true, true, true, true, true, false)) + .or(abilities(ZBGTMultiblockAbilities.CRYOTHEUM_HATCH).setExactLimit(1))) + .where('#', air()) + .build(); + } + + protected IBlockState getCasing() { + return ZBGTMetaBlocks.MISC_CASING.getState(MiscCasing.CasingType.CRYOGENIC_CASING); + } + + @SideOnly(Side.CLIENT) + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { + return ZBGTTextures.CRYOGENIC_CASING; + } + + @SideOnly(Side.CLIENT) + @Override + protected @NotNull ICubeRenderer getFrontOverlay() { + return ZBGTTextures.GTPP_MACHINE_OVERLAY; + } + + private boolean hasCryotheum() { + return cryotheumTank.getFluidAmount() > CRYOTHEUM_DRAIN_AMOUNT; + } +} diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java new file mode 100644 index 00000000..911106b8 --- /dev/null +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/electric/MetaTileEntityVolcanus.java @@ -0,0 +1,252 @@ +package com.zorbatron.zbgt.common.metatileentities.multi.electric; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.zorbatron.zbgt.api.metatileentity.ZBGTMultiblockAbilities; +import com.zorbatron.zbgt.api.render.ZBGTTextures; +import com.zorbatron.zbgt.common.block.ZBGTMetaBlocks; +import com.zorbatron.zbgt.common.block.blocks.MiscCasing; +import com.zorbatron.zbgt.common.metatileentities.ZBGTMetaTileEntities; + +import gregtech.api.GTValues; +import gregtech.api.GregTechAPI; +import gregtech.api.block.IHeatingCoilBlockStats; +import gregtech.api.capability.IHeatingCoil; +import gregtech.api.capability.impl.HeatingCoilRecipeLogic; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockPart; +import gregtech.api.metatileentity.multiblock.MultiblockAbility; +import gregtech.api.metatileentity.multiblock.MultiblockDisplayText; +import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController; +import gregtech.api.pattern.BlockPattern; +import gregtech.api.pattern.FactoryBlockPattern; +import gregtech.api.pattern.MultiblockShapeInfo; +import gregtech.api.pattern.PatternMatchContext; +import gregtech.api.recipes.Recipe; +import gregtech.api.recipes.RecipeMaps; +import gregtech.api.recipes.recipeproperties.TemperatureProperty; +import gregtech.api.util.GTUtility; +import gregtech.api.util.TextComponentUtil; +import gregtech.api.util.TextFormattingUtil; +import gregtech.client.renderer.ICubeRenderer; +import gregtech.common.ConfigHolder; +import gregtech.common.blocks.BlockWireCoil; +import gregtech.common.metatileentities.MetaTileEntities; +import gregtech.core.sound.GTSoundEvents; + +public class MetaTileEntityVolcanus extends RecipeMapMultiblockController implements IHeatingCoil { + + private final int PYROTHEUM_DRAIN_AMOUNT = 10; + + private int blastFurnaceTemperature; + private IFluidTank pyrotheumTank; + + public MetaTileEntityVolcanus(ResourceLocation metaTileEntityId) { + super(metaTileEntityId, RecipeMaps.BLAST_RECIPES); + recipeMapWorkable = new HeatingCoilRecipeLogic(this) { + + @Override + protected boolean shouldSearchForRecipes() { + return hasPyrotheum() && super.shouldSearchForRecipes(); + } + + @Override + protected boolean canProgressRecipe() { + return hasPyrotheum() && super.canProgressRecipe(); + } + }; + recipeMapWorkable.setSpeedBonus(1 / 2.2); + recipeMapWorkable.setEUDiscount(0.9); + recipeMapWorkable.setParallelLimit(8); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityVolcanus(metaTileEntityId); + } + + @Override + protected void updateFormedValid() { + super.updateFormedValid(); + + if (isActive() && getOffsetTimer() % 20 == 0) { + pyrotheumTank.drain(PYROTHEUM_DRAIN_AMOUNT, true); + } + } + + @Override + protected void formStructure(PatternMatchContext context) { + super.formStructure(context); + + pyrotheumTank = getAbilities(ZBGTMultiblockAbilities.PYROTHEUM_HATCH).get(0); + + Object type = context.get("CoilType"); + if (type instanceof IHeatingCoilBlockStats) { + this.blastFurnaceTemperature = ((IHeatingCoilBlockStats) type).getCoilTemperature(); + } else { + this.blastFurnaceTemperature = BlockWireCoil.CoilType.CUPRONICKEL.getCoilTemperature(); + } + // the subtracted tier gives the starting level (exclusive) of the +100K heat bonus + this.blastFurnaceTemperature += 100 * + Math.max(0, GTUtility.getFloorTierByVoltage(getEnergyContainer().getInputVoltage()) - GTValues.MV); + } + + @Override + public void invalidateStructure() { + super.invalidateStructure(); + this.blastFurnaceTemperature = 0; + } + + @Override + public boolean checkRecipe(@NotNull Recipe recipe, boolean consumeIfSuccess) { + return blastFurnaceTemperature >= recipe.getProperty(TemperatureProperty.getInstance(), 0); + } + + @Override + protected @NotNull BlockPattern createStructurePattern() { + return FactoryBlockPattern.start() + .aisle("XXX", "CCC", "CCC", "XXX") + .aisle("XXX", "C#C", "C#C", "XMX") + .aisle("XSX", "CCC", "CCC", "XXX") + .where('S', selfPredicate()) + .where('C', heatingCoils()) + .where('M', abilities(MultiblockAbility.MUFFLER_HATCH)) + .where('X', states(getCasing()).setMinGlobalLimited(8) + .or(autoAbilities(true, true, true, true, true, true, false)) + .or(abilities(ZBGTMultiblockAbilities.PYROTHEUM_HATCH).setExactLimit(1))) + .where('#', air()) + .build(); + } + + protected IBlockState getCasing() { + return ZBGTMetaBlocks.MISC_CASING.getState(MiscCasing.CasingType.VOLCANUS_CASING); + } + + @Override + public List getMatchingShapes() { + ArrayList shapeInfo = new ArrayList<>(); + MultiblockShapeInfo.Builder builder = MultiblockShapeInfo.builder() + .aisle("EEM", "CCC", "CCC", "XXX") + .aisle("FXD", "C#C", "C#C", "XHP") + .aisle("ISO", "CCC", "CCC", "XXX") + .where('X', getCasing()) + .where('S', ZBGTMetaTileEntities.VOLCANUS, EnumFacing.SOUTH) + .where('#', Blocks.AIR.getDefaultState()) + .where('E', MetaTileEntities.ENERGY_INPUT_HATCH[GTValues.LV], EnumFacing.NORTH) + .where('I', MetaTileEntities.ITEM_IMPORT_BUS[GTValues.LV], EnumFacing.SOUTH) + .where('O', MetaTileEntities.ITEM_EXPORT_BUS[GTValues.LV], EnumFacing.SOUTH) + .where('F', MetaTileEntities.FLUID_IMPORT_HATCH[GTValues.LV], EnumFacing.WEST) + .where('D', MetaTileEntities.FLUID_EXPORT_HATCH[GTValues.LV], EnumFacing.EAST) + .where('H', MetaTileEntities.MUFFLER_HATCH[GTValues.LV], EnumFacing.UP) + .where('M', () -> ConfigHolder.machines.enableMaintenance ? MetaTileEntities.MAINTENANCE_HATCH : + getCasing(), EnumFacing.NORTH) + .where('P', ZBGTMetaTileEntities.PYROTHEUM_HEATING_HATCH, EnumFacing.EAST); + + GregTechAPI.HEATING_COILS.entrySet().stream() + .sorted(Comparator.comparingInt(entry -> entry.getValue().getTier())) + .forEach(entry -> shapeInfo.add(builder.where('C', entry.getKey()).build())); + + return shapeInfo; + } + + @Override + protected void addDisplayText(List textList) { + MultiblockDisplayText.builder(textList, isStructureFormed()) + .setWorkingStatus(recipeMapWorkable.isWorkingEnabled(), recipeMapWorkable.isActive()) + .addEnergyUsageLine(getEnergyContainer()) + .addEnergyTierLine(GTUtility.getTierByVoltage(recipeMapWorkable.getMaxVoltage())) + .addCustom(tl -> { + // Coil heat capacity line + if (isStructureFormed()) { + ITextComponent heatString = TextComponentUtil.stringWithColor( + TextFormatting.RED, + TextFormattingUtil.formatNumbers(blastFurnaceTemperature) + "K"); + + tl.add(TextComponentUtil.translationWithColor( + TextFormatting.GRAY, + "gregtech.multiblock.blast_furnace.max_temperature", + heatString)); + } + }) + .addParallelsLine(recipeMapWorkable.getParallelLimit()) + .addWorkingStatusLine() + .addProgressLine(recipeMapWorkable.getProgressPercent()); + } + + @SideOnly(Side.CLIENT) + @Override + public ICubeRenderer getBaseTexture(IMultiblockPart sourcePart) { + return ZBGTTextures.VOLCANUS_CASING; + } + + @SideOnly(Side.CLIENT) + @Override + protected @NotNull ICubeRenderer getFrontOverlay() { + return ZBGTTextures.GTPP_MACHINE_OVERLAY; + } + + @Override + public boolean canBeDistinct() { + return true; + } + + @Override + public boolean hasMufflerMechanics() { + return true; + } + + @Override + public SoundEvent getBreakdownSound() { + return GTSoundEvents.BREAKDOWN_ELECTRICAL; + } + + @Override + public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip, + boolean advanced) { + super.addInformation(stack, world, tooltip, advanced); + tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.1")); + tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.2")); + tooltip.add(I18n.format("gregtech.machine.electric_blast_furnace.tooltip.3")); + } + + @Override + public int getCurrentTemperature() { + return blastFurnaceTemperature; + } + + @NotNull + @Override + public List getDataInfo() { + List list = super.getDataInfo(); + list.add(new TextComponentTranslation("gregtech.multiblock.blast_furnace.max_temperature", + new TextComponentTranslation(TextFormattingUtil.formatNumbers(blastFurnaceTemperature) + "K") + .setStyle(new Style().setColor(TextFormatting.RED)))); + return list; + } + + private boolean hasPyrotheum() { + return pyrotheumTank.getFluidAmount() > PYROTHEUM_DRAIN_AMOUNT; + } +} diff --git a/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java new file mode 100644 index 00000000..e07302af --- /dev/null +++ b/src/main/java/com/zorbatron/zbgt/common/metatileentities/multi/multiblockpart/MetaTileEntityFilteredHatch.java @@ -0,0 +1,212 @@ +package com.zorbatron.zbgt.common.metatileentities.multi.multiblockpart; + +import java.util.List; +import java.util.function.Supplier; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.items.IItemHandlerModifiable; + +import com.zorbatron.zbgt.api.render.ZBGTTextures; + +import codechicken.lib.render.CCRenderState; +import codechicken.lib.render.pipeline.IVertexOperation; +import codechicken.lib.vec.Matrix4; +import gregtech.api.capability.GregtechDataCodes; +import gregtech.api.capability.GregtechTileCapabilities; +import gregtech.api.capability.IControllable; +import gregtech.api.capability.impl.FilteredItemHandler; +import gregtech.api.capability.impl.FluidTankList; +import gregtech.api.gui.GuiTextures; +import gregtech.api.gui.ModularUI; +import gregtech.api.gui.widgets.*; +import gregtech.api.items.itemhandlers.GTItemStackHandler; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart; +import gregtech.api.metatileentity.multiblock.MultiblockAbility; +import gregtech.client.renderer.texture.Textures; +import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityMultiblockPart; + +public class MetaTileEntityFilteredHatch extends MetaTileEntityMultiblockPart + implements IMultiblockAbilityPart, IControllable { + + private final MultiblockAbility multiblockAbility; + private final Supplier filter; + private final int tankCapacity; + + private final FluidTank tank; + + private boolean workingEnabled = true; + + public MetaTileEntityFilteredHatch(ResourceLocation metaTileEntityId, int tier, + MultiblockAbility multiblockAbility, Supplier filter, + int tankCapacity) { + super(metaTileEntityId, tier); + this.multiblockAbility = multiblockAbility; + this.filter = filter; + this.tankCapacity = tankCapacity; + + this.tank = new FluidTank(tankCapacity) { + + @Override + public boolean canFillFluidType(FluidStack fluid) { + return fluid.isFluidEqual(filter.get()); + } + }; + + initializeInventory(); + } + + @Override + public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { + return new MetaTileEntityFilteredHatch(metaTileEntityId, getTier(), multiblockAbility, filter, tankCapacity); + } + + @Override + protected FluidTankList createImportFluidHandler() { + return new FluidTankList(false, tank); + } + + @Override + protected IItemHandlerModifiable createImportItemHandler() { + return new FilteredItemHandler(this, 1).setFillPredicate( + FilteredItemHandler.getCapabilityFilter(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY)); + } + + @Override + protected IItemHandlerModifiable createExportItemHandler() { + return new GTItemStackHandler(this, 1); + } + + @Override + public void update() { + super.update(); + + if (!getWorld().isRemote && workingEnabled) { + fillInternalTankFromFluidContainer(tank); + pullFluidsFromNearbyHandlers(getFrontFacing()); + } + } + + @Override + protected ModularUI createUI(EntityPlayer entityPlayer) { + // Create base builder/widget references + ModularUI.Builder builder = ModularUI.defaultBuilder(); + TankWidget tankWidget = new TankWidget(tank, 69, 52, 18, 18) + .setAlwaysShowFull(true).setDrawHoveringText(false).setContainerClicking(true, true); + + builder.image(7, 16, 81, 55, GuiTextures.DISPLAY) + .widget(new ImageWidget(91, 36, 14, 15, GuiTextures.TANK_ICON)) + .widget(new SlotWidget(exportItems, 0, 90, 53, true, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.OUT_SLOT_OVERLAY)); + + // Add general widgets + return builder.label(6, 6, getMetaFullName()) + .label(11, 20, "gregtech.gui.fluid_amount", 0xFFFFFF) + .widget(new AdvancedTextWidget(11, 30, list -> { + TextComponentTranslation translation = tankWidget.getFluidTextComponent(); + if (translation != null) list.add(translation); + }, 0xFFFFFF)) + .widget(new AdvancedTextWidget(11, 40, list -> { + String amount = tankWidget.getFormattedFluidAmount(); + if (!amount.equals("0")) { + list.add(new TextComponentString(amount)); + } + }, 0xFFFFFF)) + .widget(tankWidget) + .widget(new FluidContainerSlotWidget(importItems, 0, 90, 16, false) + .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.IN_SLOT_OVERLAY)) + .bindPlayerInventory(entityPlayer.inventory) + .build(getHolder(), entityPlayer); + } + + @Override + public void setWorkingEnabled(boolean workingEnabled) { + this.workingEnabled = workingEnabled; + World world = getWorld(); + if (world != null && !world.isRemote) { + writeCustomData(GregtechDataCodes.WORKING_ENABLED, buf -> buf.writeBoolean(workingEnabled)); + } + } + + @Override + public boolean isWorkingEnabled() { + return workingEnabled; + } + + @Override + public T getCapability(Capability capability, EnumFacing side) { + if (capability == GregtechTileCapabilities.CAPABILITY_CONTROLLABLE) { + return GregtechTileCapabilities.CAPABILITY_CONTROLLABLE.cast(this); + } + + return super.getCapability(capability, side); + } + + @Override + public MultiblockAbility getAbility() { + return multiblockAbility; + } + + @Override + public void registerAbilities(List abilityList) { + abilityList.add(tank); + } + + @Override + public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) { + super.renderMetaTileEntity(renderState, translation, pipeline); + + Textures.PIPE_IN_OVERLAY.renderSided(getFrontFacing(), renderState, translation, pipeline); + ZBGTTextures.FLUID_INPUT_BLACK.renderSided(getFrontFacing(), renderState, translation, pipeline); + } + + @Override + public void writeInitialSyncData(PacketBuffer buf) { + super.writeInitialSyncData(buf); + buf.writeBoolean(workingEnabled); + } + + @Override + public void receiveInitialSyncData(PacketBuffer buf) { + super.receiveInitialSyncData(buf); + this.workingEnabled = buf.readBoolean(); + } + + @Override + public void receiveCustomData(int dataId, PacketBuffer buf) { + super.receiveCustomData(dataId, buf); + + if (dataId == GregtechDataCodes.WORKING_ENABLED) { + this.workingEnabled = buf.readBoolean(); + } + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound data) { + super.writeToNBT(data); + + data.setBoolean("WorkingEnabled", workingEnabled); + + return data; + } + + @Override + public void readFromNBT(NBTTagCompound data) { + super.readFromNBT(data); + + workingEnabled = data.getBoolean("WorkingEnabled"); + } +} diff --git a/src/main/java/com/zorbatron/zbgt/recipe/MaterialRecipes.java b/src/main/java/com/zorbatron/zbgt/recipe/MaterialRecipes.java index 924f2c99..9b66692a 100644 --- a/src/main/java/com/zorbatron/zbgt/recipe/MaterialRecipes.java +++ b/src/main/java/com/zorbatron/zbgt/recipe/MaterialRecipes.java @@ -7,10 +7,13 @@ import static gregtech.api.unification.material.Materials.*; import static gregtech.api.unification.ore.OrePrefix.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraftforge.fluids.FluidStack; import com.nomiceu.nomilabs.gregtech.material.registry.LabsMaterials; import com.zorbatron.zbgt.api.ZBGTAPI; +import com.zorbatron.zbgt.api.util.ZBGTMods; import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.builders.BlastRecipeBuilder; @@ -24,6 +27,8 @@ protected static void init() { chemicalReactor(); vacuumFreezer(); alloyBlast(); + macerator(); + chemBath(); mixer(); ebf(); } @@ -58,6 +63,14 @@ private static void vacuumFreezer() { .fluidOutputs(LiquidNitrogen.getFluid(1000)) .EUt(VA[HV]).duration(15) .buildAndRegister(); + + if (!ZBGTMods.THERMAL_FOUNDATION.isModLoaded()) { + VACUUM_RECIPES.recipeBuilder() + .input(stick, Blaze) + .output(stick, Blizz) + .EUt(VA[MV]).duration(20 * 25) + .buildAndRegister(); + } } private static void alloyBlast() { @@ -73,6 +86,31 @@ private static void alloyBlast() { 20 * 40, BlastProperty.GasTier.MID, 5, 10); } + private static void macerator() { + MACERATOR_RECIPES.recipeBuilder() + .input(Blocks.SNOW) + .output(dust, SnowPowder) + .EUt(4).duration(16) + .buildAndRegister(); + + MACERATOR_RECIPES.recipeBuilder() + .input(Items.SNOWBALL) + .output(dustSmall, SnowPowder) + .EUt(4).duration(16) + .buildAndRegister(); + } + + private static void chemBath() { + if (!ZBGTMods.THERMAL_FOUNDATION.isModLoaded()) { + CHEMICAL_BATH_RECIPES.recipeBuilder() + .input(Items.SNOWBALL, 4) + .fluidInputs(Blaze.getFluid(L * 10)) + .output(dust, Blizz) + .EUt(VA[HV]).duration(20 * 20) + .buildAndRegister(); + } + } + private static void mixer() { MIXER_RECIPES.recipeBuilder() .input(dust, TungstenSteel, 12) @@ -229,6 +267,26 @@ private static void mixer() { .output(dust, Inconel792, 6) .EUt(VA[HV]).duration((int) (20 * 2.6)) .buildAndRegister(); + + if (!ZBGTMods.THERMAL_FOUNDATION.isModLoaded()) { + MIXER_RECIPES.recipeBuilder() + .input(dust, Redstone) + .input(dust, Blaze) + .input(dust, Sulfur) + .input(dust, Coal) + .output(dust, Pyrotheum, 4) + .EUt(VA[MV]).duration(20 * 8) + .buildAndRegister(); + + MIXER_RECIPES.recipeBuilder() + .input(dust, Redstone) + .input(dust, SnowPowder) + .input(dust, Saltpeter) + .input(dust, Blizz) + .output(dust, Cryotheum, 4) + .EUt(VA[MV]).duration(20 * 8) + .buildAndRegister(); + } } private static void ebf() { diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/bolt.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/bolt.json new file mode 100644 index 00000000..8c50086a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/bolt.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/bolt", + "layer1": "gregtech:items/material_sets/fiery/bolt_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed.json new file mode 100644 index 00000000..ace1100f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/crushed", + "layer1": "gregtech:items/material_sets/fiery/crushed_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_centrifuged.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_centrifuged.json new file mode 100644 index 00000000..8d7918da --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_centrifuged.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/crushed_centrifuged", + "layer1": "gregtech:items/material_sets/fiery/crushed_centrifuged_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_purified.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_purified.json new file mode 100644 index 00000000..bcfe076f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/crushed_purified.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/crushed_purified", + "layer1": "gregtech:items/material_sets/fiery/crushed_purified_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust.json new file mode 100644 index 00000000..90287c8b --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/dust", + "layer1": "gregtech:items/material_sets/fiery/dust_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_impure.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_impure.json new file mode 100644 index 00000000..3c765335 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_impure.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/dust_impure", + "layer1": "gregtech:items/material_sets/fiery/dust_impure_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_pure.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_pure.json new file mode 100644 index 00000000..2ef64aa1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_pure.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/dust_pure", + "layer1": "gregtech:items/material_sets/fiery/dust_pure_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_small.json new file mode 100644 index 00000000..1cde2498 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_small.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/dust_small", + "layer1": "gregtech:items/material_sets/fiery/dust_small_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_tiny.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_tiny.json new file mode 100644 index 00000000..fe27f4f2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/dust_tiny.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/dust_tiny", + "layer1": "gregtech:items/material_sets/fiery/dust_tiny_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/foil.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/foil.json new file mode 100644 index 00000000..19fc8503 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/foil.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/foil", + "layer1": "gregtech:items/material_sets/fiery/foil_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear.json new file mode 100644 index 00000000..93deeaf8 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gear", + "layer1": "gregtech:items/material_sets/fiery/gear_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear_small.json new file mode 100644 index 00000000..67f68de1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gear_small.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gear_small", + "layer1": "gregtech:items/material_sets/fiery/gear_small_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem.json new file mode 100644 index 00000000..b401721d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gem", + "layer1": "gregtech:items/material_sets/fiery/gem_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_chipped.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_chipped.json new file mode 100644 index 00000000..6fdeb4ce --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_chipped.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gem_chipped", + "layer1": "gregtech:items/material_sets/fiery/gem_chipped_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_exquisite.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_exquisite.json new file mode 100644 index 00000000..52931a88 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_exquisite.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gem_exquisite", + "layer1": "gregtech:items/material_sets/fiery/gem_exquisite_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawed.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawed.json new file mode 100644 index 00000000..18298053 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawed.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gem_flawed", + "layer1": "gregtech:items/material_sets/fiery/gem_flawed_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawless.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawless.json new file mode 100644 index 00000000..72474f17 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/gem_flawless.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/gem_flawless", + "layer1": "gregtech:items/material_sets/fiery/gem_flawless_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot.json new file mode 100644 index 00000000..e234a29a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/ingot", + "layer1": "gregtech:items/material_sets/fiery/ingot_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot_hot.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot_hot.json new file mode 100644 index 00000000..5dd9dd46 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ingot_hot.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/ingot_hot", + "layer1": "gregtech:items/material_sets/fiery/ingot_hot_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/lens.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/lens.json new file mode 100644 index 00000000..a72e2aac --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/lens.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/lens", + "layer1": "gregtech:items/material_sets/fiery/lens_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/nugget.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/nugget.json new file mode 100644 index 00000000..59c25fc1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/nugget.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/nugget", + "layer1": "gregtech:items/material_sets/fiery/nugget_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate.json new file mode 100644 index 00000000..9fb899d8 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/plate", + "layer1": "gregtech:items/material_sets/fiery/plate_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_dense.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_dense.json new file mode 100644 index 00000000..64736f64 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_dense.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/plate_dense", + "layer1": "gregtech:items/material_sets/fiery/plate_dense_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_double.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_double.json new file mode 100644 index 00000000..a40b7e1a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/plate_double.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/plate_double", + "layer1": "gregtech:items/material_sets/fiery/plate_double_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ring.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ring.json new file mode 100644 index 00000000..43d9035d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/ring.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/ring", + "layer1": "gregtech:items/material_sets/fiery/ring_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/rotor.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/rotor.json new file mode 100644 index 00000000..ecb09759 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/rotor.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/rotor", + "layer1": "gregtech:items/material_sets/fiery/rotor_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/round.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/round.json new file mode 100644 index 00000000..e52366de --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/round.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/round", + "layer1": "gregtech:items/material_sets/fiery/round_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/screw.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/screw.json new file mode 100644 index 00000000..2deadb05 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/screw.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/screw", + "layer1": "gregtech:items/material_sets/fiery/screw_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring.json new file mode 100644 index 00000000..49d1cb1c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/spring", + "layer1": "gregtech:items/material_sets/fiery/spring_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring_small.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring_small.json new file mode 100644 index 00000000..cbfa367e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/spring_small.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/spring_small", + "layer1": "gregtech:items/material_sets/fiery/spring_small_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick.json new file mode 100644 index 00000000..cfc08871 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick.json @@ -0,0 +1,7 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/stick", + "layer1": "gregtech:items/material_sets/fiery/stick_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick_long.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick_long.json new file mode 100644 index 00000000..acab8b46 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/stick_long.json @@ -0,0 +1,7 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/stick_long", + "layer1": "gregtech:items/material_sets/fiery/stick_long_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_buzz_saw.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_buzz_saw.json new file mode 100644 index 00000000..b4859ea4 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_buzz_saw.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_buzz_saw", + "layer1": "gregtech:items/material_sets/fiery/tool_head_buzz_saw_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_chainsaw.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_chainsaw.json new file mode 100644 index 00000000..72ef4ec1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_chainsaw.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_chainsaw", + "layer1": "gregtech:items/material_sets/fiery/tool_head_chainsaw_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_drill.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_drill.json new file mode 100644 index 00000000..ba4b1ae5 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_drill.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_drill", + "layer1": "gregtech:items/material_sets/fiery/tool_head_drill_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_screwdriver.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_screwdriver.json new file mode 100644 index 00000000..efcc796c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_screwdriver.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_screwdriver", + "layer1": "gregtech:items/material_sets/fiery/tool_head_screwdriver_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wirecutter.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wirecutter.json new file mode 100644 index 00000000..3d9cd2ea --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wirecutter.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_wire_cutter", + "layer1": "gregtech:items/material_sets/fiery/tool_head_wire_cutter_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wrench.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wrench.json new file mode 100644 index 00000000..6bd2e777 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/tool_head_wrench.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/tool_head_wrench", + "layer1": "gregtech:items/material_sets/fiery/tool_head_wrench_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fiery/wire_fine.json b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/wire_fine.json new file mode 100644 index 00000000..981e2841 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/fiery/wire_fine.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/fiery/wire_fine", + "layer1": "gregtech:items/material_sets/fiery/wire_fine_overlay" + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/misc/cryogenic.png b/src/main/resources/assets/gregtech/textures/blocks/casings/misc/cryogenic.png new file mode 100644 index 00000000..7222ca77 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/misc/cryogenic.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/misc/volcanus.png b/src/main/resources/assets/gregtech/textures/blocks/casings/misc/volcanus.png new file mode 100644 index 00000000..eb7affaa Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/misc/volcanus.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/fluid_input_black.png b/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/fluid_input_black.png new file mode 100644 index 00000000..8e4d56f3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/overlay/machine/fluid_input_black.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt.png new file mode 100644 index 00000000..2f72b24d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt_overlay.png new file mode 100644 index 00000000..405c6c75 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/bolt_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed.png new file mode 100644 index 00000000..c8b05662 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged.png new file mode 100644 index 00000000..77cb22c2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged_overlay.png new file mode 100644 index 00000000..5b71c926 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_centrifuged_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_overlay.png new file mode 100644 index 00000000..8ba46dd7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified.png new file mode 100644 index 00000000..13fde840 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified_overlay.png new file mode 100644 index 00000000..224805ac Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/crushed_purified_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust.png new file mode 100644 index 00000000..71c0c8bc Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure.png new file mode 100644 index 00000000..5e2982ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure_overlay.png new file mode 100644 index 00000000..d464157a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_impure_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_overlay.png new file mode 100644 index 00000000..39268e6a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure.png new file mode 100644 index 00000000..5e2982ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure_overlay.png new file mode 100644 index 00000000..b773c9c5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_pure_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small.png new file mode 100644 index 00000000..4b6529c9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small_overlay.png new file mode 100644 index 00000000..a3e78bdd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_small_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny.png new file mode 100644 index 00000000..087fa045 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny_overlay.png new file mode 100644 index 00000000..449c4213 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/dust_tiny_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil.png new file mode 100644 index 00000000..326e3fee Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil_overlay.png new file mode 100644 index 00000000..b7550457 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/foil_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear.png new file mode 100644 index 00000000..038f5a5b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_overlay.png new file mode 100644 index 00000000..c13f5c15 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small.png new file mode 100644 index 00000000..33fe8afb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small_overlay.png new file mode 100644 index 00000000..26883582 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gear_small_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem.png new file mode 100644 index 00000000..8b6205df Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped.png new file mode 100644 index 00000000..c422cad6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped_overlay.png new file mode 100644 index 00000000..b42d7bb6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_chipped_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite.png new file mode 100644 index 00000000..d034b89b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite_overlay.png new file mode 100644 index 00000000..420e3424 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_exquisite_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed.png new file mode 100644 index 00000000..f8989e40 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed_overlay.png new file mode 100644 index 00000000..969e2133 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawed_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless.png new file mode 100644 index 00000000..442b4275 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless_overlay.png new file mode 100644 index 00000000..dc493f61 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_flawless_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_overlay.png new file mode 100644 index 00000000..a6d992d7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/gem_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot.png new file mode 100644 index 00000000..52da7cf4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot.png new file mode 100644 index 00000000..32ca0732 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot_overlay.png new file mode 100644 index 00000000..68fcc194 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_hot_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_overlay.png new file mode 100644 index 00000000..c59ef7b1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ingot_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens.png new file mode 100644 index 00000000..7ab6c609 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens_overlay.png new file mode 100644 index 00000000..96794125 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/lens_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget.png new file mode 100644 index 00000000..98cb1079 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget_overlay.png new file mode 100644 index 00000000..7e03820e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/nugget_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate.png new file mode 100644 index 00000000..5ddd64f8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense.png new file mode 100644 index 00000000..3a17e83f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense_overlay.png new file mode 100644 index 00000000..ac19c330 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_dense_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double.png new file mode 100644 index 00000000..d46023dc Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double_overlay.png new file mode 100644 index 00000000..236e514d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_double_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_overlay.png new file mode 100644 index 00000000..8baf77e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/plate_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring.png new file mode 100644 index 00000000..eb9dfd5e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring_overlay.png new file mode 100644 index 00000000..f45e432b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/ring_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor.png new file mode 100644 index 00000000..cf9edb95 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor_overlay.png new file mode 100644 index 00000000..03619141 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/rotor_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round.png new file mode 100644 index 00000000..9cfe5ed4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round_overlay.png new file mode 100644 index 00000000..60b837cf Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/round_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw.png new file mode 100644 index 00000000..27fdd989 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw_overlay.png new file mode 100644 index 00000000..f96b81d9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/screw_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring.png new file mode 100644 index 00000000..043a081e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_overlay.png new file mode 100644 index 00000000..dce709db Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small.png new file mode 100644 index 00000000..4ac8b824 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small_overlay.png new file mode 100644 index 00000000..460dd680 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/spring_small_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick.png new file mode 100644 index 00000000..a65c9dbd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long.png new file mode 100644 index 00000000..397f5c78 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long_overlay.png new file mode 100644 index 00000000..6d6591f3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_long_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_overlay.png new file mode 100644 index 00000000..3880933c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/stick_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe.png new file mode 100644 index 00000000..4248c5c2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe_overlay.png new file mode 100644 index 00000000..b2f7615f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_axe_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw.png new file mode 100644 index 00000000..c895aedb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw_overlay.png new file mode 100644 index 00000000..7dcf426e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_buzzsaw_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw.png new file mode 100644 index 00000000..d37cb15d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw_overlay.png new file mode 100644 index 00000000..07240441 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_chainsaw_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill.png new file mode 100644 index 00000000..3d60e1d4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill_overlay.png new file mode 100644 index 00000000..423b2aad Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_drill_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer.png new file mode 100644 index 00000000..93b3c490 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer_overlay.png new file mode 100644 index 00000000..534d4227 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_hammer_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe.png new file mode 100644 index 00000000..0414f9ca Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe_overlay.png new file mode 100644 index 00000000..0241e795 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_pickaxe_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver.png new file mode 100644 index 00000000..4ec2f75e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver_overlay.png new file mode 100644 index 00000000..02d3a495 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_screwdriver_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel.png new file mode 100644 index 00000000..809d6a4c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel_overlay.png new file mode 100644 index 00000000..52e1f289 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_shovel_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench.png new file mode 100644 index 00000000..2b57021b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench_overlay.png new file mode 100644 index 00000000..e2c61b15 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/tool_head_wrench_overlay.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine.png new file mode 100644 index 00000000..02a11461 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine_overlay.png new file mode 100644 index 00000000..702e7022 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/fiery/wire_fine_overlay.png differ diff --git a/src/main/resources/assets/zbgt/blockstates/misc_casing.json b/src/main/resources/assets/zbgt/blockstates/misc_casing.json index e6bbc6a9..bc4147ab 100644 --- a/src/main/resources/assets/zbgt/blockstates/misc_casing.json +++ b/src/main/resources/assets/zbgt/blockstates/misc_casing.json @@ -37,6 +37,16 @@ "textures": { "all": "gregtech:blocks/casings/misc/5" } + }, + "volcanus_casing": { + "textures": { + "all": "gregtech:blocks/casings/misc/volcanus" + } + }, + "cryogenic_casing": { + "textures": { + "all": "gregtech:blocks/casings/misc/cryogenic" + } } } } diff --git a/src/main/resources/assets/zbgt/lang/en_us.lang b/src/main/resources/assets/zbgt/lang/en_us.lang index 358e1ec9..5e60a894 100644 --- a/src/main/resources/assets/zbgt/lang/en_us.lang +++ b/src/main/resources/assets/zbgt/lang/en_us.lang @@ -73,6 +73,10 @@ zbgt.machine.yottank_me_hatch.sticky.disabled=Enable sticky mode zbgt.machine.sterile_cleaning_hatch.name=Automatic Sterilization Maintenance Hatch zbgt.machine.sterile_cleaning_hatch.tooltip=For automatically maintaining Multiblocks with Cleaning, but sterile! +zbgt.machine.pyrotheum_heating_hatch.name=Pyrotheum Heating Vent + +zbgt.machine.cryotheum_cooling_hatch.name=Cryotheum Cooling Hatch + # Covers metaitem.cover.dual_cover.lv.name=LV Dual Cover @@ -324,6 +328,10 @@ zbgt.machine.cal.tooltip=Does not lose efficiency when overclocked zbgt.machine.cal.tooltip_ordered_items=When in §eCircuit Assembly Line§7 mode, §fitems§7 must be in the correct order to run. recipemap.circuit_assembly_line_recipes.name=Circuit Assembly Line +zbgt.machine.volcanus.name=Volcanus + +zbgt.machine.cryogenic_freezer.name=Cryogenic Freezer + # Multiblock Casings tile.multiblock_casing.precise_0.name=Imprecise Electronic Unit Casing @@ -396,6 +404,10 @@ tile.misc_casing.inconel_reinforced_casing.name=Inconel Reinforced Casing tile.creative_heating_coil.creative_heating_coil.name=Creative Heating Coil +tile.misc_casing.volcanus_casing.name=Volcanus Casing + +tile.misc_casing.cryogenic_casing.name=Advanced Cryogenic Casing + # Misc zbgt.laser_enabled.1=Can use @@ -428,6 +440,12 @@ zbgt.material.energetic_alloy=Energetic Alloy zbgt.material.luminessence=Luminessence zbgt.material.eglin_steel_base=Eglin Steel Base Compound zbgt.material.inconel_792=Inconel-792 +zbgt.material.blizz=Blizz +zbgt.material.pyrotheum=Pyrotheum +zbgt.material.snowpowder=Snow Powder +item.zbgt.material.snowpowder.dust=Snow Powder +item.zbgt.material.snowpowder.dustSmall=Small Pile of Snow Powder +item.zbgt.material.snowpowder.dustTiny=Tiny Pile of Snow Powder zbgt.material.mar_ce_m_200=MAR-Ce-M200 zbgt.material.artherium_sn=Artherium-Sn @@ -437,6 +455,7 @@ zbgt.material.signalum=Signalum zbgt.material.vibrant_alloy=Vibrant Alloy zbgt.material.lumium=Lumium zbgt.material.eglin_steel=Eglin Steel +zbgt.material.cryotheum=Cryotheum zbgt.material.fluxed_electrum=Fluxed Electrum zbgt.material.hikarium=Hikarium