From ee156d37577682c15121b346dbb0b1a6355b6e95 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 14 Jan 2025 03:08:02 -0500 Subject: [PATCH 01/15] Update recipes to gt solar panels (#3811) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../loader/recipe/ResearchStationAssemblyLine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java index 7626c758eb5..22d3d49981c 100644 --- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2429,7 +2429,7 @@ private void addEOHRecipes() { GTOreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 48), largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), ItemList.Quantum_Chest_IV.get(1), + ItemList.Machine_UV_SolarPanel.get(1), ItemList.Quantum_Chest_IV.get(1), // Gravitation Engine getModItem(GraviSuite.ID, "itemSimpleItem", 64, 3), ItemList.EnergisedTesseract.get(1) }, @@ -2761,7 +2761,7 @@ private void addEOHRecipes() { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, fusionReactors[absoluteTier], fusionCoils[absoluteTier], // UV Solar panel - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", absoluteTier + 1, 0), + ItemList.Machine_UV_SolarPanel.get(absoluteTier + 1), new Object[] { OrePrefixes.circuit.get(Materials.UXV), absoluteTier + 1 }, // Red Spectral Component @@ -2901,7 +2901,7 @@ private void addEOHRecipes() { // Large Bedrockium Plate largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), + ItemList.Machine_UV_SolarPanel.get(1), // Ultimate Time Anomaly. ItemList.AcceleratorUV.get(4), // Gravitation Engine. @@ -2925,7 +2925,7 @@ private void addEOHRecipes() { 32, // amperage new Object[] { TileEntities.lsc.getStackForm(1), // UV Solar panel - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), + ItemList.Machine_UV_SolarPanel.get(1), // UHV Capacitor block new ItemStack(lscLapotronicEnergyUnit, 1, 5), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 4), From c1f7004330cb0c3fbe5fb69d3cf026e5b5f9f377 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:09:00 -0600 Subject: [PATCH 02/15] update --- dependencies.gradle | 4 ++-- settings.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index cd31dd1ba53..fb4972f50ad 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -80,7 +80,7 @@ dependencies { compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } - implementation("com.github.GTNewHorizons:Hodgepodge:2.6.13:dev") + implementation("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev") compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") @@ -97,7 +97,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:SC2:2.3.0:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Binnie:2.5.2:dev') {transitive = false} compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.1:dev'){transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:BlockRenderer6343:1.3.2:dev'){transitive=false} compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false } annotationProcessor("com.google.auto.value:auto-value:1.10.1") diff --git a/settings.gradle b/settings.gradle index 0147a994492..7a562ea19b2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31' } From 8786ba52acfc996764dfd41538c9f0c7e2f22dc1 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 14 Jan 2025 03:25:05 -0500 Subject: [PATCH 03/15] Add supercritical steams to steam valve and regulator (#3809) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../java/gregtech/common/covers/CoverSteamRegulator.java | 7 ++++++- src/main/java/gregtech/common/covers/CoverSteamValve.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/covers/CoverSteamRegulator.java b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java index 413e835ad29..fc4f1279c32 100644 --- a/src/main/java/gregtech/common/covers/CoverSteamRegulator.java +++ b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java @@ -13,6 +13,11 @@ public CoverSteamRegulator(int aTransferRate, ITexture coverTexture) { @Override protected boolean canTransferFluid(FluidStack fluid) { - return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid); + if (fluid == null) return false; + String fluidname = fluid.getFluid() + .getName(); + return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid) + || fluidname.equals("supercriticalsteam") + || fluidname.equals("densesupercriticalsteam"); } } diff --git a/src/main/java/gregtech/common/covers/CoverSteamValve.java b/src/main/java/gregtech/common/covers/CoverSteamValve.java index 329cf634a77..129bc3ed375 100644 --- a/src/main/java/gregtech/common/covers/CoverSteamValve.java +++ b/src/main/java/gregtech/common/covers/CoverSteamValve.java @@ -21,6 +21,11 @@ public boolean isRedstoneSensitive(ForgeDirection side, int aCoverID, int aCover @Override protected boolean canTransferFluid(FluidStack fluid) { - return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid); + if (fluid == null) return false; + String fluidname = fluid.getFluid() + .getName(); + return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid) + || fluidname.equals("supercriticalsteam") + || fluidname.equals("densesupercriticalsteam"); } } From c5b778166c21e38db77c4f66cc3225759dd71c49 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 15 Jan 2025 01:31:40 +0900 Subject: [PATCH 04/15] Add ways to modify ingredients shown on NEI (#3805) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> Co-authored-by: Martin Robertz --- .../loader/NaquadahReworkRecipeLoader.java | 15 ++- .../implementations/MTEMultiBlockBase.java | 4 +- .../api/recipe/NEIRecipeProperties.java | 27 ++++ .../recipe/NEIRecipePropertiesBuilder.java | 33 +++++ .../gregtech/api/recipe/RecipeMapBuilder.java | 35 ++++++ .../java/gregtech/api/recipe/RecipeMaps.java | 44 +++---- src/main/java/gregtech/api/util/GTRecipe.java | 13 -- .../gregtech/api/util/GTRecipeConstants.java | 4 +- .../java/gregtech/api/util/GTUtility.java | 5 - .../machines/multi/MTEPCBFactory.java | 2 +- .../postload/chains/PCBFactoryRecipes.java | 29 ++--- .../gregtech/nei/GTNEIDefaultHandler.java | 35 ++++-- .../gtPlusPlus/api/recipe/GTPPRecipeMaps.java | 51 +++----- .../MTEQuantumForceTransformer.java | 38 +++--- .../recipe/RecipeLoaderChemicalSkips.java | 117 +++++++----------- .../recipe/beamline/BeamlineRecipeAdder2.java | 21 +++- .../tileentity/recipe/beamline/RecipeSC.java | 22 ---- .../tileentity/recipe/beamline/RecipeTC.java | 24 ---- 18 files changed, 257 insertions(+), 262 deletions(-) diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 3f43a635231..ade10c92590 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -49,6 +49,7 @@ import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gregtech.common.items.MetaGeneratedItem01.registerCauldronCleaningFor; @@ -94,8 +95,7 @@ public static void RecipeLoad() { .itemInputs( naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), - Materials.Carbon.getDust(1), - GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + Materials.Carbon.getDust(1)) .itemOutputs( inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), @@ -107,6 +107,7 @@ public static void RecipeLoad() { Materials.Oxygen.getGas(100L)) .duration(10 * SECONDS) .eut(GTValues.VP[10]) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Enriched Naquadah (UIV) @@ -114,21 +115,18 @@ public static void RecipeLoad() { .itemInputs( enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), - Materials.Carbon.getDust(1), - GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + Materials.Carbon.getDust(1)) .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64)) .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) .fluidOutputs(wasteLiquid.getFluidOrGas(32000)) .duration(10 * SECONDS) .eut(GTValues.VP[11]) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Naquadria (UMV) GTValues.RA.stdBuilder() - .itemInputs( - naquadriaEarth.get(OrePrefixes.dust, 32), - Materials.Magnesium.getDust(64), - GTUtility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) + .itemInputs(naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64)) .itemOutputs( inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), @@ -140,6 +138,7 @@ public static void RecipeLoad() { Materials.Oxygen.getGas(100L)) .duration(5 * SECONDS) .eut(GTValues.VP[12]) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java index 5210c567df3..98b41a62f21 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java @@ -969,8 +969,8 @@ protected CheckRecipeResult doCheckRecipe() { } /** - * Override to perform additional checkRecipe logic. It gets called after CRIBs and before ordinal hatches. - * + * Override to perform additional checkRecipe logic. It gets called after CRIBs and before ordinary hatches. + * * @param lastResult Last result of checkRecipe. It might contain interesting info about failure, so don't blindly * overwrite it. Refer to {@link #doCheckRecipe} for how to handle it. * @return Result of the checkRecipe. diff --git a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java index 1b62ca03901..f465d516b1b 100644 --- a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java +++ b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java @@ -1,11 +1,15 @@ package gregtech.api.recipe; import java.util.Comparator; +import java.util.function.Function; import java.util.function.UnaryOperator; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.math.Size; @@ -67,6 +71,23 @@ static NEIRecipePropertiesBuilder builder() { */ public final boolean renderRealStackSizes; + /** + * Specifies what item inputs get displayed on NEI. + */ + public final Function itemInputsGetter; + /** + * Specifies what fluid inputs get displayed on NEI. + */ + public final Function fluidInputsGetter; + /** + * Specifies what item outputs get displayed on NEI. + */ + public final Function itemOutputsGetter; + /** + * Specifies what fluid outputs get displayed on NEI. + */ + public final Function fluidOutputsGetter; + /** * Comparator for NEI recipe sort. {@link GTRecipe#compareTo(GTRecipe)} by default. */ @@ -75,6 +96,8 @@ static NEIRecipePropertiesBuilder builder() { NEIRecipeProperties(boolean registerNEI, @Nullable UnaryOperator handlerInfoCreator, Size recipeBackgroundSize, Pos2d recipeBackgroundOffset, INEISpecialInfoFormatter neiSpecialInfoFormatter, boolean unificateOutput, boolean useCustomFilter, boolean renderRealStackSizes, + Function itemInputsGetter, Function fluidInputsGetter, + Function itemOutputsGetter, Function fluidOutputsGetter, Comparator comparator) { this.registerNEI = registerNEI; this.handlerInfoCreator = handlerInfoCreator; @@ -84,6 +107,10 @@ static NEIRecipePropertiesBuilder builder() { this.unificateOutput = unificateOutput; this.useCustomFilter = useCustomFilter; this.renderRealStackSizes = renderRealStackSizes; + this.itemInputsGetter = itemInputsGetter; + this.fluidInputsGetter = fluidInputsGetter; + this.itemOutputsGetter = itemOutputsGetter; + this.fluidOutputsGetter = fluidOutputsGetter; this.comparator = comparator; } } diff --git a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java index 3b47e9ce139..038a5c76878 100644 --- a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java +++ b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java @@ -1,11 +1,15 @@ package gregtech.api.recipe; import java.util.Comparator; +import java.util.function.Function; import java.util.function.UnaryOperator; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.math.Size; @@ -36,6 +40,11 @@ public final class NEIRecipePropertiesBuilder { private boolean useCustomFilter; private boolean renderRealStackSizes = true; + private Function itemInputsGetter = recipe -> recipe.mInputs; + private Function fluidInputsGetter = recipe -> recipe.mFluidInputs; + private Function itemOutputsGetter = recipe -> recipe.mOutputs; + private Function fluidOutputsGetter = recipe -> recipe.mFluidOutputs; + private Comparator comparator = GTRecipe::compareTo; NEIRecipePropertiesBuilder() {} @@ -50,6 +59,10 @@ public NEIRecipeProperties build() { unificateOutput, useCustomFilter, renderRealStackSizes, + itemInputsGetter, + fluidInputsGetter, + itemOutputsGetter, + fluidOutputsGetter, comparator); } @@ -93,6 +106,26 @@ public NEIRecipePropertiesBuilder disableRenderRealStackSizes() { return this; } + public NEIRecipePropertiesBuilder itemInputsGetter(Function itemInputsGetter) { + this.itemInputsGetter = itemInputsGetter; + return this; + } + + public NEIRecipePropertiesBuilder fluidInputsGetter(Function fluidInputsGetter) { + this.fluidInputsGetter = fluidInputsGetter; + return this; + } + + public NEIRecipePropertiesBuilder itemOutputsGetter(Function itemOutputsGetter) { + this.itemOutputsGetter = itemOutputsGetter; + return this; + } + + public NEIRecipePropertiesBuilder fluidOutputsGetter(Function fluidOutputsGetter) { + this.fluidOutputsGetter = fluidOutputsGetter; + return this; + } + public NEIRecipePropertiesBuilder recipeComparator(Comparator comparator) { this.comparator = comparator; return this; diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java b/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java index 2b7bc390664..ee8953570a8 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java +++ b/src/main/java/gregtech/api/recipe/RecipeMapBuilder.java @@ -11,6 +11,9 @@ import javax.annotation.ParametersAreNonnullByDefault; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.drawable.UITexture; @@ -475,6 +478,38 @@ public RecipeMapBuilder disableRenderRealStackSizes() { return this; } + /** + * Allows modifying what item inputs get displayed on NEI, without affecting GTRecipe object on backend. + */ + public RecipeMapBuilder neiItemInputsGetter(Function itemInputsGetter) { + neiPropertiesBuilder.itemInputsGetter(itemInputsGetter); + return this; + } + + /** + * Allows modifying what fluid inputs get displayed on NEI, without affecting GTRecipe object on backend. + */ + public RecipeMapBuilder neiFluidInputsGetter(Function fluidInputsGetter) { + neiPropertiesBuilder.fluidInputsGetter(fluidInputsGetter); + return this; + } + + /** + * Allows modifying what item outputs get displayed on NEI, without affecting GTRecipe object on backend. + */ + public RecipeMapBuilder neiItemOutputsGetter(Function itemOutputsGetter) { + neiPropertiesBuilder.itemOutputsGetter(itemOutputsGetter); + return this; + } + + /** + * Allows modifying what fluid outputs get displayed on NEI, without affecting GTRecipe object on backend. + */ + public RecipeMapBuilder neiFluidOutputsGetter(Function fluidOutputsGetter) { + neiPropertiesBuilder.fluidOutputsGetter(fluidOutputsGetter); + return this; + } + /** * Sets custom comparator for NEI recipe sort. */ diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 6c7fbe7b48f..f1f036baef2 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -9,6 +9,7 @@ import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import static gregtech.api.util.GTRecipeConstants.GLASS; +import static gregtech.api.util.GTRecipeConstants.PCB_NANITE_MATERIAL; import static gregtech.api.util.GTRecipeMapUtil.GTRecipeTemplate; import static gregtech.api.util.GTRecipeMapUtil.asTemplate; import static gregtech.api.util.GTRecipeMapUtil.buildOrEmpty; @@ -20,6 +21,7 @@ import static gregtech.api.util.GTUtility.multiplyStack; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -1102,18 +1104,23 @@ && isArrayEmptyOrNull(b.getFluidOutputs()) .minInputs(3, 1) .progressBar(GTUITextures.PROGRESSBAR_ASSEMBLE) .disableOptimize() - .neiHandlerInfo(builder -> builder.setDisplayStack(ItemList.PCBFactory.get(1))) + .neiItemInputsGetter(recipe -> { + Materials naniteMaterial = recipe.getMetadata(PCB_NANITE_MATERIAL); + if (naniteMaterial == null) { + return recipe.mInputs; + } + List inputs = new ArrayList<>(); + inputs.add(recipe.mInputs[0]); + ItemStack naniteStack = naniteMaterial.getNanite(1); + inputs.add(new ItemStack(naniteStack.getItem(), 0, naniteStack.getItemDamage())); + inputs.addAll(Arrays.asList(Arrays.copyOfRange(recipe.mInputs, 1, recipe.mInputs.length))); + return inputs.toArray(new ItemStack[0]); + }) .neiRecipeComparator( Comparator .comparing(recipe -> recipe.getMetadataOrDefault(PCBFactoryTierKey.INSTANCE, 1)) .thenComparing(GTRecipe::compareTo)) .build(); - public static final RecipeMap pcbFactoryRecipesNoNanites = RecipeMapBuilder - .of("gt.recipe.pcbfactorynonanites") - .maxIO(6, 9, 3, 0) - .minInputs(3, 1) - .disableOptimize() - .build(); public static final RecipeMap purificationClarifierRecipes = RecipeMapBuilder .of("gt.recipe.purificationplantclarifier") .maxIO(1, 4, 1, 1) @@ -1236,28 +1243,5 @@ && isArrayEmptyOrNull(b.getFluidOutputs()) b.copy() .duration(1 * TICK) .eut(TierEU.RECIPE_UEV)))); - RecipeMaps.pcbFactoryRecipes.addDownstream(IRecipeMap.newRecipeMap(b -> { - b = b.copy(); - List itemInputs = new ArrayList<>(); - - Materials naniteMaterial = null; - for (int i = 0; i < b.getItemInputsBasic().length; i++) { - ItemStack stack = b.getItemInputBasic(i); - if (stack == null) continue; - ItemData data = GTOreDictUnificator.getAssociation(stack); - if (data != null && data.mPrefix != null && data.mPrefix.equals(OrePrefixes.nanite)) { - naniteMaterial = data.mMaterial.mMaterial; - continue; - } - itemInputs.add(stack); - } - - if (naniteMaterial != null) { - b.metadata(GTRecipeConstants.PCB_NANITE_MATERIAL, naniteMaterial); - } - return RecipeMaps.pcbFactoryRecipesNoNanites.doAdd( - b.itemInputs(itemInputs.toArray(new ItemStack[0])) - .hidden()); - })); } } diff --git a/src/main/java/gregtech/api/util/GTRecipe.java b/src/main/java/gregtech/api/util/GTRecipe.java index 329816c6c5c..e3ec2cb5fd8 100644 --- a/src/main/java/gregtech/api/util/GTRecipe.java +++ b/src/main/java/gregtech/api/util/GTRecipe.java @@ -39,7 +39,6 @@ import gregtech.api.util.extensions.ArrayExt; import gregtech.common.tileentities.machines.MTEHatchInputBusME; import gregtech.common.tileentities.machines.MTEHatchInputME; -import gregtech.nei.GTNEIDefaultHandler; import ic2.core.Ic2Items; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectArrayList; @@ -383,18 +382,6 @@ public ItemStack getOutput(int aIndex) { return GTUtility.copyOrNull(mOutputs[aIndex]); } - /** - * Dictates the ItemStacks displayed in the output slots of any NEI page handled by the default GT NEI handler. - * Override to make shown items differ from a GTRecipe's item output array - * - * @see GTNEIDefaultHandler - * @param i Slot index - * @return ItemStack to be displayed in the slot - */ - public ItemStack getRepresentativeOutput(int i) { - return getOutput(i); - } - public int getOutputChance(int aIndex) { if (mChances == null) return 10000; if (aIndex < 0 || aIndex >= mChances.length) return 10000; diff --git a/src/main/java/gregtech/api/util/GTRecipeConstants.java b/src/main/java/gregtech/api/util/GTRecipeConstants.java index 0edba4df3f7..175a62cd51d 100644 --- a/src/main/java/gregtech/api/util/GTRecipeConstants.java +++ b/src/main/java/gregtech/api/util/GTRecipeConstants.java @@ -168,8 +168,8 @@ public class GTRecipeConstants { /** * QFT catalyst meta. */ - public static final RecipeMetadataKey QFT_CATALYST_META = SimpleRecipeMetadataKey - .create(Integer.class, "qft_catalyst_meta"); + public static final RecipeMetadataKey QFT_CATALYST = SimpleRecipeMetadataKey + .create(ItemStack.class, "qft_catalyst"); /** * Tier of advanced compression (HIP/black hole) diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index 8098c372fd4..2e00dd42b77 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -4660,11 +4660,6 @@ public static byte convertRatioToRedstone(long used, long max, int threshold, bo return signal; } - public static ItemStack getNaniteAsCatalyst(Materials material) { - ItemStack aItem = material.getNanite(1); - return new ItemStack(aItem.getItem(), 0, aItem.getItemDamage()); - } - public static Stream streamCompounds(NBTTagList list) { if (list == null) return Stream.empty(); return IntStream.range(0, list.tagCount()) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java index caa163f387b..0e53903caa8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java @@ -541,7 +541,7 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a @Override public RecipeMap getRecipeMap() { - return RecipeMaps.pcbFactoryRecipesNoNanites; + return RecipeMaps.pcbFactoryRecipes; } @Override diff --git a/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java index dd268ceb2a2..d19ef64da41 100644 --- a/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/PCBFactoryRecipes.java @@ -5,6 +5,7 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.PCB_NANITE_MATERIAL; import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GTRecipeConstants.SCANNING; import static gtPlusPlus.core.material.MaterialsAlloy.QUANTUM; @@ -134,7 +135,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator @@ -147,6 +147,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 1; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) { @@ -160,7 +161,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator @@ -173,6 +173,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -212,7 +213,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), @@ -224,6 +224,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 2; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) { @@ -237,7 +238,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), @@ -249,6 +249,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -289,7 +290,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), @@ -302,6 +302,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 3; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) { @@ -315,7 +316,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), @@ -328,6 +328,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -367,7 +368,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), @@ -379,6 +379,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 4; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) { @@ -392,7 +393,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), @@ -404,6 +404,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -447,7 +448,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator @@ -462,6 +462,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .metadata(UPGRADE, BIO) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -476,7 +477,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator @@ -491,6 +491,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .metadata(UPGRADE, BIO) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -537,7 +538,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get( @@ -554,6 +554,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .metadata(UPGRADE, BIO) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -568,7 +569,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GTOreDictUnificator.get( @@ -585,6 +585,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .metadata(UPGRADE, BIO) .addTo(RecipeMaps.pcbFactoryRecipes); } @@ -631,7 +632,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(2), - GTUtility.getNaniteAsCatalyst(Materials.Silver), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), new ItemStack( @@ -649,6 +649,7 @@ public static void load() { .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 2) + .metadata(PCB_NANITE_MATERIAL, Materials.Silver) .addTo(RecipeMaps.pcbFactoryRecipes); } for (int tier = 7; tier <= PCBFactoryManager.mTiersOfPlastics; tier++) { @@ -662,7 +663,6 @@ public static void load() { GTValues.RA.stdBuilder() .itemInputs( GTUtility.getIntegratedCircuit(3), - GTUtility.getNaniteAsCatalyst(Materials.Gold), PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), new ItemStack( @@ -680,6 +680,7 @@ public static void load() { .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) .eut((int) GTValues.VP[tier + 1] * 3 / 4) .metadata(TIER, 3) + .metadata(PCB_NANITE_MATERIAL, Materials.Gold) .addTo(RecipeMaps.pcbFactoryRecipes); } } diff --git a/src/main/java/gregtech/nei/GTNEIDefaultHandler.java b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java index c3be2cd9f47..8bb8bb42e1c 100644 --- a/src/main/java/gregtech/nei/GTNEIDefaultHandler.java +++ b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java @@ -570,9 +570,17 @@ public CachedDefaultRecipe(GTRecipe aRecipe) { .getItemHandler() == itemInputsInventory) { int i = widget.getMcSlot() .getSlotIndex(); - Object input = aRecipe instanceof GTRecipe.GTRecipe_WithAlt - ? ((GTRecipe.GTRecipe_WithAlt) aRecipe).getAltRepresentativeInput(i) - : aRecipe.getRepresentativeInput(i); + final Object input; + if (aRecipe instanceof GTRecipe.GTRecipe_WithAlt withAltRecipe) { + input = withAltRecipe.getRepresentativeInput(i); + } else { + ItemStack[] inputs = GTNEIDefaultHandler.this.neiProperties.itemInputsGetter.apply(aRecipe); + if (i < inputs.length && inputs[i] != null) { + input = inputs[i]; + } else { + input = null; + } + } if (input != null) { mInputs.add( new FixedPositionedStack( @@ -586,11 +594,12 @@ public CachedDefaultRecipe(GTRecipe aRecipe) { .getItemHandler() == itemOutputsInventory) { int i = widget.getMcSlot() .getSlotIndex(); - ItemStack output = aRecipe.getRepresentativeOutput(i); - if (output != null) { + ItemStack[] outputs = GTNEIDefaultHandler.this.neiProperties.itemOutputsGetter + .apply(aRecipe); + if (i < outputs.length && outputs[i] != null) { mOutputs.add( new FixedPositionedStack( - output, + outputs[i], GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes, widget.getPos().x + 1, widget.getPos().y + 1, @@ -612,11 +621,12 @@ public CachedDefaultRecipe(GTRecipe aRecipe) { .getItemHandler() == fluidInputsInventory) { int i = widget.getMcSlot() .getSlotIndex(); - if (aRecipe.mFluidInputs.length > i && aRecipe.mFluidInputs[i] != null - && aRecipe.mFluidInputs[i].getFluid() != null) { + FluidStack[] inputs = GTNEIDefaultHandler.this.neiProperties.fluidInputsGetter + .apply(aRecipe); + if (inputs.length > i && inputs[i] != null && inputs[i].getFluid() != null) { mInputs.add( new FixedPositionedStack( - GTUtility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true), + GTUtility.getFluidDisplayStack(inputs[i], true), GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes, widget.getPos().x + 1, widget.getPos().y + 1)); @@ -625,11 +635,12 @@ public CachedDefaultRecipe(GTRecipe aRecipe) { .getItemHandler() == fluidOutputsInventory) { int i = widget.getMcSlot() .getSlotIndex(); - if (aRecipe.mFluidOutputs.length > i && aRecipe.mFluidOutputs[i] != null - && aRecipe.mFluidOutputs[i].getFluid() != null) { + FluidStack[] outputs = GTNEIDefaultHandler.this.neiProperties.fluidOutputsGetter + .apply(aRecipe); + if (outputs.length > i && outputs[i] != null && outputs[i].getFluid() != null) { mOutputs.add( new FixedPositionedStack( - GTUtility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true), + GTUtility.getFluidDisplayStack(outputs[i], true), GTNEIDefaultHandler.this.neiProperties.renderRealStackSizes, widget.getPos().x + 1, widget.getPos().y + 1)); diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java index 2ee6ff219a6..5aeb30b2c40 100644 --- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java +++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java @@ -1,7 +1,7 @@ package gtPlusPlus.api.recipe; import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER; -import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST_META; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import java.util.ArrayList; import java.util.Arrays; @@ -14,7 +14,6 @@ import com.gtnewhorizons.modularui.common.widget.ProgressBar; import gregtech.api.gui.modularui.GTUITextures; -import gregtech.api.interfaces.IRecipeMap; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; @@ -27,7 +26,6 @@ import gregtech.nei.formatter.SimpleSpecialValueFormatter; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; @@ -54,19 +52,25 @@ public class GTPPRecipeMaps { public static final RecipeMap quantumForceTransformerRecipes = RecipeMapBuilder .of("gtpp.recipe.quantumforcesmelter") .maxIO(6, 6, 6, 6) - .minInputs(1, 0) + .minInputs(0, 0) .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) - .neiHandlerInfo(builder -> builder.setDisplayStack(GregtechItemList.QuantumForceTransformer.get(1))) + .recipeTransformer(recipe -> { + ItemStack catalyst = recipe.getMetadata(QFT_CATALYST); + if (catalyst == null) { + throw new IllegalStateException("QFT catalyst must be set via metadata QFT_CATALYST"); + } + }) .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("GT5U.nei.tier")) + .neiItemInputsGetter(recipe -> { + ItemStack catalyst = recipe.getMetadata(QFT_CATALYST); + assert catalyst != null; + List inputs = new ArrayList<>(Arrays.asList(recipe.mInputs)); + inputs.add(catalyst); + return inputs.toArray(new ItemStack[0]); + }) .frontend(QuantumForceTransformerFrontend::new) .disableOptimize() .build(); - public static final RecipeMap quantumForceTransformerRecipesNoCatalysts = RecipeMapBuilder - .of("gtpp.recipe.quantumforcesmelternocatalysts") - .maxIO(6, 6, 6, 6) - .minInputs(0, 0) - .disableOptimize() - .build(); public static final RecipeMap chemicalDehydratorRecipes = RecipeMapBuilder .of("gtpp.recipe.chemicaldehydrator") .maxIO(2, 9, 1, 1) @@ -254,29 +258,4 @@ public class GTPPRecipeMaps { .maxIO(2, 1, 0, 0) .disableRegisterNEI() .build(); - - static { - GTPPRecipeMaps.quantumForceTransformerRecipes.addDownstream(IRecipeMap.newRecipeMap(b -> { - b = b.copy(); - List itemInputs = new ArrayList<>(); - - int meta = -1; - for (int i = 0; i < b.getItemInputsBasic().length; i++) { - ItemStack stack = b.getItemInputBasic(i); - if (stack == null) continue; - if (ItemUtils.isCatalyst(stack)) { - meta = stack.getItemDamage(); - continue; - } - itemInputs.add(stack); - } - - if (meta != -1) { - b.metadata(QFT_CATALYST_META, meta); - } - return GTPPRecipeMaps.quantumForceTransformerRecipesNoCatalysts.doAdd( - b.itemInputs(itemInputs.toArray(new ItemStack[0])) - .hidden()); - })); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java index cb0177bdf16..3c226c33c73 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java @@ -438,7 +438,7 @@ protected int getCasingTextureId() { @Override public RecipeMap getRecipeMap() { - return GTPPRecipeMaps.quantumForceTransformerRecipesNoCatalysts; + return GTPPRecipeMaps.quantumForceTransformerRecipes; } @Override @@ -461,25 +461,25 @@ protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { } int numberOfCatalyst = 0; - int catalystMeta = recipe.getMetadataOrDefault(GTRecipeConstants.QFT_CATALYST_META, -1); - if (catalystMeta != -1) { - if (catalystHounsings.isEmpty()) { - return SimpleCheckRecipeResult.ofFailure("no_catalyst"); - } - boolean catalystsFound = false; - for (MTEHatchBulkCatalystHousing catalystHousing : catalystHounsings) { - ItemStack storedCatalysts = catalystHousing.getItemStack(); - int storedCatalystMeta = catalystHousing.getStoredCatalystMeta(); - if (storedCatalysts == null || storedCatalystMeta != catalystMeta) { - continue; - } - numberOfCatalyst = catalystHousing.getItemCount(); - catalystsFound = true; - break; - } - if (!catalystsFound) { - return SimpleCheckRecipeResult.ofFailure("no_catalyst"); + ItemStack requiredCatalyst = recipe.getMetadata(GTRecipeConstants.QFT_CATALYST); + assert requiredCatalyst != null; + int catalystMeta = requiredCatalyst.getItemDamage(); + if (catalystHounsings.isEmpty()) { + return SimpleCheckRecipeResult.ofFailure("no_catalyst"); + } + boolean catalystsFound = false; + for (MTEHatchBulkCatalystHousing catalystHousing : catalystHounsings) { + ItemStack storedCatalysts = catalystHousing.getItemStack(); + int storedCatalystMeta = catalystHousing.getStoredCatalystMeta(); + if (storedCatalysts == null || storedCatalystMeta != catalystMeta) { + continue; } + numberOfCatalyst = catalystHousing.getItemCount(); + catalystsFound = true; + break; + } + if (!catalystsFound) { + return SimpleCheckRecipeResult.ofFailure("no_catalyst"); } mMaxParallel = numberOfCatalyst; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java index 4f2714b30cd..a44db852ddc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java @@ -11,6 +11,7 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; @@ -70,9 +71,7 @@ private static void quantumTransformerRecipes() { ItemStack biocells = GTUtility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1)); // Platline GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32)) .itemOutputs( Materials.Platinum.getDust(64), Materials.Palladium.getDust(64), @@ -82,46 +81,42 @@ private static void quantumTransformerRecipes() { WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Partial platline (from Pd, Os, Ir, Rh and leach) GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.PDMetallicPowder.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.PDMetallicPowder.get(OrePrefixes.dust, 32)) .itemOutputs( Materials.Palladium.getDust(64), Materials.Platinum.getDust(64), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.IrLeachResidue.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.IrLeachResidue.get(OrePrefixes.dust, 32)) .itemOutputs( Materials.Iridium.getDust(64), Materials.Platinum.getDust(64), Materials.Osmiridium.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.IrOsLeachResidue.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.IrOsLeachResidue.get(OrePrefixes.dust, 32)) .itemOutputs(Materials.Osmium.getDust(64), Materials.Iridium.getDust(64), Materials.Osmiridium.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.CrudeRhMetall.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.CrudeRhMetall.get(OrePrefixes.dust, 32)) .itemOutputs( WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), Materials.Palladium.getDust(64), @@ -129,12 +124,11 @@ private static void quantumTransformerRecipes() { WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.LeachResidue.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + .itemInputs(WerkstoffLoader.LeachResidue.get(OrePrefixes.dust, 32)) .itemOutputs( Materials.Iridium.getDust(64), Materials.Osmium.getDust(64), @@ -142,11 +136,12 @@ private static void quantumTransformerRecipes() { WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Early Plastics GTValues.RA.stdBuilder() - .itemInputs(Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0)) + .itemInputs(Materials.Carbon.getDust(64)) .fluidInputs( Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), @@ -161,11 +156,12 @@ private static void quantumTransformerRecipes() { Materials.Polybenzimidazole.getMolten(144 * 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_ZPM) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlasticPolymerCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Early Rubbers/Cable Materials GTValues.RA.stdBuilder() - .itemInputs(Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0)) + .itemInputs(Materials.Carbon.getDust(64)) .fluidInputs( Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), @@ -177,15 +173,13 @@ private static void quantumTransformerRecipes() { Materials.Rubber.getMolten(144 * 256)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_ZPM) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRubberPolymerCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .noBuffer() .addTo(quantumForceTransformerRecipes); // Glues and Solders GTValues.RA.stdBuilder() - .itemInputs( - Materials.Carbon.getDust(32), - Materials.Bismuth.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0)) + .itemInputs(Materials.Carbon.getDust(32), Materials.Bismuth.getDust(32)) .itemOutputs(ItemList.StableAdhesive.get(1)) .fluidInputs(Materials.Oxygen.getGas(10000), Materials.Hydrogen.getGas(10000)) .fluidOutputs( @@ -195,15 +189,12 @@ private static void quantumTransformerRecipes() { Materials.SolderingAlloy.getMolten(144 * 128)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mAdhesionPromoterCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Titanium, Tungsten, Indium GTValues.RA.stdBuilder() - .itemInputs( - Materials.Lead.getDust(16), - Materials.Bauxite.getDust(32), - Materials.Tungstate.getDust(16), - ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0)) + .itemInputs(Materials.Lead.getDust(16), Materials.Bauxite.getDust(32), Materials.Tungstate.getDust(16)) .itemOutputs( Materials.Titanium.getDust(64), Materials.TungstenSteel.getDust(64), @@ -211,14 +202,11 @@ private static void quantumTransformerRecipes() { Materials.Indium.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mTitaTungstenIndiumCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - Materials.Rutile.getDust(32), - Materials.Scheelite.getDust(16), - Materials.Ilmenite.getDust(16), - ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0)) + .itemInputs(Materials.Rutile.getDust(32), Materials.Scheelite.getDust(16), Materials.Ilmenite.getDust(16)) .itemOutputs( Materials.Titanium.getDust(64), Materials.TungstenSteel.getDust(64), @@ -228,14 +216,12 @@ private static void quantumTransformerRecipes() { MaterialsElements.getInstance().HAFNIUM.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mTitaTungstenIndiumCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Thorium, Uranium, Plutonium GTValues.RA.stdBuilder() - .itemInputs( - Materials.Thorium.getDust(32), - Materials.Uranium.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0)) + .itemInputs(Materials.Thorium.getDust(32), Materials.Uranium.getDust(32)) .itemOutputs( MaterialsElements.getInstance().THORIUM232.getDust(64), MaterialsElements.getInstance().URANIUM233.getDust(64), @@ -245,13 +231,12 @@ private static void quantumTransformerRecipes() { Materials.Plutonium241.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRadioactivityCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); // Monaline GTValues.RA.stdBuilder() - .itemInputs( - Materials.Monazite.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) + .itemInputs(Materials.Monazite.getDust(32)) .itemOutputs( Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), @@ -261,13 +246,12 @@ private static void quantumTransformerRecipes() { ItemList.SuperconductorComposite.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRareEarthGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Bastline GTValues.RA.stdBuilder() - .itemInputs( - Materials.Bastnasite.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) + .itemInputs(Materials.Bastnasite.getDust(32)) .itemOutputs( Materials.Holmium.getDust(64), Materials.Cerium.getDust(64), @@ -276,13 +260,12 @@ private static void quantumTransformerRecipes() { Materials.Lanthanum.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRareEarthGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Bastline from Cerium-rich mixture GTValues.RA.stdBuilder() - .itemInputs( - WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 16), - ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0)) + .itemInputs(WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 16)) .itemOutputs( Materials.Holmium.getDust(64), Materials.Cerium.getDust(64), @@ -291,6 +274,7 @@ private static void quantumTransformerRecipes() { Materials.Lanthanum.getDust(64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRareEarthGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Stem Cells @@ -298,19 +282,18 @@ private static void quantumTransformerRecipes() { .itemInputs( Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), - getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 32, 2), - ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0)) + getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 32, 2)) .itemOutputs(stemcells) .fluidOutputs( Materials.GrowthMediumRaw.getFluid(1000 * 1024), Materials.GrowthMediumSterilized.getFluid(1000 * 512)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UEV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mRawIntelligenceCatalyst)) .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Unknown Particles GTValues.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(GenericChem.mParticleAccelerationCatalyst, 0)) .itemOutputs( Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.GRAVITON), @@ -320,14 +303,12 @@ private static void quantumTransformerRecipes() { .fluidOutputs(FluidUtils.getFluidStack("plasma.hydrogen", 1000)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UEV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mParticleAccelerationCatalyst)) .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Lategame Plastics (Missing Radox Polymer and Heavy Radox) GTValues.RA.stdBuilder() - .itemInputs( - Materials.Carbon.getDust(64), - Materials.Osmium.getDust(24), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0)) + .itemInputs(Materials.Carbon.getDust(64), Materials.Osmium.getDust(24)) .fluidInputs(Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16)) .fluidOutputs( FluidUtils.getFluidStack("xenoxene", 1000 * 16), @@ -336,15 +317,13 @@ private static void quantumTransformerRecipes() { MaterialsKevlar.Kevlar.getMolten(144 * 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UIV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mUltimatePlasticCatalyst)) .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); if (Mods.Forestry.isModLoaded()) { // Lategame Kevlar using Kevlar bee comb GTValues.RA.stdBuilder() - .itemInputs( - GTBees.combs.getStackForType(CombType.KEVLAR, 24), - Materials.Carbon.getDust(64), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0)) + .itemInputs(GTBees.combs.getStackForType(CombType.KEVLAR, 24), Materials.Carbon.getDust(64)) .fluidInputs(Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16)) .fluidOutputs( MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32), @@ -352,6 +331,7 @@ private static void quantumTransformerRecipes() { MaterialsKevlar.Kevlar.getMolten(144 * 64)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UIV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mUltimatePlasticCatalyst)) .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); // Platline skip using Platline Combs (Palladium, Osmium, Iridium, Platinum) @@ -360,8 +340,7 @@ private static void quantumTransformerRecipes() { GTBees.combs.getStackForType(CombType.PLATINUM, 32), GTBees.combs.getStackForType(CombType.PALLADIUM, 32), GTBees.combs.getStackForType(CombType.OSMIUM, 32), - GTBees.combs.getStackForType(CombType.IRIDIUM, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0)) + GTBees.combs.getStackForType(CombType.IRIDIUM, 32)) .fluidOutputs( Materials.Osmium.getMolten(144 * 256), Materials.Palladium.getMolten(144 * 256), @@ -369,15 +348,13 @@ private static void quantumTransformerRecipes() { Materials.Platinum.getMolten(144 * 256)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mPlatinumGroupCatalyst)) .metadata(QFT_FOCUS_TIER, 1) .addTo(quantumForceTransformerRecipes); } // Bio Cells and Mutated Solder GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Chip_Stemcell.get(16), - Materials.InfinityCatalyst.getDust(4), - ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0)) + .itemInputs(ItemList.Circuit_Chip_Stemcell.get(16), Materials.InfinityCatalyst.getDust(4)) .itemOutputs(biocells) .fluidOutputs( MaterialMisc.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), @@ -385,13 +362,12 @@ private static void quantumTransformerRecipes() { Materials.BioMediumRaw.getFluid(1000 * 512)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UIV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mBiologicalIntelligenceCatalyst)) .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); // Rare Particles GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(GenericChem.mSynchrotronCapableCatalyst, 0), - GregtechItemList.Laser_Lens_Special.get(1)) + .itemInputs(GregtechItemList.Laser_Lens_Special.get(1)) .itemOutputs( Particle.getBaseParticle(Particle.Z_BOSON), Particle.getBaseParticle(Particle.W_BOSON), @@ -405,6 +381,7 @@ private static void quantumTransformerRecipes() { new FluidStack(MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 30000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_UIV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mSynchrotronCapableCatalyst)) .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); @@ -413,10 +390,7 @@ private static void quantumTransformerRecipes() { ItemStack seaweed = GTUtility .copyAmountUnsafe(64 * 32, getModItem(GalaxySpace.ID, "tcetiedandelions", 1, 4)); GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get("cropSeaweed", 64), - Materials.Mytryl.getDust(16), - ItemUtils.getSimpleStack(GenericChem.mAlgagenicGrowthPromoterCatalyst, 0)) + .itemInputs(GTOreDictUnificator.get("cropSeaweed", 64), Materials.Mytryl.getDust(16)) .itemOutputs(seaweed, getModItem(NewHorizonsCoreMod.ID, "item.TCetiESeaweedExtract", 16)) .fluidInputs(FluidUtils.getFluidStack("unknowwater", 25_000)) .fluidOutputs( @@ -424,6 +398,7 @@ private static void quantumTransformerRecipes() { FluidUtils.getFluidStack("iodine", 64_000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UIV) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.mAlgagenicGrowthPromoterCatalyst)) .metadata(QFT_FOCUS_TIER, 4) .addTo(quantumForceTransformerRecipes); diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeAdder2.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeAdder2.java index dad71375c30..d8a6b617cbb 100644 --- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeAdder2.java +++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeAdder2.java @@ -1,6 +1,8 @@ package gtnhlanth.common.tileentity.recipe.beamline; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -11,6 +13,7 @@ import gregtech.api.recipe.RecipeMapBuilder; import gregtech.api.util.GTUtility; import gtnhlanth.common.beamline.Particle; +import gtnhlanth.common.register.LanthItemList; public class BeamlineRecipeAdder2 { @@ -47,8 +50,13 @@ public class BeamlineRecipeAdder2 { ); }) - // .slotOverlays(null) - + .neiItemOutputsGetter(recipe -> { + RecipeSC scRecipe = (RecipeSC) recipe; + ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM, 1, scRecipe.particleId); + List ret = new ArrayList<>(Arrays.asList(recipe.mOutputs)); + ret.add(particleStack); + return ret.toArray(new ItemStack[0]); + }) .build(); public final RecipeMap TargetChamberRecipes = RecipeMapBuilder.of("gtnhlanth.recipe.tc") @@ -84,7 +92,14 @@ public class BeamlineRecipeAdder2 { ); })) - // .slotOverlays(null) + .neiItemInputsGetter(recipe -> { + RecipeTC recipeTC = (RecipeTC) recipe; + ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM, 1, recipeTC.particleId); + List ret = new ArrayList<>(); + ret.add(particleStack); + ret.addAll(Arrays.asList(recipe.mInputs)); + return ret.toArray(new ItemStack[0]); + }) .progressBar(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1) .progressBarPos(108, 22) .neiTransferRect(100, 22, 28, 18) diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java index 162b94b75e8..6e10a1d4f04 100644 --- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java +++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java @@ -1,15 +1,9 @@ package gtnhlanth.common.tileentity.recipe.beamline; -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import gregtech.api.util.GTRecipe; -import gregtech.api.util.GTUtility; -import gtnhlanth.common.register.LanthItemList; public class RecipeSC extends GTRecipe { @@ -31,20 +25,4 @@ public RecipeSC(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Ob this.focus = focus; this.energyRatio = energyRatio; } - - @Override - public ItemStack getRepresentativeOutput(int aIndex) { - - ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM); - - Items.ender_pearl.setDamage(particleStack, this.particleId); - - ArrayList mOutputsWithParticle = new ArrayList<>(Arrays.asList(mOutputs)); - mOutputsWithParticle.add(particleStack); - - ItemStack[] mOutputsWithParticleArray = mOutputsWithParticle.toArray(new ItemStack[0]); - - if (aIndex < 0 || aIndex >= mOutputsWithParticleArray.length) return null; - return GTUtility.copyOrNull(mOutputsWithParticleArray[aIndex]); - } } diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeTC.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeTC.java index 30be015abb1..3c1b0fe4ec0 100644 --- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeTC.java +++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeTC.java @@ -1,14 +1,8 @@ package gtnhlanth.common.tileentity.recipe.beamline; -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.api.util.GTRecipe; -import gregtech.api.util.GTUtility; -import gtnhlanth.common.register.LanthItemList; public class RecipeTC extends GTRecipe { @@ -50,22 +44,4 @@ public RecipeTC(boolean aOptimize, ItemStack aInput, ItemStack aOutput, ItemStac this.focusItem = aFocusItem; } - - @Override - public ItemStack getRepresentativeInput(int aIndex) { - - ArrayList mInputsWithParticle = new ArrayList<>(); - - ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM); - Items.ender_pearl.setDamage(particleStack, this.particleId); - - mInputsWithParticle.add(particleStack); - mInputsWithParticle.addAll(Arrays.asList(mInputs)); - - ItemStack[] mInputsWithParticleArray = mInputsWithParticle.toArray(new ItemStack[0]); - - if (aIndex < 0 || aIndex >= mInputsWithParticleArray.length) return null; - return GTUtility.copyOrNull(mInputsWithParticleArray[aIndex]); - } - } From 5353cca946c30b546c44a79fe4d091caf3dd8d0e Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:15:18 -0300 Subject: [PATCH 05/15] Change Neutronium Recipe Cost to properly behave in compact mk4 (#3812) Co-authored-by: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> --- .../gregtech/loaders/postload/recipes/FusionReactorRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index 74cabd4196d..6582eb1ab21 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -114,7 +114,7 @@ public void run() { .fluidOutputs(Materials.Neutronium.getMolten(144)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_ZPM) - .metadata(FUSION_THRESHOLD, 640000000) + .metadata(FUSION_THRESHOLD, 600000000) .addTo(fusionRecipes); // FT3 - utility GTValues.RA.stdBuilder() From 8474977ed87676d6c85dd0a778e67ff5849c34a7 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Tue, 14 Jan 2025 12:47:19 -0500 Subject: [PATCH 06/15] Factory pipe system (#3621) Co-authored-by: Martin Robertz --- .../gregtech/api/enums/MetaTileEntityIDs.java | 2 + .../java/gregtech/api/factory/BlockData.java | 115 +++++++ .../java/gregtech/api/factory/BlockGroup.java | 64 ++++ .../gregtech/api/factory/IFactoryElement.java | 50 +++ .../gregtech/api/factory/IFactoryGrid.java | 41 +++ .../gregtech/api/factory/IFactoryNetwork.java | 30 ++ .../factory/standard/StandardFactoryGrid.java | 312 ++++++++++++++++++ .../standard/StandardFactoryNetwork.java | 76 +++++ .../api/factory/test/TestFactoryElement.java | 10 + .../api/factory/test/TestFactoryGrid.java | 13 + .../api/factory/test/TestFactoryHatch.java | 148 +++++++++ .../api/factory/test/TestFactoryNetwork.java | 8 + .../api/factory/test/TestFactoryPipe.java | 136 ++++++++ .../metatileentity/IMetaTileEntity.java | 2 +- .../metatileentity/BaseMetaPipeEntity.java | 14 +- .../implementations/MTEHatch.java | 28 +- .../tectech/loader/NetworkDispatcher.java | 5 + .../tectech/loader/thing/MachineLoader.java | 13 + .../pipe/BatchedPipeActivityMessage.java | 27 ++ .../tectech/mechanics/pipe/PipeActivity.java | 138 ++++++++ .../java/tectech/thing/CustomItemList.java | 2 + .../hatch/MTEBaseFactoryHatch.java | 85 +++++ .../pipe/MTEBaseFactoryPipe.java | 256 ++++++++++++++ 23 files changed, 1563 insertions(+), 12 deletions(-) create mode 100644 src/main/java/gregtech/api/factory/BlockData.java create mode 100644 src/main/java/gregtech/api/factory/BlockGroup.java create mode 100644 src/main/java/gregtech/api/factory/IFactoryElement.java create mode 100644 src/main/java/gregtech/api/factory/IFactoryGrid.java create mode 100644 src/main/java/gregtech/api/factory/IFactoryNetwork.java create mode 100644 src/main/java/gregtech/api/factory/standard/StandardFactoryGrid.java create mode 100644 src/main/java/gregtech/api/factory/standard/StandardFactoryNetwork.java create mode 100644 src/main/java/gregtech/api/factory/test/TestFactoryElement.java create mode 100644 src/main/java/gregtech/api/factory/test/TestFactoryGrid.java create mode 100644 src/main/java/gregtech/api/factory/test/TestFactoryHatch.java create mode 100644 src/main/java/gregtech/api/factory/test/TestFactoryNetwork.java create mode 100644 src/main/java/gregtech/api/factory/test/TestFactoryPipe.java create mode 100644 src/main/java/tectech/mechanics/pipe/BatchedPipeActivityMessage.java create mode 100644 src/main/java/tectech/mechanics/pipe/PipeActivity.java create mode 100644 src/main/java/tectech/thing/metaTileEntity/hatch/MTEBaseFactoryHatch.java create mode 100644 src/main/java/tectech/thing/metaTileEntity/pipe/MTEBaseFactoryPipe.java diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 57ceda8f70e..4f08bf49c95 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -1764,6 +1764,8 @@ public enum MetaTileEntityIDs { OpticalFiberCable(15470), LaserVacuumPipeCasing(15472), OpticalFiberCableCasing(15473), + TestFactoryPipe(15478), + TestFactoryHatch(15479), Ownerdetector(15480), InsaneBuckConverter(15485), LudicrousBuckConverter(15486), diff --git a/src/main/java/gregtech/api/factory/BlockData.java b/src/main/java/gregtech/api/factory/BlockData.java new file mode 100644 index 00000000000..30bb187e17d --- /dev/null +++ b/src/main/java/gregtech/api/factory/BlockData.java @@ -0,0 +1,115 @@ +package gregtech.api.factory; + +import java.util.HashMap; +import java.util.function.Function; + +import net.minecraft.world.World; + +import org.joml.Vector4i; + +import com.gtnewhorizon.gtnhlib.util.ObjectPooler; + +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class BlockData extends HashMap { + + private final ObjectPooler pooler = new ObjectPooler<>(Vector4i::new); + + public T get(IMetaTileEntity imte) { + return imte.getBaseMetaTileEntity() != null ? get(imte.getBaseMetaTileEntity()) : null; + } + + public T get(IGregTechTileEntity igte) { + return get(igte.getWorld(), igte.getXCoord(), igte.getYCoord(), igte.getZCoord()); + } + + public T get(World world, int x, int y, int z) { + Vector4i key = pooler.getInstance(); + + key.w = world.provider.dimensionId; + key.x = x; + key.y = y; + key.z = z; + + T t = this.get(key); + + pooler.releaseInstance(key); + + return t; + } + + public void set(IMetaTileEntity imte, T t) { + if (imte.getBaseMetaTileEntity() != null) { + set(imte.getBaseMetaTileEntity(), t); + } + } + + public void set(IGregTechTileEntity igte, T t) { + set(igte.getWorld(), igte.getXCoord(), igte.getYCoord(), igte.getZCoord(), t); + } + + public T set(World world, int x, int y, int z, T t) { + Vector4i key = pooler.getInstance(); + + key.w = world.provider.dimensionId; + key.x = x; + key.y = y; + key.z = z; + + T old = this.put(key, t); + + pooler.releaseInstance(key); + + return old; + } + + public T remove(World world, int x, int y, int z) { + Vector4i key = pooler.getInstance(); + + key.w = world.provider.dimensionId; + key.x = x; + key.y = y; + key.z = z; + + T removed = this.remove(key); + + pooler.releaseInstance(key); + + return removed; + } + + public T remove(IMetaTileEntity mte) { + IGregTechTileEntity igte = mte.getBaseMetaTileEntity(); + + if (igte == null) return null; + + Vector4i key = pooler.getInstance(); + + key.w = igte.getWorld().provider.dimensionId; + key.x = igte.getXCoord(); + key.y = igte.getYCoord(); + key.z = igte.getZCoord(); + + T removed = this.remove(key); + + pooler.releaseInstance(key); + + return removed; + } + + public T computeIfAbsent(World world, int x, int y, int z, Function ctor) { + Vector4i key = pooler.getInstance(); + + key.w = world.provider.dimensionId; + key.x = x; + key.y = y; + key.z = z; + + T t = this.computeIfAbsent(key, ctor); + + pooler.releaseInstance(key); + + return t; + } +} diff --git a/src/main/java/gregtech/api/factory/BlockGroup.java b/src/main/java/gregtech/api/factory/BlockGroup.java new file mode 100644 index 00000000000..b1bf60041ba --- /dev/null +++ b/src/main/java/gregtech/api/factory/BlockGroup.java @@ -0,0 +1,64 @@ +package gregtech.api.factory; + +import java.lang.ref.WeakReference; +import java.util.Iterator; + +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + +import org.joml.Vector3i; +import org.joml.Vector3ic; + +public class BlockGroup implements Iterable { + + private int worldId; + private WeakReference world; + + private int[] coords; + + public int size() { + return coords.length / 3; + } + + public World getWorld() { + World world = this.world.get(); + + if (world != null) return world; + + world = DimensionManager.getWorld(worldId); + + this.world = new WeakReference(world); + + return world; + } + + private final Vector3i pooledVec = new Vector3i(); + + public Vector3ic get(int i) { + i *= 3; + pooledVec.x = coords[i]; + pooledVec.y = coords[i + 1]; + pooledVec.z = coords[i + 2]; + return pooledVec; + } + + @Override + public Iterator iterator() { + int total = coords.length / 3; + + return new Iterator() { + + int counter = 0; + + @Override + public boolean hasNext() { + return counter < total; + } + + @Override + public Vector3ic next() { + return get(counter++); + } + }; + } +} diff --git a/src/main/java/gregtech/api/factory/IFactoryElement.java b/src/main/java/gregtech/api/factory/IFactoryElement.java new file mode 100644 index 00000000000..99da1a97758 --- /dev/null +++ b/src/main/java/gregtech/api/factory/IFactoryElement.java @@ -0,0 +1,50 @@ +package gregtech.api.factory; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import gregtech.api.factory.standard.StandardFactoryNetwork; +import it.unimi.dsi.fastutil.Pair; + +/** + * Represents a pipe, hatch, multi, or any other machine in a factory pipe system. + * You should create a new interface that extends this one, then specify your network and grid in the IFactoryElement + * generics. + */ +public interface IFactoryElement, TNetwork extends IFactoryNetwork, TGrid extends IFactoryGrid> { + + /** + * Detects all adjacent elements, regardless of what network they're on. + */ + void getNeighbours(Collection neighbours); + + TNetwork getNetwork(); + + void setNetwork(TNetwork network); + + default void onNeighbourAdded(TSelf neighbour) { + onNeighbourChanged(neighbour); + } + + default void onNeighbourRemoved(TSelf neighbour) { + onNeighbourChanged(neighbour); + } + + default void onNeighbourChanged(TSelf neighbour) { + + } + + /** + * A component is an object provided by this element. + * Generally the component implementation is just {@code this}, but it can be anything. + * In a {@link StandardFactoryNetwork}, components are grouped by their interface and can be queried by the same + * interface. + * Components are useful if you want to expose something network-wide so that any element can find it. + * + * @return A list of component interfaces and their implementations. + */ + default List, Object>> getComponents() { + return Collections.emptyList(); + } +} diff --git a/src/main/java/gregtech/api/factory/IFactoryGrid.java b/src/main/java/gregtech/api/factory/IFactoryGrid.java new file mode 100644 index 00000000000..750ae48c012 --- /dev/null +++ b/src/main/java/gregtech/api/factory/IFactoryGrid.java @@ -0,0 +1,41 @@ +package gregtech.api.factory; + +import gregtech.api.factory.standard.StandardFactoryGrid; + +/** + * A factory grid is the global coordinator for your factory pipe system. + * Grids will create and destroy networks as elements join or leave the world. + * You usually want to extend {@link StandardFactoryGrid}, not this. + */ +public interface IFactoryGrid, TElement extends IFactoryElement, TNetwork extends IFactoryNetwork> { + + /** + * Adds an element and does potentially expensive network topology updates. + * Also acts like a hard reset in case the given element has changed its neighbours. + */ + public void addElement(TElement element); + + /** + * Adds an element but does not do any network topology updates. + * Use with caution. + */ + public void addElementQuietly(TNetwork network, TElement element); + + /** + * Removes an element and does potentially expensive network topology updates. + */ + public void removeElement(TElement element); + + /** + * Removes an element but does not do any network topology updates. + * Use with caution. + */ + public void removeElementQuietly(TElement element); + + /** + * Subsumes a network into another one. + * You generally shouldn't call this unless you have a good reason since network subsuming/splitting is handled + * automatically. + */ + public void subsume(TNetwork dest, TNetwork source); +} diff --git a/src/main/java/gregtech/api/factory/IFactoryNetwork.java b/src/main/java/gregtech/api/factory/IFactoryNetwork.java new file mode 100644 index 00000000000..aa5bb6f8f85 --- /dev/null +++ b/src/main/java/gregtech/api/factory/IFactoryNetwork.java @@ -0,0 +1,30 @@ +package gregtech.api.factory; + +import java.util.Collection; + +import gregtech.api.factory.standard.StandardFactoryNetwork; + +/** + * A factory network is a logical group of factory elements. + * You usually want to extend {@link StandardFactoryNetwork}, not this. + */ +public interface IFactoryNetwork, TElement extends IFactoryElement, TGrid extends IFactoryGrid> { + + public void addElement(TElement element); + + public void removeElement(TElement element); + + public default void onNetworkRemoved() { + + } + + public default void onNetworkSubsumedPre(TSelf subsumer) { + + } + + public default void onNetworkSubsumedPost(TSelf subsumer) { + + } + + public Collection getElements(); +} diff --git a/src/main/java/gregtech/api/factory/standard/StandardFactoryGrid.java b/src/main/java/gregtech/api/factory/standard/StandardFactoryGrid.java new file mode 100644 index 00000000000..8b01e49d374 --- /dev/null +++ b/src/main/java/gregtech/api/factory/standard/StandardFactoryGrid.java @@ -0,0 +1,312 @@ +package gregtech.api.factory.standard; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.google.common.collect.MultimapBuilder; +import com.google.common.collect.SetMultimap; + +import gregtech.GTMod; +import gregtech.api.factory.IFactoryElement; +import gregtech.api.factory.IFactoryGrid; +import gregtech.api.factory.IFactoryNetwork; + +/** + * This handles all network topology updates, and should be compatible with most pipe systems. + * A factory element should always register itself with this grid, even when it's not connected to anything. + */ +public abstract class StandardFactoryGrid, TElement extends IFactoryElement, TNetwork extends IFactoryNetwork> + implements IFactoryGrid { + + public static final Logger LOGGER = LogManager.getLogger("Standard Factory Network"); + + public final HashSet networks = new HashSet<>(); + public final HashSet vertices = new HashSet<>(); + public final SetMultimap edges = MultimapBuilder.hashKeys() + .hashSetValues() + .build(); + + protected StandardFactoryGrid() { + + } + + @Override + public void addElement(TElement element) { + removeElement(element); + + vertices.add(element); + updateNeighbours(element); + + HashSet discovered = new HashSet<>(); + HashSet networks = new HashSet<>(); + + long pre = System.nanoTime(); + + walkAdjacency(element, discovered, networks, false); + + long post = System.nanoTime(); + + LOGGER.info("Walked adjacent elements in " + (post - pre) / 1e3 + " us"); + + if (networks.size() == 0) { + // there are no neighbours, or the neighbours didn't have a network somehow (which is an illegal state! + // boo!) + TNetwork network = createNetwork(); + this.networks.add(network); + + for (TElement e : discovered) { + if (e.getNetwork() != network) { + e.setNetwork(network); + network.addElement(e); + } + } + } else if (networks.size() == 1) { + // there was one network adjacent, so we can just add all discovered elements to it if they aren't already + TNetwork network = networks.iterator() + .next(); + + for (TElement e : discovered) { + if (e.getNetwork() != network) { + e.setNetwork(network); + network.addElement(e); + } + } + } else { + // there were several adjacent networks; subsume all smaller networks into the biggest one + Iterator iter = networks.iterator(); + + TNetwork biggestNetwork = iter.next(); + + while (iter.hasNext()) { + TNetwork network = iter.next(); + + if (network.getElements() + .size() + > biggestNetwork.getElements() + .size()) + biggestNetwork = network; + } + + pre = System.nanoTime(); + + for (TNetwork network : networks) { + if (network != biggestNetwork) { + subsume(biggestNetwork, network); + } + } + + post = System.nanoTime(); + LOGGER.info("Subsumed " + (networks.size() - 1) + " networks in " + (post - pre) / 1e3 + " us"); + + for (TElement e : discovered) { + if (e.getNetwork() == null) { + e.setNetwork(biggestNetwork); + biggestNetwork.addElement(e); + } + } + } + } + + @Override + public void addElementQuietly(TNetwork network, TElement element) { + vertices.add(element); + element.setNetwork(network); + network.addElement(element); + } + + protected abstract TNetwork createNetwork(); + + @Override + public void removeElement(TElement element) { + if (!vertices.contains(element)) return; + + vertices.remove(element); + Set neighbours = edges.removeAll(element); + + TNetwork network = element.getNetwork(); + + network.removeElement(element); + element.setNetwork(null); + + // the network doesn't have any elements left, there aren't any adjacent neighbours to fix + if (network.getElements() + .isEmpty()) { + network.onNetworkRemoved(); + networks.remove(network); + return; + } + + for (TElement neighbour : neighbours) { + updateNeighbours(neighbour); + } + + // if there's only one neighbour, then this element is at the end of a chain and we can return early since we + // definitely didn't split a network + if (neighbours.size() <= 1) return; + + HashSet> neighbouringClumps = new HashSet<>(); + + // the list of all discovered elements; if one is in here, it means we've visited it already and can skip + // iterating its neighbours + HashSet discovered = new HashSet<>(); + + long pre = System.nanoTime(); + + for (TElement neighbour : neighbours) { + if (discovered.contains(neighbour)) continue; + + // find all elements connected to this neighbour + HashSet clump = new HashSet<>(); + walkAdjacency(neighbour, clump, null, true); + + neighbouringClumps.add(clump); + discovered.addAll(clump); + } + + // if there's only one clump of neighbours then the network hasn't been split + if (neighbouringClumps.size() <= 1) { + return; + } + + HashSet biggestClump = null; + + // find the biggest clump of neighbours; we'll split the other clumps from it + for (HashSet nn : neighbouringClumps) { + if (biggestClump == null || nn.size() > biggestClump.size()) biggestClump = nn; + } + + for (HashSet nn : neighbouringClumps) { + if (nn != biggestClump) { + for (TElement e : nn) { + network.removeElement(e); + } + + TNetwork newNetwork = createNetwork(); + + for (TElement e : nn) { + e.setNetwork(newNetwork); + newNetwork.addElement(e); + } + } + } + + long post = System.nanoTime(); + + // temporary logging so that I can see what the performance is like + LOGGER.info( + "Split network in " + (post - pre) / 1e3 + + " us (added " + + (neighbouringClumps.size() - 1) + + " new networks)"); + } + + @Override + public void removeElementQuietly(TElement element) { + if (!vertices.contains(element)) return; + + element.getNetwork() + .removeElement(element); + vertices.remove(element); + element.setNetwork(null); + + for (TElement neighbour : edges.removeAll(element)) { + updateNeighbours(neighbour); + } + } + + @Override + public void subsume(TNetwork dest, TNetwork source) { + source.onNetworkSubsumedPre(dest); + + for (TElement element : new ArrayList<>(source.getElements())) { + source.removeElement(element); + element.setNetwork(dest); + dest.addElement(element); + } + + source.onNetworkSubsumedPost(dest); + source.onNetworkRemoved(); + this.networks.remove(source); + } + + private void walkAdjacency(TElement start, HashSet discovered, HashSet networks, + boolean recurseIntoNetworked) { + LinkedList queue = new LinkedList<>(); + + queue.add(start); + + while (queue.size() > 0) { + TElement current = queue.removeFirst(); + + discovered.add(current); + + if (networks != null) networks.add(current.getNetwork()); + + if (recurseIntoNetworked ? true : current.getNetwork() == null) { + for (TElement neighbour : edges.get(current)) { + if (!discovered.contains(neighbour)) { + queue.add(neighbour); + } + } + } + } + + if (networks != null) networks.remove(null); + } + + public void updateNeighbours(TElement element) { + updateNeighbours(element, new HashSet<>()); + } + + private void updateNeighbours(TElement element, HashSet updated) { + if (updated.contains(element)) return; + updated.add(element); + + HashSet neighbours = new HashSet<>(); + + element.getNeighbours(neighbours); + + Set oldNeighbours = edges.removeAll(element); + edges.putAll(element, neighbours); + + for (TElement oldNeighbour : oldNeighbours) { + if (!neighbours.contains(oldNeighbour)) { + updateNeighbours(oldNeighbour, updated); + + if (edges.containsEntry(oldNeighbour, element)) { + GTMod.GT_FML_LOGGER.error( + "A factory element isn't following the graph adjacency contract. Edge B -> A was kept when edge A -> B was removed. A = " + + element + + ", B = " + + oldNeighbour); + } + + oldNeighbour.onNeighbourRemoved(element); + element.onNeighbourRemoved(oldNeighbour); + } + } + + for (TElement currentNeighbour : neighbours) { + if (!oldNeighbours.contains(currentNeighbour)) { + updateNeighbours(currentNeighbour, updated); + + if (!edges.containsEntry(currentNeighbour, element)) { + GTMod.GT_FML_LOGGER.error( + "A factory element isn't following the graph adjacency contract. Edge B -> A was not added when edge A -> B was added. A = " + + element + + ", B = " + + currentNeighbour); + } + + currentNeighbour.onNeighbourAdded(element); + element.onNeighbourAdded(currentNeighbour); + } + } + } +} diff --git a/src/main/java/gregtech/api/factory/standard/StandardFactoryNetwork.java b/src/main/java/gregtech/api/factory/standard/StandardFactoryNetwork.java new file mode 100644 index 00000000000..deb6e94f938 --- /dev/null +++ b/src/main/java/gregtech/api/factory/standard/StandardFactoryNetwork.java @@ -0,0 +1,76 @@ +package gregtech.api.factory.standard; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; + +import gregtech.api.factory.IFactoryElement; +import gregtech.api.factory.IFactoryGrid; +import gregtech.api.factory.IFactoryNetwork; + +/** + * A pretty basic factory network. + * This doesn't do much beyond tracking elements and components. + */ +public class StandardFactoryNetwork, TElement extends IFactoryElement, TGrid extends IFactoryGrid> + implements IFactoryNetwork { + + public final HashSet elements = new HashSet<>(); + public final HashMap, Collection> components = new HashMap<>(); + + @Override + public void addElement(TElement element) { + elements.add(element); + + for (var component : element.getComponents()) { + addComponentImpl(component.left(), component.right()); + } + } + + @Override + public void removeElement(TElement element) { + elements.remove(element); + + if (element != null && element.getNetwork() == this) { + for (var component : element.getComponents()) { + removeComponentImpl(component.left(), component.right()); + } + } + } + + private void addComponentImpl(Class iface, Object impl) { + components.computeIfAbsent(iface, x -> new HashSet<>()) + .add(impl); + } + + public void addComponent(Class iface, TImpl impl) { + addComponentImpl(iface, impl); + } + + private void removeComponentImpl(Class iface, Object impl) { + Collection s = components.get(iface); + + if (s != null) { + s.remove(impl); + + if (s.isEmpty()) { + components.remove(iface); + } + } + } + + public void removeComponent(Class iface, TImpl impl) { + removeComponentImpl(iface, impl); + } + + @SuppressWarnings("unchecked") + public Collection getComponents(Class iface) { + return (Collection) components.getOrDefault(iface, Collections.emptyList()); + } + + @Override + public Collection getElements() { + return elements; + } +} diff --git a/src/main/java/gregtech/api/factory/test/TestFactoryElement.java b/src/main/java/gregtech/api/factory/test/TestFactoryElement.java new file mode 100644 index 00000000000..98183fc14ed --- /dev/null +++ b/src/main/java/gregtech/api/factory/test/TestFactoryElement.java @@ -0,0 +1,10 @@ +package gregtech.api.factory.test; + +import net.minecraftforge.common.util.ForgeDirection; + +import gregtech.api.factory.IFactoryElement; + +public interface TestFactoryElement extends IFactoryElement { + + public boolean canConnectOnSide(ForgeDirection side); +} diff --git a/src/main/java/gregtech/api/factory/test/TestFactoryGrid.java b/src/main/java/gregtech/api/factory/test/TestFactoryGrid.java new file mode 100644 index 00000000000..a7a3c1ef384 --- /dev/null +++ b/src/main/java/gregtech/api/factory/test/TestFactoryGrid.java @@ -0,0 +1,13 @@ +package gregtech.api.factory.test; + +import gregtech.api.factory.standard.StandardFactoryGrid; + +public class TestFactoryGrid extends StandardFactoryGrid { + + public static final TestFactoryGrid INSTANCE = new TestFactoryGrid(); + + @Override + protected TestFactoryNetwork createNetwork() { + return new TestFactoryNetwork(); + } +} diff --git a/src/main/java/gregtech/api/factory/test/TestFactoryHatch.java b/src/main/java/gregtech/api/factory/test/TestFactoryHatch.java new file mode 100644 index 00000000000..38e8dd09118 --- /dev/null +++ b/src/main/java/gregtech/api/factory/test/TestFactoryHatch.java @@ -0,0 +1,148 @@ +package gregtech.api.factory.test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import it.unimi.dsi.fastutil.Pair; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import tectech.thing.metaTileEntity.hatch.MTEBaseFactoryHatch; +import tectech.util.CommonValues; +import tectech.util.TTUtility; + +public class TestFactoryHatch extends MTEBaseFactoryHatch implements TestFactoryElement { + + public TestFactoryHatch(int aID, String aName, String aNameRegional, int aTier) { + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, + StatCollector.translateToLocal("gt.blockmachines.hatch.datain.desc.0"), + StatCollector.translateToLocal("gt.blockmachines.hatch.datain.desc.1"), + EnumChatFormatting.AQUA + StatCollector.translateToLocal("gt.blockmachines.hatch.datain.desc.2") }); + TTUtility.setTier(aTier, this); + } + + protected TestFactoryHatch(TestFactoryHatch prototype) { + super(prototype); + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new TestFactoryHatch(this); + } + + @Override + public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, + int z) { + super.getWailaNBTData(player, tile, tag, world, x, y, z); + tag.setString("network", network == null ? "null" : network.toString()); + } + + @Override + public void getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + super.getWailaBody(itemStack, currenttip, accessor, config); + currenttip.add( + "Network: " + accessor.getNBTData() + .getString("network")); + } + + @Override + public boolean isGivingInformation() { + return true; + } + + @Override + public String[] getInfoData() { + List data = new ArrayList<>(Arrays.asList(super.getInfoData())); + + if (network == null) { + data.add("No network"); + } else { + for (TestFactoryHatch hatch : network.getComponents(TestFactoryHatch.class)) { + IGregTechTileEntity base = hatch.getBaseMetaTileEntity(); + + data.add( + base.getXCoord() + ", " + base.getYCoord() + ", " + base.getZCoord() + ": " + hatch.toString()); + } + } + + return data.toArray(new String[data.size()]); + } + + @Override + public List, Object>> getComponents() { + return Collections.singletonList(Pair.of(TestFactoryHatch.class, this)); + } + + @Override + public boolean canConnectOnSide(ForgeDirection side) { + return side == getBaseMetaTileEntity().getFrontFacing(); + } + + @Override + public void getNeighbours(Collection neighbours) { + IGregTechTileEntity base = getBaseMetaTileEntity(); + + if (base.getTileEntityAtSide(base.getFrontFacing()) instanceof IGregTechTileEntity igte + && igte.getColorization() == base.getColorization() + && igte.getMetaTileEntity() instanceof TestFactoryElement element) { + neighbours.add(element); + } + } + + private TestFactoryNetwork network; + + @Override + public TestFactoryNetwork getNetwork() { + return network; + } + + @Override + public void setNetwork(TestFactoryNetwork network) { + this.network = network; + } + + @Override + public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { + super.onFirstTick(aBaseMetaTileEntity); + + TestFactoryGrid.INSTANCE.addElement(this); + } + + @Override + public void onRemoval() { + super.onRemoval(); + + TestFactoryGrid.INSTANCE.removeElement(this); + } + + @Override + public void onFacingChange() { + super.onFacingChange(); + + TestFactoryGrid.INSTANCE.addElement(this); + } + + @Override + public void onColorChangeServer(byte aColor) { + TestFactoryGrid.INSTANCE.addElement(this); + } +} diff --git a/src/main/java/gregtech/api/factory/test/TestFactoryNetwork.java b/src/main/java/gregtech/api/factory/test/TestFactoryNetwork.java new file mode 100644 index 00000000000..d2b24a70870 --- /dev/null +++ b/src/main/java/gregtech/api/factory/test/TestFactoryNetwork.java @@ -0,0 +1,8 @@ +package gregtech.api.factory.test; + +import gregtech.api.factory.standard.StandardFactoryNetwork; + +public class TestFactoryNetwork + extends StandardFactoryNetwork { + +} diff --git a/src/main/java/gregtech/api/factory/test/TestFactoryPipe.java b/src/main/java/gregtech/api/factory/test/TestFactoryPipe.java new file mode 100644 index 00000000000..cdb2f2e6566 --- /dev/null +++ b/src/main/java/gregtech/api/factory/test/TestFactoryPipe.java @@ -0,0 +1,136 @@ +package gregtech.api.factory.test; + +import java.util.Collection; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import tectech.thing.metaTileEntity.pipe.MTEBaseFactoryPipe; + +public class TestFactoryPipe extends MTEBaseFactoryPipe implements TestFactoryElement { + + public TestFactoryPipe(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public TestFactoryPipe(TestFactoryPipe prototype) { + super(prototype); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { + return new TestFactoryPipe(this); + } + + @Override + public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, + int z) { + super.getWailaNBTData(player, tile, tag, world, x, y, z); + tag.setString("network", network == null ? "null" : network.toString()); + } + + @Override + public void getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + super.getWailaBody(itemStack, currenttip, accessor, config); + currenttip.add( + "Network: " + accessor.getNBTData() + .getString("network")); + } + + @Override + public boolean canConnectOnSide(ForgeDirection side) { + return true; + } + + @Override + public void getNeighbours(Collection neighbours) { + IGregTechTileEntity base = getBaseMetaTileEntity(); + + if (base == null || base.isDead()) return; + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (base.getTileEntityAtSide(dir) instanceof IGregTechTileEntity igte) { + if (igte.getColorization() == base.getColorization()) { + if (igte.getMetaTileEntity() instanceof TestFactoryElement element) { + if (element.canConnectOnSide(dir.getOpposite())) { + neighbours.add(element); + } + } + } + } + } + } + + @Override + public void onNeighbourChanged(TestFactoryElement neighbour) { + mCheckConnections = true; + } + + @Override + protected void checkConnections() { + mConnections = 0; + + IGregTechTileEntity base = getBaseMetaTileEntity(); + + if (base == null || base.isDead()) return; + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if (base.getTileEntityAtSide(dir) instanceof IGregTechTileEntity igte) { + if (igte.getColorization() == base.getColorization()) { + if (igte.getMetaTileEntity() instanceof TestFactoryElement element) { + if (element.canConnectOnSide(dir.getOpposite())) { + mConnections |= dir.flag; + } + } + } + } + } + } + + @Override + protected void checkActive() { + mIsActive = getBaseMetaTileEntity().getTimer() % 200 > 100; + } + + private TestFactoryNetwork network; + + @Override + public TestFactoryNetwork getNetwork() { + return network; + } + + @Override + public void setNetwork(TestFactoryNetwork network) { + this.network = network; + mCheckConnections = true; + } + + @Override + public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { + super.onFirstTick(aBaseMetaTileEntity); + + TestFactoryGrid.INSTANCE.addElement(this); + } + + @Override + public void onRemoval() { + super.onRemoval(); + + TestFactoryGrid.INSTANCE.removeElement(this); + } + + @Override + public void onColorChangeServer(byte aColor) { + TestFactoryGrid.INSTANCE.addElement(this); + } +} diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java index 824925f928f..94e818557eb 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java @@ -339,7 +339,7 @@ ArrayList getSpecialDebugInfo(IGregTechTileEntity aBaseMetaTileEntity, E String getSpecialVoltageToolTip(); /** - * Icon of the Texture. If this returns null then it falls back to getTextureIndex. + * Icon of the Texture. * * @param side is the Side of the Block * @param facing is the direction the Block is facing diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index d2d9f429b72..593e25a8011 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -1435,7 +1436,18 @@ public void startTimeStatistics() { @Override public void getWailaBody(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (hasValidMetaTileEntity()) { + getMetaTileEntity().getWailaBody(itemStack, currentTip, accessor, config); + } super.getWailaBody(itemStack, currentTip, accessor, config); - mMetaTileEntity.getWailaBody(itemStack, currentTip, accessor, config); + } + + @Override + public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, + int z) { + super.getWailaNBTData(player, tile, tag, world, x, y, z); + if (hasValidMetaTileEntity()) { + getMetaTileEntity().getWailaNBTData(player, tile, tag, world, x, y, z); + } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java index 8eb11ab37f2..f5bf525fd11 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatch.java @@ -66,23 +66,31 @@ public ITexture[][][] getTextureSet(ITexture[] aTextures) { @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection aFacing, int colorIndex, boolean aActive, boolean redstoneLevel) { - int texturePointer = (byte) (actualTexture & 0x7F); // just to be sure, from my testing the 8th bit cannot be - // set clientside - int textureIndex = texturePointer | (mTexturePage << 7); // Shift seven since one page is 128 textures! + // just to be sure, from my testing the 8th bit cannot be set clientside + int texturePointer = (byte) (actualTexture & 0x7F); + // Shift seven since one page is 128 textures! + int textureIndex = texturePointer | (mTexturePage << 7); try { if (side != aFacing) { - if (textureIndex > 0) + if (textureIndex > 0) { return new ITexture[] { Textures.BlockIcons.casingTexturePages[mTexturePage][texturePointer] }; - else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1] }; + } else { + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1] }; + } } else { if (textureIndex > 0) { - if (aActive) + if (aActive) { return getTexturesActive(Textures.BlockIcons.casingTexturePages[mTexturePage][texturePointer]); - else return getTexturesInactive( - Textures.BlockIcons.casingTexturePages[mTexturePage][texturePointer]); + } else { + return getTexturesInactive( + Textures.BlockIcons.casingTexturePages[mTexturePage][texturePointer]); + } } else { - if (aActive) return getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1]); - else return getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1]); + if (aActive) { + return getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1]); + } else { + return getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1]); + } } } } catch (NullPointerException npe) { diff --git a/src/main/java/tectech/loader/NetworkDispatcher.java b/src/main/java/tectech/loader/NetworkDispatcher.java index dd467154500..829095764f3 100644 --- a/src/main/java/tectech/loader/NetworkDispatcher.java +++ b/src/main/java/tectech/loader/NetworkDispatcher.java @@ -2,6 +2,8 @@ import static tectech.Reference.MODID; +import tectech.mechanics.pipe.BatchedPipeActivityMessage; +import tectech.mechanics.pipe.PipeActivity; import tectech.mechanics.pipe.PipeActivityMessage; import tectech.mechanics.spark.RendererMessage; @@ -21,5 +23,8 @@ public void registerPackets() { registerMessage(PipeActivityMessage.ClientHandler.class, PipeActivityMessage.PipeActivityData.class); registerMessage(RendererMessage.ClientHandler.class, RendererMessage.RendererData.class); + + PipeActivity.init(); + registerMessage(PipeActivity.Handler.class, BatchedPipeActivityMessage.class); } } diff --git a/src/main/java/tectech/loader/thing/MachineLoader.java b/src/main/java/tectech/loader/thing/MachineLoader.java index b0897e0d520..cff7aac31a8 100644 --- a/src/main/java/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/tectech/loader/thing/MachineLoader.java @@ -122,6 +122,8 @@ import static gregtech.api.enums.MetaTileEntityIDs.QuantumComputer; import static gregtech.api.enums.MetaTileEntityIDs.Researchstation; import static gregtech.api.enums.MetaTileEntityIDs.TeslaTower; +import static gregtech.api.enums.MetaTileEntityIDs.TestFactoryHatch; +import static gregtech.api.enums.MetaTileEntityIDs.TestFactoryPipe; import static gregtech.api.enums.MetaTileEntityIDs.UEV1024AtLaserSourceHatch; import static gregtech.api.enums.MetaTileEntityIDs.UEV1024AtLaserTargetHatch; import static gregtech.api.enums.MetaTileEntityIDs.UEV1048576AtLaserSourceHatch; @@ -356,6 +358,8 @@ import static tectech.thing.CustomItemList.ParametrizerTXT_Hatch; import static tectech.thing.CustomItemList.ParametrizerX_Hatch; import static tectech.thing.CustomItemList.Parametrizer_Hatch; +import static tectech.thing.CustomItemList.TestHatch; +import static tectech.thing.CustomItemList.TestPipe; import static tectech.thing.CustomItemList.UncertaintyX_Hatch; import static tectech.thing.CustomItemList.Uncertainty_Hatch; import static tectech.thing.CustomItemList.UnusedStuff; @@ -612,9 +616,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.launchwrapper.Launch; import gregtech.api.enums.GTValues; import gregtech.api.enums.MetaTileEntityIDs; +import gregtech.api.factory.test.TestFactoryHatch; +import gregtech.api.factory.test.TestFactoryPipe; import tectech.thing.metaTileEntity.hatch.MTEHatchCapacitor; import tectech.thing.metaTileEntity.hatch.MTEHatchCreativeData; import tectech.thing.metaTileEntity.hatch.MTEHatchCreativeMaintenance; @@ -2344,6 +2351,12 @@ public void run() { new MTEPipeEnergyMirror(LaserVacuumMirror.ID, "pipe.energymirror", "Laser Vacuum Mirror").getStackForm(1L)); DATApipe.set(new MTEPipeData(OpticalFiberCable.ID, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L)); + if ((boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { + TestPipe.set(new TestFactoryPipe(TestFactoryPipe.ID, "pipe.test", "Test Factory Pipe").getStackForm(1)); + TestHatch + .set(new TestFactoryHatch(TestFactoryHatch.ID, "hatch.test", "Test Factory Hatch", 7).getStackForm(1)); + } + LASERpipeBlock.set( new MTEPipeBlockEnergy(LaserVacuumPipeCasing.ID, "pipe.energystream.block", "Laser Vacuum Pipe Casing") .getStackForm(1L)); diff --git a/src/main/java/tectech/mechanics/pipe/BatchedPipeActivityMessage.java b/src/main/java/tectech/mechanics/pipe/BatchedPipeActivityMessage.java new file mode 100644 index 00000000000..d6e33056343 --- /dev/null +++ b/src/main/java/tectech/mechanics/pipe/BatchedPipeActivityMessage.java @@ -0,0 +1,27 @@ +package tectech.mechanics.pipe; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import io.netty.buffer.ByteBuf; + +public class BatchedPipeActivityMessage implements IMessage { + + public int worldId; + public boolean isActive; + public long[] pipes; + + @Override + public void fromBytes(ByteBuf buf) { + worldId = buf.readInt(); + isActive = buf.readBoolean(); + pipes = new long[buf.readInt()]; + for (int i = 0; i < pipes.length; i++) pipes[i] = buf.readLong(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(worldId); + buf.writeBoolean(isActive); + buf.writeInt(pipes.length); + for (int i = 0; i < pipes.length; i++) buf.writeLong(pipes[i]); + } +} diff --git a/src/main/java/tectech/mechanics/pipe/PipeActivity.java b/src/main/java/tectech/mechanics/pipe/PipeActivity.java new file mode 100644 index 00000000000..f888cfd60d8 --- /dev/null +++ b/src/main/java/tectech/mechanics/pipe/PipeActivity.java @@ -0,0 +1,138 @@ +package tectech.mechanics.pipe; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +import com.gtnewhorizon.gtnhlib.util.CoordinatePacker; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.Type; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import eu.usrv.yamcore.network.client.AbstractClientMessageHandler; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import it.unimi.dsi.fastutil.ints.IntBooleanPair; +import it.unimi.dsi.fastutil.longs.LongArrayList; +import it.unimi.dsi.fastutil.longs.LongList; +import tectech.loader.NetworkDispatcher; + +public class PipeActivity { + + public static final PipeActivity INSTANCE = new PipeActivity(); + + private static final Map updates = new HashMap<>(); + + private static final Function CTOR = x -> new LongArrayList(); + + private PipeActivity() { + + } + + public synchronized static void enqueueUpdate(TPipe pipe) { + IGregTechTileEntity base = pipe.getBaseMetaTileEntity(); + + if (base != null && !base.isDead()) { + enqueueUpdate(base.getWorld(), base.getXCoord(), base.getYCoord(), base.getZCoord(), pipe.getActive()); + } + } + + public synchronized static void enqueueUpdate(World world, int x, int y, int z, boolean isActive) { + LongArrayList coords = updates.computeIfAbsent(IntBooleanPair.of(world.provider.dimensionId, isActive), CTOR); + + coords.add(CoordinatePacker.pack(x, y, z)); + } + + private static final int MAX_UPDATES_PER_PACKET = 30_000 / 8; + + public synchronized static void sendUpdates() { + var iter = updates.entrySet() + .iterator(); + + while (iter.hasNext()) { + var e = iter.next(); + + int worldId = e.getKey() + .leftInt(); + boolean isActive = e.getKey() + .rightBoolean(); + LongArrayList coords = e.getValue(); + + for (int i = 0; i < coords.size(); i += MAX_UPDATES_PER_PACKET) { + LongList forPacket = coords.subList(i, Math.min(coords.size(), i + MAX_UPDATES_PER_PACKET)); + + BatchedPipeActivityMessage message = new BatchedPipeActivityMessage(); + message.worldId = worldId; + message.isActive = isActive; + message.pipes = forPacket.toLongArray(); + + NetworkDispatcher.INSTANCE.sendToDimension(message, worldId); + } + + iter.remove(); + } + } + + public static void init() { + FMLCommonHandler.instance() + .bus() + .register(INSTANCE); + } + + @SubscribeEvent + public void onTick(TickEvent.ServerTickEvent tickEvent) { + if (tickEvent.side == Side.SERVER && tickEvent.type == Type.SERVER && tickEvent.phase == Phase.END) { + sendUpdates(); + } + } + + public static class Handler extends AbstractClientMessageHandler { + + @Override + public IMessage handleClientMessage(EntityPlayer player, BatchedPipeActivityMessage message, + MessageContext ctx) { + World world = player.worldObj; + + if (message.worldId != world.provider.dimensionId) return null; + + Integer lastChunkX = null, lastChunkZ = null; + + for (long coord : message.pipes) { + int x = CoordinatePacker.unpackX(coord); + int y = CoordinatePacker.unpackY(coord); + int z = CoordinatePacker.unpackZ(coord); + + int chunkX = x >> 4; + int chunkZ = z >> 4; + + // if this pipe's chunk isn't loaded, ignore it completely + if (!Objects.equals(chunkX, lastChunkX) || !Objects.equals(chunkZ, lastChunkZ)) { + if (!world.getChunkProvider() + .chunkExists(chunkX, chunkZ)) { + continue; + } else { + lastChunkX = chunkX; + lastChunkZ = chunkZ; + } + } + + if (world.getTileEntity(x, y, z) instanceof IGregTechTileEntity igte) { + if (igte.getMetaTileEntity() instanceof IActivePipe pipe) { + pipe.setActive(message.isActive); + } + } + } + + return null; + } + } +} diff --git a/src/main/java/tectech/thing/CustomItemList.java b/src/main/java/tectech/thing/CustomItemList.java index 28ba4d2a6f2..b1bbe7058ce 100644 --- a/src/main/java/tectech/thing/CustomItemList.java +++ b/src/main/java/tectech/thing/CustomItemList.java @@ -32,6 +32,8 @@ public enum CustomItemList implements IItemContainer { Machine_DebugPollutor, DATApipe, LASERpipe, + TestPipe, + TestHatch, rack_Hatch, holder_Hatch, capacitor_Hatch, diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEBaseFactoryHatch.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEBaseFactoryHatch.java new file mode 100644 index 00000000000..067687f59ab --- /dev/null +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEBaseFactoryHatch.java @@ -0,0 +1,85 @@ +package tectech.thing.metaTileEntity.hatch; + +import static gregtech.api.enums.Dyes.MACHINE_METAL; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Textures.BlockIcons.CustomIcon; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.render.TextureFactory; + +public abstract class MTEBaseFactoryHatch extends MTEHatch { + + public static final CustomIcon EM_D_ACTIVE = new CustomIcon("iconsets/OVERLAY_EM_D_ACTIVE"); + public static final CustomIcon EM_D_SIDES = new CustomIcon("iconsets/OVERLAY_EM_D_SIDES"); + public static final CustomIcon EM_D_CONN = new CustomIcon("iconsets/EM_DATA_CONN"); + + protected MTEBaseFactoryHatch(MTEBaseFactoryHatch prototype) { + super(prototype.mName, prototype.mTier, 0, prototype.mDescriptionArray, prototype.mTextures); + } + + public MTEBaseFactoryHatch(int id, String name, String nameRegional, int tier, String[] description) { + super(id, name, nameRegional, tier, 0, description); + } + + @Override + public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity igte); + + @Override + public ITexture[] getTexturesActive(ITexture baseTexture) { + return new ITexture[] { baseTexture, TextureFactory.builder() + .addIcon(EM_D_ACTIVE) + .setRGBA(Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())) + .build(), TextureFactory.of(EM_D_CONN) }; + } + + @Override + public ITexture[] getTexturesInactive(ITexture baseTexture) { + return new ITexture[] { baseTexture, TextureFactory.builder() + .addIcon(EM_D_SIDES) + .setRGBA(Dyes.getModulation(getBaseMetaTileEntity().getColorization(), MACHINE_METAL.getRGBA())) + .build(), TextureFactory.of(EM_D_CONN) }; + } + + @Override + public boolean isFacingValid(ForgeDirection facing) { + return true; + } + + @Override + public boolean isAccessAllowed(EntityPlayer player) { + return true; + } + + @Override + public boolean isLiquidInput(ForgeDirection side) { + return false; + } + + @Override + public boolean isFluidInputAllowed(FluidStack fluid) { + return false; + } + + @Override + public boolean allowPullStack(IGregTechTileEntity base, int index, ForgeDirection side, ItemStack stack) { + return false; + } + + @Override + public boolean allowPutStack(IGregTechTileEntity base, int index, ForgeDirection side, ItemStack stack) { + return false; + } + + @Override + public boolean isValidSlot(int index) { + return false; + } +} diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEBaseFactoryPipe.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEBaseFactoryPipe.java new file mode 100644 index 00000000000..7308e68b475 --- /dev/null +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEBaseFactoryPipe.java @@ -0,0 +1,256 @@ +package tectech.thing.metaTileEntity.pipe; + +import static gregtech.api.enums.Dyes.MACHINE_METAL; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import gregtech.GTMod; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Textures.BlockIcons.CustomIcon; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.MetaPipeEntity; +import gregtech.api.render.TextureFactory; +import gregtech.common.GTClient; +import tectech.mechanics.pipe.IActivePipe; +import tectech.mechanics.pipe.PipeActivity; + +public abstract class MTEBaseFactoryPipe extends MetaPipeEntity implements IActivePipe { + + public static final IIconContainer EM_PIPE = new CustomIcon("iconsets/EM_DATA"); + public static final IIconContainer EM_BAR = new CustomIcon("iconsets/EM_BAR"); + public static final IIconContainer EM_BAR_ACTIVE = new CustomIcon("iconsets/EM_BAR_ACTIVE"); + + protected boolean mIsActive; + + protected float mThickness = 0.5f; + + public MTEBaseFactoryPipe(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional, 0); + } + + protected MTEBaseFactoryPipe(MTEBaseFactoryPipe prototype) { + super(prototype.mName, 0); + mThickness = prototype.mThickness; + } + + @Override + public abstract IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity); + + @Override + public ITexture[] getTexture(IGregTechTileEntity base, ForgeDirection side, int aConnections, int colorIndex, + boolean aConnected, boolean aRedstone) { + + List textures = new ArrayList<>(2); + + textures.add( + TextureFactory.builder() + .addIcon(EM_PIPE) + .setRGBA(Dyes.getModulation(colorIndex, MACHINE_METAL.getRGBA())) + .build()); + + if (getActive()) { + textures.add( + TextureFactory.builder() + .addIcon(EM_BAR) + .setRGBA(Dyes.getModulation(colorIndex, MACHINE_METAL.getRGBA())) + .build()); + } + + return textures.toArray(new ITexture[0]); + } + + @Override + public boolean allowPutStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, + ItemStack itemStack) { + return false; + } + + @Override + public boolean allowPullStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, + ItemStack itemStack) { + return false; + } + + @Override + public void loadNBTData(NBTTagCompound nbtTagCompound) { + setActive(nbtTagCompound.getBoolean("eActive")); + mConnections = nbtTagCompound.getByte("mConnections"); + } + + @Override + public void saveNBTData(NBTTagCompound nbtTagCompound) { + nbtTagCompound.setBoolean("eActive", getActive()); + nbtTagCompound.setByte("mConnections", mConnections); + } + + @Override + public boolean renderInside(ForgeDirection side) { + return false; + } + + @Override + public byte getTileEntityBaseType() { + return 4; + } + + @Override + public String[] getDescription() { + return new String[] {}; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) { + float tSpace = (1f - getThickNess()) / 2; + float tSide0 = tSpace; + float tSide1 = 1f - tSpace; + float tSide2 = tSpace; + float tSide3 = 1f - tSpace; + float tSide4 = tSpace; + float tSide5 = 1f - tSpace; + + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.DOWN) != 0) { + tSide0 = tSide2 = tSide4 = 0; + tSide3 = tSide5 = 1; + } + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.UP) != 0) { + tSide2 = tSide4 = 0; + tSide1 = tSide3 = tSide5 = 1; + } + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.NORTH) != 0) { + tSide0 = tSide2 = tSide4 = 0; + tSide1 = tSide5 = 1; + } + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.SOUTH) != 0) { + tSide0 = tSide4 = 0; + tSide1 = tSide3 = tSide5 = 1; + } + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.WEST) != 0) { + tSide0 = tSide2 = tSide4 = 0; + tSide1 = tSide3 = 1; + } + if (getBaseMetaTileEntity().getCoverIDAtSide(ForgeDirection.EAST) != 0) { + tSide0 = tSide2 = 0; + tSide1 = tSide3 = tSide5 = 1; + } + + // this.mConnections isn't synced, but base.mConnections is for some reason + byte conn = ((BaseMetaPipeEntity) getBaseMetaTileEntity()).mConnections; + if ((conn & ForgeDirection.DOWN.flag) != 0) { + tSide0 = 0f; + } + if ((conn & ForgeDirection.UP.flag) != 0) { + tSide1 = 1f; + } + if ((conn & ForgeDirection.NORTH.flag) != 0) { + tSide2 = 0f; + } + if ((conn & ForgeDirection.SOUTH.flag) != 0) { + tSide3 = 1f; + } + if ((conn & ForgeDirection.WEST.flag) != 0) { + tSide4 = 0f; + } + if ((conn & ForgeDirection.EAST.flag) != 0) { + tSide5 = 1f; + } + + return AxisAlignedBB + .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + } + + @Override + public float getThickNess() { + if (GTMod.instance.isClientSide() && GTClient.hideValue == 1) { + return 0.0625F; + } + return mThickness; + } + + @Override + public void markUsed() { + setActive(true); + } + + @Override + public void setActive(boolean state) { + if (state != mIsActive) { + mIsActive = state; + getBaseMetaTileEntity().issueTextureUpdate(); + } + } + + @Override + public boolean getActive() { + return mIsActive; + } + + private boolean prevActivity; + + @Override + public void onFirstTick(IGregTechTileEntity base) { + super.onFirstTick(base); + onPostTick(base, 31); + } + + @Override + public void onPostTick(IGregTechTileEntity base, long aTick) { + super.onPostTick(base, aTick); + + if (base.isServerSide()) { + if (mCheckConnections && base.isServerSide()) { + mCheckConnections = false; + checkConnections(); + } + + if (aTick % SECONDS == 0) { + checkActive(); + + boolean isActive = getActive(); + + if (isActive != prevActivity || aTick % (60 * SECONDS) == 0) { + prevActivity = isActive; + + PipeActivity + .enqueueUpdate(base.getWorld(), base.getXCoord(), base.getYCoord(), base.getZCoord(), isActive); + } + } + } else { + if (GTClient.changeDetected == 4) { + base.issueTextureUpdate(); + } + } + } + + protected void checkActive() { + mIsActive = false; + } + + @Override + protected void checkConnections() { + + } + + @Override + public boolean isGivingInformation() { + return true; + } + + @Override + public String[] getInfoData() { + return new String[] { + getActive() ? EnumChatFormatting.GREEN + "Active." : EnumChatFormatting.RED + "Not active." }; + } +} From 8fc72b3424486adfe513f55469a4c30c6db0c192 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Tue, 14 Jan 2025 23:45:46 -0500 Subject: [PATCH 07/15] Cleaned up Throwable try catches (#3280) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- src/main/java/bartworks/util/BWUtil.java | 321 +++++------ src/main/java/gregtech/GTMod.java | 80 +-- .../java/gregtech/api/items/MetaBaseItem.java | 9 +- .../MTEBasicMachineBronze.java | 28 +- .../implementations/MTEFluid.java | 53 +- .../gregtech/api/threads/RunnableSound.java | 3 +- src/main/java/gregtech/api/util/GTConfig.java | 6 +- .../gregtech/api/util/GTForestryCompat.java | 85 ++- .../java/gregtech/api/util/GTModHandler.java | 539 ++++++++---------- .../java/gregtech/api/util/GTUtility.java | 39 +- src/main/java/gregtech/common/GTProxy.java | 51 +- .../gregtech/common/blocks/ItemMachines.java | 2 + .../common/items/ItemIntegratedCircuit.java | 9 +- .../items/behaviors/BehaviourWrench.java | 5 +- .../tileentities/boilers/MTEBoiler.java | 7 +- .../core/block/machine/BlockPooCollector.java | 22 - .../core/handler/CompatHandler.java | 43 +- .../gtPlusPlus/core/material/Material.java | 2 +- .../loaders/RecipeGenDustGeneration.java | 72 +-- .../gregtech/loaders/RecipeGenRecycling.java | 50 +- src/main/java/tectech/loader/MainLoader.java | 6 +- 21 files changed, 610 insertions(+), 822 deletions(-) diff --git a/src/main/java/bartworks/util/BWUtil.java b/src/main/java/bartworks/util/BWUtil.java index 5f536030518..e8fa1b0c4e0 100644 --- a/src/main/java/bartworks/util/BWUtil.java +++ b/src/main/java/bartworks/util/BWUtil.java @@ -427,181 +427,176 @@ public static ShapedOreRecipe createGTCraftingRecipe(ItemStack aResult, Enchantm } } - try { - StringBuilder shape = new StringBuilder(E); - int idx = 0; - if (aRecipe[idx] instanceof Boolean) { - throw new IllegalArgumentException(); - } + StringBuilder shape = new StringBuilder(E); + int idx = 0; + if (aRecipe[idx] instanceof Boolean) { + throw new IllegalArgumentException(); + } - ArrayList tRecipeList = new ArrayList<>(Arrays.asList(aRecipe)); - - while (aRecipe[idx] instanceof String string) { - StringBuilder s = new StringBuilder(string); - idx++; - shape.append(s); - while (s.length() < 3) s.append(" "); - if (s.length() > 3) throw new IllegalArgumentException(); - - for (char c : s.toString() - .toCharArray()) { - switch (c) { - case 'b': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolBlade.name()); - break; - case 'c': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolCrowbar.name()); - break; - case 'd': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolScrewdriver.name()); - break; - case 'f': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolFile.name()); - break; - case 'h': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolHardHammer.name()); - break; - case 'i': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSolderingIron.name()); - break; - case 'j': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSolderingMetal.name()); - break; - case 'k': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolKnife.name()); - break; - case 'm': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolMortar.name()); - break; - case 'p': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolDrawplate.name()); - break; - case 'r': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSoftHammer.name()); - break; - case 's': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSaw.name()); - break; - case 'w': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolWrench.name()); - break; - case 'x': - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolWireCutter.name()); - break; - } + ArrayList tRecipeList = new ArrayList<>(Arrays.asList(aRecipe)); + + while (aRecipe[idx] instanceof String string) { + StringBuilder s = new StringBuilder(string); + idx++; + shape.append(s); + while (s.length() < 3) s.append(" "); + if (s.length() > 3) throw new IllegalArgumentException(); + + for (char c : s.toString() + .toCharArray()) { + switch (c) { + case 'b': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolBlade.name()); + break; + case 'c': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolCrowbar.name()); + break; + case 'd': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolScrewdriver.name()); + break; + case 'f': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolFile.name()); + break; + case 'h': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolHardHammer.name()); + break; + case 'i': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSolderingIron.name()); + break; + case 'j': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSolderingMetal.name()); + break; + case 'k': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolKnife.name()); + break; + case 'm': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolMortar.name()); + break; + case 'p': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolDrawplate.name()); + break; + case 'r': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSoftHammer.name()); + break; + case 's': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSaw.name()); + break; + case 'w': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolWrench.name()); + break; + case 'x': + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolWireCutter.name()); + break; } } + } - aRecipe = tRecipeList.toArray(); + aRecipe = tRecipeList.toArray(); - if (aRecipe[idx] instanceof Boolean) { - idx++; - } - Map tItemStackMap = new HashMap<>(); - Map tItemDataMap = new HashMap<>(); - tItemStackMap.put(' ', null); - - boolean tRemoveRecipe = true; - - for (; idx < aRecipe.length; idx += 2) { - if (aRecipe[idx] == null || aRecipe[idx + 1] == null) { - if (D1) { - GTLog.err.println( - "WARNING: Missing Item for shaped Recipe: " - + (aResult == null ? "null" : aResult.getDisplayName())); - for (Object tContent : aRecipe) GTLog.err.println(tContent); - } - return null; + if (aRecipe[idx] instanceof Boolean) { + idx++; + } + Map tItemStackMap = new HashMap<>(); + Map tItemDataMap = new HashMap<>(); + tItemStackMap.put(' ', null); + + boolean tRemoveRecipe = true; + + for (; idx < aRecipe.length; idx += 2) { + if (aRecipe[idx] == null || aRecipe[idx + 1] == null) { + if (D1) { + GTLog.err.println( + "WARNING: Missing Item for shaped Recipe: " + + (aResult == null ? "null" : aResult.getDisplayName())); + for (Object tContent : aRecipe) GTLog.err.println(tContent); } - Character chr = (Character) aRecipe[idx]; - Object in = aRecipe[idx + 1]; - if (in instanceof ItemStack) { - tItemStackMap.put(chr, GTUtility.copy(in)); - tItemDataMap.put(chr, GTOreDictUnificator.getItemData((ItemStack) in)); - } else if (in instanceof ItemData) { - String tString = in.toString(); - switch (tString) { - case "plankWood": - tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); - break; - case "stoneNetherrack": - tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); - break; - case "stoneObsidian": - tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); - break; - case "stoneEndstone": - tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); - break; - default: - tItemDataMap.put(chr, (ItemData) in); - break; - } - ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); - if (tStack == null) tRemoveRecipe = false; - else tItemStackMap.put(chr, tStack); - aRecipe[idx + 1] = in.toString(); - } else if (in instanceof String) { - if (in.equals(OreDictNames.craftingChest.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Wood, M * 8)); - else if (in.equals(OreDictNames.craftingBook.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Paper, M * 3)); - else if (in.equals(OreDictNames.craftingPiston.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 4, Materials.Wood, M * 3)); - else if (in.equals(OreDictNames.craftingFurnace.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 8)); - else if (in.equals(OreDictNames.craftingIndustrialDiamond.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Diamond, M)); - else if (in.equals(OreDictNames.craftingAnvil.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Iron, M * 10)); - ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); - if (tStack == null) tRemoveRecipe = false; - else tItemStackMap.put(chr, tStack); - } else { - throw new IllegalArgumentException(); + return null; + } + Character chr = (Character) aRecipe[idx]; + Object in = aRecipe[idx + 1]; + if (in instanceof ItemStack) { + tItemStackMap.put(chr, GTUtility.copy(in)); + tItemDataMap.put(chr, GTOreDictUnificator.getItemData((ItemStack) in)); + } else if (in instanceof ItemData) { + String tString = in.toString(); + switch (tString) { + case "plankWood": + tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); + break; + case "stoneNetherrack": + tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); + break; + case "stoneObsidian": + tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); + break; + case "stoneEndstone": + tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); + break; + default: + tItemDataMap.put(chr, (ItemData) in); + break; } + ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); + if (tStack == null) tRemoveRecipe = false; + else tItemStackMap.put(chr, tStack); + aRecipe[idx + 1] = in.toString(); + } else if (in instanceof String) { + if (in.equals(OreDictNames.craftingChest.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Wood, M * 8)); + else if (in.equals(OreDictNames.craftingBook.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Paper, M * 3)); + else if (in.equals(OreDictNames.craftingPiston.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 4, Materials.Wood, M * 3)); + else if (in.equals(OreDictNames.craftingFurnace.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 8)); + else if (in.equals(OreDictNames.craftingIndustrialDiamond.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Diamond, M)); + else if (in.equals(OreDictNames.craftingAnvil.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Iron, M * 10)); + ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); + if (tStack == null) tRemoveRecipe = false; + else tItemStackMap.put(chr, tStack); + } else { + throw new IllegalArgumentException(); } + } - if (aReversible && aResult != null) { - ItemData[] tData = new ItemData[9]; - int x = -1; - for (char chr : shape.toString() - .toCharArray()) { - x++; - tData[x] = tItemDataMap.get(chr); - } - if (GTUtility.arrayContainsNonNull(tData)) - GTOreDictUnificator.addItemData(aResult, new ItemData(tData)); + if (aReversible && aResult != null) { + ItemData[] tData = new ItemData[9]; + int x = -1; + for (char chr : shape.toString() + .toCharArray()) { + x++; + tData[x] = tItemDataMap.get(chr); } + if (GTUtility.arrayContainsNonNull(tData)) GTOreDictUnificator.addItemData(aResult, new ItemData(tData)); + } - if (aCheckForCollisions && tRemoveRecipe) { - ItemStack[] tRecipe = new ItemStack[9]; - int x = -1; - for (char chr : shape.toString() - .toCharArray()) { - x++; - tRecipe[x] = tItemStackMap.get(chr); - if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) - Items.feather.setDamage(tRecipe[x], 0); - } - tThereWasARecipe = GTModHandler.removeRecipe(tRecipe) != null; + if (aCheckForCollisions && tRemoveRecipe) { + ItemStack[] tRecipe = new ItemStack[9]; + int x = -1; + for (char chr : shape.toString() + .toCharArray()) { + x++; + tRecipe[x] = tItemStackMap.get(chr); + if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) + Items.feather.setDamage(tRecipe[x], 0); } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); + tThereWasARecipe = GTModHandler.removeRecipe(tRecipe) != null; } if (aResult == null || aResult.stackSize <= 0) return null; diff --git a/src/main/java/gregtech/GTMod.java b/src/main/java/gregtech/GTMod.java index a9379f18df2..fd4ee20efc5 100644 --- a/src/main/java/gregtech/GTMod.java +++ b/src/main/java/gregtech/GTMod.java @@ -256,11 +256,7 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) { } for (Runnable tRunnable : GregTechAPI.sBeforeGTPreload) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } GTPreLoad.getConfiguration(aEvent.getModConfigurationDirectory()); @@ -314,11 +310,7 @@ public void onPreLoad(FMLPreInitializationEvent aEvent) { GTUIInfos.init(); for (Runnable tRunnable : GregTechAPI.sAfterGTPreload) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } if (FMLCommonHandler.instance() @@ -333,11 +325,7 @@ public void onLoad(FMLInitializationEvent aEvent) { } for (Runnable tRunnable : GregTechAPI.sBeforeGTLoad) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } if (Forestry.isModLoaded()) @@ -374,11 +362,7 @@ public void onLoad(FMLInitializationEvent aEvent) { GTLog.ore.println("GTMod: Load-Phase finished!"); for (Runnable tRunnable : GregTechAPI.sAfterGTLoad) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } } @@ -390,11 +374,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) { // Seems only used by GGFab so far for (Runnable tRunnable : GregTechAPI.sBeforeGTPostload) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } gregtechproxy.onPostLoad(); @@ -545,11 +525,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) { GTLog.out.println("GTMod: PostLoad-Phase finished!"); GTLog.ore.println("GTMod: PostLoad-Phase finished!"); for (Runnable tRunnable : GregTechAPI.sAfterGTPostload) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } GTPostLoad.addFakeRecipes(); @@ -580,11 +556,7 @@ public void onPostLoad(FMLPostInitializationEvent aEvent) { public void onLoadComplete(FMLLoadCompleteEvent aEvent) { gregtechproxy.onLoadComplete(); for (Runnable tRunnable : GregTechAPI.sGTCompleteLoad) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } GregTechAPI.sGTCompleteLoad = null; GregTechAPI.sFullLoadFinished = true; @@ -604,11 +576,7 @@ public void onServerAboutToStart(FMLServerAboutToStartEvent aEvent) { public void onServerStarting(FMLServerStartingEvent aEvent) { for (Runnable tRunnable : GregTechAPI.sBeforeGTServerstart) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } gregtechproxy.onServerStarting(); @@ -739,11 +707,7 @@ public void onServerStarting(FMLServerStartingEvent aEvent) { GTLog.ore.println("GTMod: ServerStarting-Phase finished!"); for (Runnable tRunnable : GregTechAPI.sAfterGTServerstart) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } aEvent.registerServerCommand(new GTCommand()); @@ -782,36 +746,24 @@ public void doSonictronSound(ItemStack aStack, World aWorld, double aX, double a public void onIDChangingEvent(FMLModIdMappingEvent aEvent) { GTUtility.reInit(); GTRecipe.reInit(); - try { - for (Map gt_itemStackMap : GregTechAPI.sItemStackMappings) { - GTUtility.reMap(gt_itemStackMap); - } - for (SetMultimap gt_itemStackMap : GregTechAPI.itemStackMultiMaps) { - GTUtility.reMap(gt_itemStackMap); - } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); + for (Map gt_itemStackMap : GregTechAPI.sItemStackMappings) { + GTUtility.reMap(gt_itemStackMap); + } + for (SetMultimap gt_itemStackMap : GregTechAPI.itemStackMultiMaps) { + GTUtility.reMap(gt_itemStackMap); } } @Mod.EventHandler public void onServerStopping(FMLServerStoppingEvent aEvent) { for (Runnable tRunnable : GregTechAPI.sBeforeGTServerstop) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } gregtechproxy.onServerStopping(); for (Runnable tRunnable : GregTechAPI.sAfterGTServerstop) { - try { - tRunnable.run(); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } + tRunnable.run(); } // Interrupt IDLE Threads to close down cleanly RunnableMachineUpdate.shutdownExecutorService(); diff --git a/src/main/java/gregtech/api/items/MetaBaseItem.java b/src/main/java/gregtech/api/items/MetaBaseItem.java index c6751adb96d..c9a97723068 100644 --- a/src/main/java/gregtech/api/items/MetaBaseItem.java +++ b/src/main/java/gregtech/api/items/MetaBaseItem.java @@ -27,6 +27,7 @@ import com.gtnewhorizons.modularui.api.KeyboardUtil; +import gregtech.GTMod; import gregtech.api.enums.SubTag; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.util.GTLanguageManager; @@ -146,7 +147,7 @@ public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity return false; } } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + GTMod.GT_FML_LOGGER.error("Error left clicking entity", e); } return false; } @@ -168,7 +169,7 @@ public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, i return false; } } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + GTMod.GT_FML_LOGGER.error("Error using item", e); } return false; } @@ -200,7 +201,7 @@ public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWor return false; } } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + GTMod.GT_FML_LOGGER.error("Error using item", e); } return false; } @@ -214,7 +215,7 @@ public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer a if (tList != null) for (IItemBehaviour tBehavior : tList) aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer); } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + GTMod.GT_FML_LOGGER.error("Error right clicking item", e); } return aStack; } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java index 2ede5545d12..a14a273d62a 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachineBronze.java @@ -1,6 +1,5 @@ package gregtech.api.metatileentity.implementations; -import static gregtech.api.enums.GTValues.D1; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP; @@ -38,7 +37,6 @@ import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.objects.overclockdescriber.SteamOverclockDescriber; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GTLog; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; @@ -167,21 +165,17 @@ && getBaseMetaTileEntity().getCoverIDAtSide(getBaseMetaTileEntity().getFrontFaci getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1))) { sendSound((byte) 9); mNeedsSteamVenting = false; - try { - for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 1, - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 1, - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 1))) { - GTUtility.applyHeatDamage(tLiving, getSteamDamage()); - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1), + getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1), + getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1), + getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) + 1, + getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) + 1, + getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) + 1))) { + GTUtility.applyHeatDamage(tLiving, getSteamDamage()); } } return !mNeedsSteamVenting; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java index bfd40ee0b64..4d062540cfc 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java @@ -1,7 +1,6 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GTValues.ALL_VALID_SIDES; -import static gregtech.api.enums.GTValues.D1; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.Translocator; import static gregtech.api.metatileentity.implementations.MTEFluid.Border.BOTTOM; @@ -358,38 +357,30 @@ private boolean checkEnvironment(int index, IGregTechTileEntity aBaseMetaTileEnt tFluid.amount -= 5; sendSound((byte) 9); if (tTemperature > 320) { - try { - for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - 2, - getBaseMetaTileEntity().getYCoord() - 2, - getBaseMetaTileEntity().getZCoord() - 2, - getBaseMetaTileEntity().getXCoord() + 3, - getBaseMetaTileEntity().getYCoord() + 3, - getBaseMetaTileEntity().getZCoord() + 3))) { - GTUtility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F); - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() - 2, + getBaseMetaTileEntity().getYCoord() - 2, + getBaseMetaTileEntity().getZCoord() - 2, + getBaseMetaTileEntity().getXCoord() + 3, + getBaseMetaTileEntity().getYCoord() + 3, + getBaseMetaTileEntity().getZCoord() + 3))) { + GTUtility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F); } } else if (tTemperature < 260) { - try { - for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - 2, - getBaseMetaTileEntity().getYCoord() - 2, - getBaseMetaTileEntity().getZCoord() - 2, - getBaseMetaTileEntity().getXCoord() + 3, - getBaseMetaTileEntity().getYCoord() + 3, - getBaseMetaTileEntity().getZCoord() + 3))) { - GTUtility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F); - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() - 2, + getBaseMetaTileEntity().getYCoord() - 2, + getBaseMetaTileEntity().getZCoord() - 2, + getBaseMetaTileEntity().getXCoord() + 3, + getBaseMetaTileEntity().getYCoord() + 3, + getBaseMetaTileEntity().getZCoord() + 3))) { + GTUtility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F); } } } diff --git a/src/main/java/gregtech/api/threads/RunnableSound.java b/src/main/java/gregtech/api/threads/RunnableSound.java index 30704f2a974..e51490321ee 100644 --- a/src/main/java/gregtech/api/threads/RunnableSound.java +++ b/src/main/java/gregtech/api/threads/RunnableSound.java @@ -3,6 +3,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import gregtech.GTMod; import gregtech.api.util.GTPlayedSound; import gregtech.api.util.GTUtility; @@ -35,7 +36,7 @@ public void run() { mWorld.playSound(mX, mY, mZ, mSoundResourceLocation.toString(), mSoundStrength, mSoundModulation, false); GTUtility.sPlayedSoundMap.put(tSound, mTimeUntilNextSound); } catch (Throwable e) { - /**/ + GTMod.GT_FML_LOGGER.error("Could not play RunnableSound", e); } } } diff --git a/src/main/java/gregtech/api/util/GTConfig.java b/src/main/java/gregtech/api/util/GTConfig.java index 68ff810414c..a2e2969b51e 100644 --- a/src/main/java/gregtech/api/util/GTConfig.java +++ b/src/main/java/gregtech/api/util/GTConfig.java @@ -48,11 +48,7 @@ public static String getStackConfigName(ItemStack aStack) { if (GTUtility.isStackInvalid(aStack)) return E; Object rName = GTOreDictUnificator.getAssociation(aStack); if (rName != null) return rName.toString(); - try { - if (GTUtility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString(); - } catch (Throwable e) { - /* Do nothing */ - } + if (GTUtility.isStringValid(rName = aStack.getUnlocalizedName())) return rName.toString(); String sName = aStack.getItem() .toString(); String[] tmp = sName.split("@"); diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java index a593410f81a..bc05f8db363 100644 --- a/src/main/java/gregtech/api/util/GTForestryCompat.java +++ b/src/main/java/gregtech/api/util/GTForestryCompat.java @@ -140,62 +140,49 @@ public static void transferCentrifugeRecipes() { ItemStack irradiatedComb = GTModHandler.getModItem(Mods.Forestry.ID, "beeCombs", 1, 9); ItemStack DOBComb = GTBees.combs.getStackForType(CombType.DOB); - try { - for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) { - ItemStack input = tRecipe.getInput(); + for (ICentrifugeRecipe tRecipe : RecipeManagers.centrifugeManager.recipes()) { + ItemStack input = tRecipe.getInput(); - // Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb - if (input.getUnlocalizedName() - .contains("gt.comb") && !input.isItemEqual(DOBComb)) continue; - if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue; - Map outputs = tRecipe.getAllProducts(); - ItemStack[] tOutputs = new ItemStack[outputs.size()]; - int[] tChances = new int[outputs.size()]; - int i = 0; - for (Map.Entry entry : outputs.entrySet()) { - tChances[i] = (int) (entry.getValue() * 10000); - tOutputs[i] = entry.getKey() - .copy(); - i++; - } - GTValues.RA.stdBuilder() - .itemInputs(tRecipe.getInput()) - .itemOutputs(tOutputs) - .outputChances(tChances) - .duration(6 * SECONDS + 8 * TICKS) - .eut(5) - .addTo(centrifugeRecipes); - } - } catch (Throwable e) { - if (GTValues.D1) { - e.printStackTrace(GTLog.err); + // Don't transfer GT recipes to centrifuge, those recipes are made already by ItemComb + if (input.getUnlocalizedName() + .contains("gt.comb") && !input.isItemEqual(DOBComb)) continue; + if (irradiatedComb != null && input.isItemEqual(irradiatedComb)) continue; + Map outputs = tRecipe.getAllProducts(); + ItemStack[] tOutputs = new ItemStack[outputs.size()]; + int[] tChances = new int[outputs.size()]; + int i = 0; + for (Map.Entry entry : outputs.entrySet()) { + tChances[i] = (int) (entry.getValue() * 10000); + tOutputs[i] = entry.getKey() + .copy(); + i++; } + GTValues.RA.stdBuilder() + .itemInputs(tRecipe.getInput()) + .itemOutputs(tOutputs) + .outputChances(tChances) + .duration(6 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(centrifugeRecipes); } } public static void transferSqueezerRecipes() { - try { - for (ISqueezerRecipe tRecipe : RecipeManagers.squeezerManager.recipes()) { - ItemStack[] resources = tRecipe.getResources(); - if ((resources.length == 1) && (tRecipe.getFluidOutput() != null) && (resources[0] != null)) { - Item input = resources[0].getItem(); - if (input == Items.pumpkin_seeds || input == Items.melon_seeds || input == Items.wheat_seeds) - continue; - GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); - recipeBuilder.itemInputs(resources[0]); - if (tRecipe.getRemnants() != null) { - recipeBuilder.itemOutputs(tRecipe.getRemnants()) - .outputChances((int) (tRecipe.getRemnantsChance() * 10000)); - } - recipeBuilder.fluidOutputs(tRecipe.getFluidOutput()) - .duration(1 * SECONDS + 12 * TICKS) - .eut(8) - .addTo(RecipeMaps.fluidExtractionRecipes); + for (ISqueezerRecipe tRecipe : RecipeManagers.squeezerManager.recipes()) { + ItemStack[] resources = tRecipe.getResources(); + if ((resources.length == 1) && (tRecipe.getFluidOutput() != null) && (resources[0] != null)) { + Item input = resources[0].getItem(); + if (input == Items.pumpkin_seeds || input == Items.melon_seeds || input == Items.wheat_seeds) continue; + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); + recipeBuilder.itemInputs(resources[0]); + if (tRecipe.getRemnants() != null) { + recipeBuilder.itemOutputs(tRecipe.getRemnants()) + .outputChances((int) (tRecipe.getRemnantsChance() * 10000)); } - } - } catch (Throwable e) { - if (GTValues.D1) { - e.printStackTrace(GTLog.err); + recipeBuilder.fluidOutputs(tRecipe.getFluidOutput()) + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(RecipeMaps.fluidExtractionRecipes); } } } diff --git a/src/main/java/gregtech/api/util/GTModHandler.java b/src/main/java/gregtech/api/util/GTModHandler.java index ab6ec46658a..f10c2f42a5c 100644 --- a/src/main/java/gregtech/api/util/GTModHandler.java +++ b/src/main/java/gregtech/api/util/GTModHandler.java @@ -334,12 +334,10 @@ public static int getFuelValue(ItemStack aStack) { public static ItemStack getIC2Item(String aItem, long aAmount, ItemStack aReplacement) { if (GTUtility.isStringInvalid(aItem) || !GregTechAPI.sPreloadStarted) return null; // if (D1) GTLog.out.println("Requested the Item '" + aItem + "' from the IC2-API"); - if (!sIC2ItemMap.containsKey(aItem)) try { + if (!sIC2ItemMap.containsKey(aItem)) { ItemStack tStack = IC2Items.getItem(aItem); sIC2ItemMap.put(aItem, tStack); if (tStack == null && D1) GTLog.err.println(aItem + " is not found in the IC2 Items!"); - } catch (Throwable e) { - /* Do nothing */ } return GTUtility.copyAmount(aAmount, sIC2ItemMap.get(aItem), aReplacement); } @@ -1050,167 +1048,162 @@ else if (!(aRecipe[i] == null || aRecipe[i] instanceof ItemStack || aRecipe[i] instanceof Character)) aRecipe[i] = aRecipe[i].toString(); } - try { - StringBuilder shape = new StringBuilder(E); - int idx = 0; - if (aRecipe[idx] instanceof Boolean) { - throw new IllegalArgumentException(); - } + StringBuilder shape = new StringBuilder(E); + int idx = 0; + if (aRecipe[idx] instanceof Boolean) { + throw new IllegalArgumentException(); + } - ArrayList tRecipeList = new ArrayList<>(Arrays.asList(aRecipe)); + ArrayList tRecipeList = new ArrayList<>(Arrays.asList(aRecipe)); - while (aRecipe[idx] instanceof String) { - StringBuilder s = new StringBuilder((String) aRecipe[idx++]); - shape.append(s); - while (s.length() < 3) s.append(" "); - if (s.length() > 3) throw new IllegalArgumentException(); + while (aRecipe[idx] instanceof String) { + StringBuilder s = new StringBuilder((String) aRecipe[idx++]); + shape.append(s); + while (s.length() < 3) s.append(" "); + if (s.length() > 3) throw new IllegalArgumentException(); - for (char c : s.toString() - .toCharArray()) { - switch (c) { - case 'b' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolBlade.name()); - } - case 'c' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolCrowbar.name()); - } - case 'd' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolScrewdriver.name()); - } - case 'f' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolFile.name()); - } - case 'h' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolHardHammer.name()); - } - case 'i' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSolderingIron.name()); - } - case 'j' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSolderingMetal.name()); - } - case 'k' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolKnife.name()); - } - case 'm' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolMortar.name()); - } - case 'p' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolDrawplate.name()); - } - case 'r' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSoftHammer.name()); - } - case 's' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolSaw.name()); - } - case 'w' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolWrench.name()); - } - case 'x' -> { - tRecipeList.add(c); - tRecipeList.add(ToolDictNames.craftingToolWireCutter.name()); - } + for (char c : s.toString() + .toCharArray()) { + switch (c) { + case 'b' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolBlade.name()); + } + case 'c' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolCrowbar.name()); + } + case 'd' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolScrewdriver.name()); + } + case 'f' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolFile.name()); + } + case 'h' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolHardHammer.name()); + } + case 'i' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSolderingIron.name()); + } + case 'j' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSolderingMetal.name()); + } + case 'k' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolKnife.name()); + } + case 'm' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolMortar.name()); + } + case 'p' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolDrawplate.name()); + } + case 'r' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSoftHammer.name()); + } + case 's' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolSaw.name()); + } + case 'w' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolWrench.name()); + } + case 'x' -> { + tRecipeList.add(c); + tRecipeList.add(ToolDictNames.craftingToolWireCutter.name()); } } } + } - aRecipe = tRecipeList.toArray(); + aRecipe = tRecipeList.toArray(); - if (aRecipe[idx] instanceof Boolean) { - idx++; - } - Map tItemStackMap = new HashMap<>(); - Map tItemDataMap = new HashMap<>(); - tItemStackMap.put(' ', null); - - boolean tRemoveRecipe = true; - - for (; idx < aRecipe.length; idx += 2) { - if (aRecipe[idx] == null || aRecipe[idx + 1] == null) { - if (D1) { - GTLog.err.println( - "WARNING: Missing Item for shaped Recipe: " - + (aResult == null ? "null" : aResult.getDisplayName())); - for (Object tContent : aRecipe) GTLog.err.println(tContent); - } - return false; + if (aRecipe[idx] instanceof Boolean) { + idx++; + } + Map tItemStackMap = new HashMap<>(); + Map tItemDataMap = new HashMap<>(); + tItemStackMap.put(' ', null); + + boolean tRemoveRecipe = true; + + for (; idx < aRecipe.length; idx += 2) { + if (aRecipe[idx] == null || aRecipe[idx + 1] == null) { + if (D1) { + GTLog.err.println( + "WARNING: Missing Item for shaped Recipe: " + + (aResult == null ? "null" : aResult.getDisplayName())); + for (Object tContent : aRecipe) GTLog.err.println(tContent); } - Character chr = (Character) aRecipe[idx]; - Object in = aRecipe[idx + 1]; - if (in instanceof ItemStack is) { - tItemStackMap.put(chr, GTUtility.copyOrNull(is)); - tItemDataMap.put(chr, GTOreDictUnificator.getItemData(is)); - } else if (in instanceof ItemData) { - String tString = in.toString(); - switch (tString) { - case "plankWood" -> tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); - case "stoneNetherrack" -> tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); - case "stoneObsidian" -> tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); - case "stoneEndstone" -> tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); - default -> tItemDataMap.put(chr, (ItemData) in); - } - ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); - if (tStack == null) tRemoveRecipe = false; - else tItemStackMap.put(chr, tStack); - in = aRecipe[idx + 1] = in.toString(); - } else if (in instanceof String) { - if (in.equals(OreDictNames.craftingChest.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Wood, M * 8)); - else if (in.equals(OreDictNames.craftingBook.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Paper, M * 3)); - else if (in.equals(OreDictNames.craftingPiston.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 4, Materials.Wood, M * 3)); - else if (in.equals(OreDictNames.craftingFurnace.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 8)); - else if (in.equals(OreDictNames.craftingIndustrialDiamond.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Diamond, M)); - else if (in.equals(OreDictNames.craftingAnvil.toString())) - tItemDataMap.put(chr, new ItemData(Materials.Iron, M * 10)); - ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); - if (tStack == null) tRemoveRecipe = false; - else tItemStackMap.put(chr, tStack); - } else { - throw new IllegalArgumentException(); + return false; + } + Character chr = (Character) aRecipe[idx]; + Object in = aRecipe[idx + 1]; + if (in instanceof ItemStack is) { + tItemStackMap.put(chr, GTUtility.copyOrNull(is)); + tItemDataMap.put(chr, GTOreDictUnificator.getItemData(is)); + } else if (in instanceof ItemData) { + String tString = in.toString(); + switch (tString) { + case "plankWood" -> tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); + case "stoneNetherrack" -> tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); + case "stoneObsidian" -> tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); + case "stoneEndstone" -> tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); + default -> tItemDataMap.put(chr, (ItemData) in); } + ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); + if (tStack == null) tRemoveRecipe = false; + else tItemStackMap.put(chr, tStack); + in = aRecipe[idx + 1] = in.toString(); + } else if (in instanceof String) { + if (in.equals(OreDictNames.craftingChest.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Wood, M * 8)); + else if (in.equals(OreDictNames.craftingBook.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Paper, M * 3)); + else if (in.equals(OreDictNames.craftingPiston.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 4, Materials.Wood, M * 3)); + else if (in.equals(OreDictNames.craftingFurnace.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Stone, M * 8)); + else if (in.equals(OreDictNames.craftingIndustrialDiamond.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Diamond, M)); + else if (in.equals(OreDictNames.craftingAnvil.toString())) + tItemDataMap.put(chr, new ItemData(Materials.Iron, M * 10)); + ItemStack tStack = GTOreDictUnificator.getFirstOre(in, 1); + if (tStack == null) tRemoveRecipe = false; + else tItemStackMap.put(chr, tStack); + } else { + throw new IllegalArgumentException(); } + } - if (aReversible && aResult != null) { - ItemData[] tData = new ItemData[9]; - int x = -1; - for (char chr : shape.toString() - .toCharArray()) tData[++x] = tItemDataMap.get(chr); - if (GTUtility.arrayContainsNonNull(tData)) - GTOreDictUnificator.addItemData(aResult, new ItemData(tData)); - } + if (aReversible && aResult != null) { + ItemData[] tData = new ItemData[9]; + int x = -1; + for (char chr : shape.toString() + .toCharArray()) tData[++x] = tItemDataMap.get(chr); + if (GTUtility.arrayContainsNonNull(tData)) GTOreDictUnificator.addItemData(aResult, new ItemData(tData)); + } - if (aCheckForCollisions && tRemoveRecipe) { - ItemStack[] tRecipe = new ItemStack[9]; - int x = -1; - for (char chr : shape.toString() - .toCharArray()) { - tRecipe[++x] = tItemStackMap.get(chr); - if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) - Items.feather.setDamage(tRecipe[x], 0); - } - if (tDoWeCareIfThereWasARecipe || !aBuffered) tThereWasARecipe = removeRecipe(tRecipe) != null; - else removeRecipeDelayed(tRecipe); + if (aCheckForCollisions && tRemoveRecipe) { + ItemStack[] tRecipe = new ItemStack[9]; + int x = -1; + for (char chr : shape.toString() + .toCharArray()) { + tRecipe[++x] = tItemStackMap.get(chr); + if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) + Items.feather.setDamage(tRecipe[x], 0); } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); + if (tDoWeCareIfThereWasARecipe || !aBuffered) tThereWasARecipe = removeRecipe(tRecipe) != null; + else removeRecipeDelayed(tRecipe); } if (aResult == null || aResult.stackSize <= 0) return false; @@ -1330,30 +1323,27 @@ else if (!(aRecipe[i] == null || aRecipe[i] instanceof ItemStack || aRecipe[i] instanceof String || aRecipe[i] instanceof Character)) aRecipe[i] = aRecipe[i].toString(); } - try { - ItemStack[] tRecipe = new ItemStack[9]; - int i = 0; - for (Object tObject : aRecipe) { - if (tObject == null) { - if (D1) GTLog.err.println( - "WARNING: Missing Item for shapeless Recipe: " - + (aResult == null ? "null" : aResult.getDisplayName())); - for (Object tContent : aRecipe) GTLog.err.println(tContent); - return false; - } - if (tObject instanceof ItemStack) { - tRecipe[i] = (ItemStack) tObject; - } else if (tObject instanceof String) { - tRecipe[i] = GTOreDictUnificator.getFirstOre(tObject, 1); - if (tRecipe[i] == null) break; - } - i++; + + ItemStack[] tRecipe = new ItemStack[9]; + int i = 0; + for (Object tObject : aRecipe) { + if (tObject == null) { + if (D1) GTLog.err.println( + "WARNING: Missing Item for shapeless Recipe: " + + (aResult == null ? "null" : aResult.getDisplayName())); + for (Object tContent : aRecipe) GTLog.err.println(tContent); + return false; } - if (sBufferCraftingRecipes && aBuffered) removeRecipeDelayed(tRecipe); - else removeRecipe(tRecipe); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); + if (tObject instanceof ItemStack) { + tRecipe[i] = (ItemStack) tObject; + } else if (tObject instanceof String) { + tRecipe[i] = GTOreDictUnificator.getFirstOre(tObject, 1); + if (tRecipe[i] == null) break; + } + i++; } + if (sBufferCraftingRecipes && aBuffered) removeRecipeDelayed(tRecipe); + else removeRecipe(tRecipe); if (aResult == null || aResult.stackSize <= 0) return false; @@ -1439,21 +1429,17 @@ public boolean canInteractWith(EntityPlayer player) { ArrayList tList = (ArrayList) CraftingManager.getInstance() .getRecipeList(); int tList_sS = tList.size(); - try { - for (int i = 0; i < tList_sS; i++) { - for (; i < tList_sS; i++) { - if ((!(tList.get(i) instanceof IGTCraftingRecipe) - || ((IGTCraftingRecipe) tList.get(i)).isRemovable()) && tList.get(i) - .matches(aCrafting, DW)) { - rReturn = tList.get(i) - .getCraftingResult(aCrafting); - if (rReturn != null) tList.remove(i--); - tList_sS = tList.size(); - } + for (int i = 0; i < tList_sS; i++) { + for (; i < tList_sS; i++) { + if ((!(tList.get(i) instanceof IGTCraftingRecipe) || ((IGTCraftingRecipe) tList.get(i)).isRemovable()) + && tList.get(i) + .matches(aCrafting, DW)) { + rReturn = tList.get(i) + .getCraftingResult(aCrafting); + if (rReturn != null) tList.remove(i--); + tList_sS = tList.size(); } } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } return rReturn; } @@ -1688,12 +1674,7 @@ public boolean canInteractWith(EntityPlayer player) { found = false; if (!allowOreDict && iRecipe instanceof ShapedOreRecipe) continue; - try { - found = iRecipe.matches(aCrafting, DW); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } - if (found) { + if (iRecipe.matches(aCrafting, DW)) { ItemStack tOutput = aUncopiedStack ? iRecipe.getRecipeOutput() : iRecipe.getCraftingResult(aCrafting); if (tOutput == null || tOutput.stackSize <= 0) { // Seriously, who would ever do that shit? @@ -1831,12 +1812,7 @@ public boolean canInteractWith(EntityPlayer player) { .filter(tRecipe -> { if (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe || tRecipe instanceof IGTCraftingRecipe) return false; - try { - return tRecipe.matches(aCrafting, DW); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - return false; - } + return tRecipe.matches(aCrafting, DW); }) .forEach(tRecipe -> stacks.add(tRecipe.getCraftingResult(aCrafting))); rList = stacks.stream() @@ -1845,14 +1821,8 @@ public boolean canInteractWith(EntityPlayer player) { .collect(Collectors.toList()); } else for (Iterator iterator = aList.iterator(); iterator.hasNext();) { IRecipe tRecipe = iterator.next(); - boolean matched = false; - try { - matched = tRecipe.matches(aCrafting, DW); - } catch (Throwable e) { - e.printStackTrace(GTLog.err); - } - if (matched) { + if (tRecipe.matches(aCrafting, DW)) { ItemStack tOutput = tRecipe.getCraftingResult(aCrafting); if (tOutput == null || tOutput.stackSize <= 0) { @@ -1900,37 +1870,33 @@ public static ItemStack[] getMachineOutput(ItemStack aInput, Map tEntry : aRecipeList.entrySet()) { + for (Entry tEntry : aRecipeList.entrySet()) { + if (tEntry.getKey() + .matches(aInput)) { if (tEntry.getKey() - .matches(aInput)) { - if (tEntry.getKey() - .getAmount() <= aInput.stackSize) { - ItemStack[] tList = tEntry.getValue().items.toArray(new ItemStack[0]); - if (tList.length == 0) break; - ItemStack[] rList = new ItemStack[aOutputSlots.length]; - rRecipeMetaData.setTag("return", tEntry.getValue().metadata); - for (byte i = 0; i < aOutputSlots.length && i < tList.length; i++) { - if (tList[i] != null) { - if (aOutputSlots[i] == null || (GTUtility.areStacksEqual(tList[i], aOutputSlots[i]) - && tList[i].stackSize + aOutputSlots[i].stackSize - <= aOutputSlots[i].getMaxStackSize())) { - rList[i] = GTUtility.copyOrNull(tList[i]); - } else { - return new ItemStack[aOutputSlots.length]; - } + .getAmount() <= aInput.stackSize) { + ItemStack[] tList = tEntry.getValue().items.toArray(new ItemStack[0]); + if (tList.length == 0) break; + ItemStack[] rList = new ItemStack[aOutputSlots.length]; + rRecipeMetaData.setTag("return", tEntry.getValue().metadata); + for (byte i = 0; i < aOutputSlots.length && i < tList.length; i++) { + if (tList[i] != null) { + if (aOutputSlots[i] == null || (GTUtility.areStacksEqual(tList[i], aOutputSlots[i]) + && tList[i].stackSize + aOutputSlots[i].stackSize + <= aOutputSlots[i].getMaxStackSize())) { + rList[i] = GTUtility.copyOrNull(tList[i]); + } else { + return new ItemStack[aOutputSlots.length]; } } - - if (aRemoveInput) aInput.stackSize -= tEntry.getKey() - .getAmount(); - return rList; } - break; + + if (aRemoveInput) aInput.stackSize -= tEntry.getKey() + .getAmount(); + return rList; } + break; } - } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); } return new ItemStack[aOutputSlots.length]; } @@ -2002,22 +1968,17 @@ public static ItemStack getRandomScrapboxDrop() { */ public static int chargeElectricItem(ItemStack aStack, int aCharge, int aTier, boolean aIgnoreLimit, boolean aSimulate) { - try { - if (isElectricItem(aStack)) { - int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack); - if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) { - if (!aIgnoreLimit && tTier >= 0) - aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))]); - if (aCharge > 0) { - int rCharge = (int) Math.max( - 0.0, - ic2.api.item.ElectricItem.manager.charge(aStack, aCharge, tTier, true, aSimulate)); - return rCharge + (rCharge * 4 > aTier ? aTier : 0); - } + if (isElectricItem(aStack)) { + int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack); + if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) { + if (!aIgnoreLimit && tTier >= 0) + aCharge = (int) Math.min(aCharge, V[Math.max(0, Math.min(V.length - 1, tTier))]); + if (aCharge > 0) { + int rCharge = (int) Math + .max(0.0, ic2.api.item.ElectricItem.manager.charge(aStack, aCharge, tTier, true, aSimulate)); + return rCharge + (rCharge * 4 > aTier ? aTier : 0); } } - } catch (Throwable e) { - /* Do nothing */ } return 0; } @@ -2031,31 +1992,25 @@ public static int chargeElectricItem(ItemStack aStack, int aCharge, int aTier, b */ public static int dischargeElectricItem(ItemStack aStack, int aCharge, int aTier, boolean aIgnoreLimit, boolean aSimulate, boolean aIgnoreDischargability) { - try { - // if (isElectricItem(aStack) && (aIgnoreDischargability || - // ((ic2.api.item.IElectricItem)aStack.getItem()).canProvideEnergy(aStack))) { - if (isElectricItem(aStack)) { - int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack); - if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) { - if (!aIgnoreLimit && tTier >= 0) aCharge = (int) Math.min( - aCharge, - V[Math.max(0, Math.min(V.length - 1, tTier))] + B[Math.max(0, Math.min(V.length - 1, tTier))]); - if (aCharge > 0) { - int rCharge = (int) Math.max( - 0, - ic2.api.item.ElectricItem.manager.discharge( - aStack, - aCharge + (aCharge * 4 > aTier ? aTier : 0), - tTier, - true, - !aIgnoreDischargability, - aSimulate)); - return rCharge - (rCharge * 4 > aTier ? aTier : 0); - } + if (isElectricItem(aStack)) { + int tTier = ((ic2.api.item.IElectricItem) aStack.getItem()).getTier(aStack); + if (tTier < 0 || tTier == aTier || aTier == Integer.MAX_VALUE) { + if (!aIgnoreLimit && tTier >= 0) aCharge = (int) Math.min( + aCharge, + V[Math.max(0, Math.min(V.length - 1, tTier))] + B[Math.max(0, Math.min(V.length - 1, tTier))]); + if (aCharge > 0) { + int rCharge = (int) Math.max( + 0, + ic2.api.item.ElectricItem.manager.discharge( + aStack, + aCharge + (aCharge * 4 > aTier ? aTier : 0), + tTier, + true, + !aIgnoreDischargability, + aSimulate)); + return rCharge - (rCharge * 4 > aTier ? aTier : 0); } } - } catch (Throwable e) { - /* Do nothing */ } return 0; } @@ -2066,12 +2021,8 @@ public static int dischargeElectricItem(ItemStack aStack, int aCharge, int aTier * @return if the action was successful */ public static boolean canUseElectricItem(ItemStack aStack, int aCharge) { - try { - if (isElectricItem(aStack)) { - return ic2.api.item.ElectricItem.manager.canUse(aStack, aCharge); - } - } catch (Throwable e) { - /* Do nothing */ + if (isElectricItem(aStack)) { + return ic2.api.item.ElectricItem.manager.canUse(aStack, aCharge); } return false; } @@ -2082,15 +2033,11 @@ public static boolean canUseElectricItem(ItemStack aStack, int aCharge) { * @return if the action was successful */ public static boolean useElectricItem(ItemStack aStack, int aCharge, EntityPlayer aPlayer) { - try { - if (isElectricItem(aStack)) { - ic2.api.item.ElectricItem.manager.use(aStack, 0, aPlayer); - if (ic2.api.item.ElectricItem.manager.canUse(aStack, aCharge)) { - return ic2.api.item.ElectricItem.manager.use(aStack, aCharge, aPlayer); - } + if (isElectricItem(aStack)) { + ic2.api.item.ElectricItem.manager.use(aStack, 0, aPlayer); + if (ic2.api.item.ElectricItem.manager.canUse(aStack, aCharge)) { + return ic2.api.item.ElectricItem.manager.use(aStack, aCharge, aPlayer); } - } catch (Throwable e) { - /* Do nothing */ } return false; } @@ -2222,12 +2169,8 @@ public static boolean consumeSolderingMaterial(IInventory aInventory) { * Is this an electric Item, which can charge other Items? */ public static boolean isChargerItem(ItemStack aStack) { - try { - if (isElectricItem(aStack)) { - return ((ic2.api.item.IElectricItem) aStack.getItem()).canProvideEnergy(aStack); - } - } catch (Throwable e) { - /* Do nothing */ + if (isElectricItem(aStack)) { + return ((ic2.api.item.IElectricItem) aStack.getItem()).canProvideEnergy(aStack); } return false; } @@ -2236,23 +2179,13 @@ public static boolean isChargerItem(ItemStack aStack) { * Is this an electric Item? */ public static boolean isElectricItem(ItemStack aStack) { - try { - return aStack != null && aStack.getItem() instanceof ic2.api.item.IElectricItem - && ((IElectricItem) aStack.getItem()).getTier(aStack) < Integer.MAX_VALUE; - } catch (Throwable e) { - /* Do nothing */ - } - return false; + return aStack != null && aStack.getItem() instanceof ic2.api.item.IElectricItem + && ((IElectricItem) aStack.getItem()).getTier(aStack) < Integer.MAX_VALUE; } public static boolean isElectricItem(ItemStack aStack, byte aTier) { - try { - return aStack != null && aStack.getItem() instanceof ic2.api.item.IElectricItem - && ((IElectricItem) aStack.getItem()).getTier(aStack) == aTier; - } catch (Throwable e) { - /* Do nothing */ - } - return false; + return aStack != null && aStack.getItem() instanceof ic2.api.item.IElectricItem + && ((IElectricItem) aStack.getItem()).getTier(aStack) == aTier; } /** @@ -2289,11 +2222,7 @@ public static Optional getElectricItemCharge(ItemStack aStack) { */ public static void registerBoxableItemToToolBox(ItemStack aStack) { if (aStack != null) { - try { - ic2.api.item.ItemWrapper.registerBoxable(aStack.getItem(), (IBoxable) sBoxableWrapper); - } catch (Throwable ignored) { - /* Do nothing */ - } + ic2.api.item.ItemWrapper.registerBoxable(aStack.getItem(), (IBoxable) sBoxableWrapper); sBoxableItems.add(new GTItemStack(aStack)); } } diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index 2e00dd42b77..9b3c1082408 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -131,6 +131,7 @@ import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.GTMod; import gregtech.api.GregTechAPI; import gregtech.api.damagesources.GTDamageSources; import gregtech.api.damagesources.GTDamageSources.DamageSourceHotItem; @@ -242,7 +243,7 @@ public static Field getPublicField(Object aObject, String aField) { rField = aObject.getClass() .getDeclaredField(aField); } catch (Throwable e) { - /* Do nothing */ + if (D1) e.printStackTrace(GTLog.err); } return rField; } @@ -254,7 +255,7 @@ public static Field getField(Object aObject, String aField) { .getDeclaredField(aField); rField.setAccessible(true); } catch (Throwable e) { - /* Do nothing */ + if (D1) e.printStackTrace(GTLog.err); } return rField; } @@ -265,7 +266,7 @@ public static Field getField(Class aObject, String aField) { rField = aObject.getDeclaredField(aField); rField.setAccessible(true); } catch (Throwable e) { - /* Do nothing */ + if (D1) e.printStackTrace(GTLog.err); } return rField; } @@ -276,7 +277,7 @@ public static Method getMethod(Class aObject, String aMethod, Class... aPa rMethod = aObject.getMethod(aMethod, aParameterTypes); rMethod.setAccessible(true); } catch (Throwable e) { - /* Do nothing */ + if (D1) e.printStackTrace(GTLog.err); } return rMethod; } @@ -288,7 +289,7 @@ public static Method getMethod(Object aObject, String aMethod, Class... aPara .getMethod(aMethod, aParameterTypes); rMethod.setAccessible(true); } catch (Throwable e) { - /* Do nothing */ + if (D1) e.printStackTrace(GTLog.err); } return rMethod; } @@ -371,7 +372,9 @@ public static Object callConstructor(Class aClass, int aConstructorIndex, Obj for (Constructor tConstructor : aClass.getConstructors()) { try { return tConstructor.newInstance(aParameters); - } catch (Throwable ignored) {} + } catch (Throwable e) { + if (D1) e.printStackTrace(GTLog.err); + } } } catch (Throwable e) { if (aLogErrors) e.printStackTrace(GTLog.err); @@ -508,21 +511,21 @@ public static void checkAvailabilities() { tClass.getCanonicalName(); TE_CHECK = true; } catch (Throwable e) { - /**/ + if (D1) e.printStackTrace(GTLog.err); } try { Class tClass = buildcraft.api.transport.IPipeTile.class; tClass.getCanonicalName(); BC_CHECK = true; } catch (Throwable e) { - /**/ + if (D1) e.printStackTrace(GTLog.err); } try { Class tClass = cofh.api.energy.IEnergyReceiver.class; tClass.getCanonicalName(); RF_CHECK = true; } catch (Throwable e) { - /**/ + if (D1) e.printStackTrace(GTLog.err); } CHECK_ALL = false; } @@ -2726,7 +2729,11 @@ public static boolean applyHeatDamageFromItem(EntityLivingBase entity, float dam private static boolean applyHeatDamage(EntityLivingBase aEntity, float aDamage, DamageSource source) { if (aDamage > 0 && aEntity != null && !isWearingFullHeatHazmat(aEntity)) { - return aEntity.attackEntityFrom(source, aDamage); + try { + return aEntity.attackEntityFrom(source, aDamage); + } catch (Throwable t) { + GTMod.GT_FML_LOGGER.error("Error damaging entity", t); + } } return false; } @@ -3240,14 +3247,10 @@ public static int getCoordinateScan(ArrayList aList, EntityPlayer aPlaye if (tTileEntity != null) { rEUAmount += addFluidHandlerInfo(side, tList, tTileEntity); - try { - if (tTileEntity instanceof ic2.api.reactor.IReactorChamber chamber) { - rEUAmount += 500; - // Redirect the rest of the scans to the reactor itself - tTileEntity = (TileEntity) chamber.getReactor(); - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GTLog.err); + if (tTileEntity instanceof ic2.api.reactor.IReactorChamber chamber) { + rEUAmount += 500; + // Redirect the rest of the scans to the reactor itself + tTileEntity = (TileEntity) chamber.getReactor(); } rEUAmount += addReactorInfo(tList, tTileEntity); rEUAmount += addAlignmentInfo(tList, tTileEntity); diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java index a1ca9b3eab6..ae94c3a3563 100644 --- a/src/main/java/gregtech/common/GTProxy.java +++ b/src/main/java/gregtech/common/GTProxy.java @@ -1236,14 +1236,14 @@ public void onPostLoad() { } } GTLog.out.println("GTMod: Adding Configs specific for MetaTileEntities"); - try { - for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { - if (GregTechAPI.METATILEENTITIES[i] != null) { + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + if (GregTechAPI.METATILEENTITIES[i] != null) { + try { GregTechAPI.METATILEENTITIES[i].onConfigLoad(); + } catch (Throwable e) { + GT_FML_LOGGER.error("Could not load config for MTE " + GregTechAPI.METATILEENTITIES[i], e); } } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } GTLog.out.println("GTMod: Adding Tool Usage Crafting Recipes for OreDict Items."); for (Materials aMaterial : Materials.values()) { @@ -1332,14 +1332,16 @@ public void onServerStarting() { break; } } - try { - for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { - if (GregTechAPI.METATILEENTITIES[i] != null) { + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + if (GregTechAPI.METATILEENTITIES[i] != null) { + try { GregTechAPI.METATILEENTITIES[i].onServerStart(); + } catch (Throwable e) { + throw new RuntimeException( + "Could not call onServerStart MTE " + GregTechAPI.METATILEENTITIES[i], + e); } } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } } @@ -1375,19 +1377,19 @@ public void onServerStopping() { File tSaveDirectory = getSaveDirectory(); GregTechAPI.sWirelessRedstone.clear(); if (tSaveDirectory != null) { - try { - for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { - if (GregTechAPI.METATILEENTITIES[i] != null) { + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + if (GregTechAPI.METATILEENTITIES[i] != null) { + try { GregTechAPI.METATILEENTITIES[i].onWorldSave(tSaveDirectory); + } catch (Throwable e) { + throw new RuntimeException( + "Could not call onWorldSave for MTE " + GregTechAPI.METATILEENTITIES[i], + e); } } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } } this.mUniverse = null; - // GT_ChunkAssociatedData.saveAll(); todo: figure out if this is needed - } @SubscribeEvent @@ -2050,7 +2052,8 @@ public void registerOre(OreDictionary.OreRegisterEvent aEvent) { registerRecipes(tOre); } } catch (Throwable e) { - e.printStackTrace(GTLog.err); + GT_FML_LOGGER + .error("Could not register ore (oredict name=" + aEvent.Name + ", item stack=" + aEvent.Ore + ")", e); } } @@ -2128,14 +2131,16 @@ public void onWorldTickEvent(TickEvent.WorldTickEvent aEvent) { File tSaveDiretory = getSaveDirectory(); if (tSaveDiretory != null) { this.isFirstServerWorldTick = false; - try { - for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { - if (GregTechAPI.METATILEENTITIES[i] != null) { + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + if (GregTechAPI.METATILEENTITIES[i] != null) { + try { GregTechAPI.METATILEENTITIES[i].onWorldLoad(tSaveDiretory); + } catch (Throwable e) { + throw new RuntimeException( + "Could not call onWorldLoad for MTE " + GregTechAPI.METATILEENTITIES[i], + e); } } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } } } diff --git a/src/main/java/gregtech/common/blocks/ItemMachines.java b/src/main/java/gregtech/common/blocks/ItemMachines.java index 92f1675a443..276008b1758 100644 --- a/src/main/java/gregtech/common/blocks/ItemMachines.java +++ b/src/main/java/gregtech/common/blocks/ItemMachines.java @@ -153,6 +153,8 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List } } } catch (Throwable e) { + aList.add(String.format("§cAn exception was thrown while getting this item's info.§r")); + aList.add(e.getLocalizedMessage()); GT_FML_LOGGER.error("addInformation", e); } } diff --git a/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java b/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java index 876bda59630..36e48d865ad 100644 --- a/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java +++ b/src/main/java/gregtech/common/items/ItemIntegratedCircuit.java @@ -28,6 +28,7 @@ import bartworks.common.items.ItemCircuitProgrammer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.GTMod; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -222,12 +223,12 @@ public void registerIcons(IIconRegister aIconRegister) { GTLog.out.println("GTMod: Starting Item Icon Load Phase"); GT_FML_LOGGER.info("GTMod: Starting Item Icon Load Phase"); GregTechAPI.sItemIcons = aIconRegister; - try { - for (Runnable tRunnable : GregTechAPI.sGTItemIconload) { + for (Runnable tRunnable : GregTechAPI.sGTItemIconload) { + try { tRunnable.run(); + } catch (Throwable e) { + GTMod.GT_FML_LOGGER.error("Error registering icons", e); } - } catch (Throwable e) { - e.printStackTrace(GTLog.err); } GTLog.out.println("GTMod: Finished Item Icon Load Phase"); GT_FML_LOGGER.info("GTMod: Finished Item Icon Load Phase"); diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java index 6155a6c7395..8404bd33390 100644 --- a/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourWrench.java @@ -16,6 +16,7 @@ import appeng.api.parts.IPartHost; import appeng.api.util.IOrientable; import appeng.tile.misc.TileInterface; +import gregtech.GTMod; import gregtech.api.enums.SoundResource; import gregtech.api.items.MetaBaseItem; import gregtech.api.items.MetaGeneratedTool; @@ -61,7 +62,9 @@ public boolean onItemUseFirst(MetaBaseItem aItem, ItemStack aStack, EntityPlayer try { return handler.handle() && !aWorld.isRemote; - } catch (Throwable ignored) {} + } catch (Throwable e) { + GTMod.GT_FML_LOGGER.error("Error wrenching", e); + } return false; } diff --git a/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java index 9364fd35b24..3aa4f1c04bf 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoiler.java @@ -199,12 +199,9 @@ public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mTemperature", this.mTemperature); aNBT.setInteger("mProcessingEnergy", this.mProcessingEnergy); aNBT.setInteger("mExcessWater", this.mExcessWater); - if (this.mSteam == null) { - return; - } - try { + if (mSteam != null) { aNBT.setTag("mSteam", this.mSteam.writeToNBT(new NBTTagCompound())); - } catch (Throwable ignored) {} + } } @Override diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java index b7c84ddc8ce..19cc847ba06 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java @@ -85,28 +85,6 @@ public boolean onBlockActivated(final World world, final int x, final int y, fin } else { TileEntityBaseFluidCollector tank = (TileEntityBaseFluidCollector) world.getTileEntity(x, y, z); if (tank != null) { - // Item handItem; - // try { - // handItem = player.getHeldItem() - // .getItem(); - // } catch (Throwable t) {} - - // Fluid container code - /* - * if (handItem != null && (handItem instanceof IFluidContainerItem || handItem instanceof - * ItemFluidContainer || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) { if - * (tank.tank.getFluid() == null) { try { if - * (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) { ItemStack handItemStack = - * player.getHeldItem(); IFluidContainerItem container = (IFluidContainerItem) handItem; FluidStack - * containerFluid = container.getFluid(handItemStack); container.drain(handItemStack, - * container.getFluid(handItemStack).amount, true); tank.tank.setFluid(containerFluid); } else { - * ItemStack handItemStack = player.getHeldItem(); - * FluidContainerRegistry.drainFluidContainer(handItemStack); FluidStack containerFluid = - * FluidContainerRegistry.getFluidForFilledItem(handItemStack); ItemStack emptyContainer = - * FluidContainerRegistry.drainFluidContainer(handItemStack); player.setItemInUse(emptyContainer, 0); - * tank.tank.setFluid(containerFluid); } } catch (Throwable t) { t.printStackTrace(); } } } - */ - if (!tank.mInventory.isEmpty()) { PlayerUtils.messagePlayer(player, "Inventory contains:"); PlayerUtils.messagePlayer(player, ItemUtils.getArrayStackNames(tank.mInventory.getRealInventory())); diff --git a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java index 572284584cd..f5409ff7f57 100644 --- a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -245,17 +245,10 @@ public static void startLoadingGregAPIBasedRecipes() { // Add autogenerated Recipes from Item Components for (Set> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo r : m) { - try { - r.run(); - Logger.INFO( - "[FIND] " + r.getInfoData() - .getLocalizedName() + " recipes generated."); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO( - "[ERROR] " + r.getInfoData() - .getLocalizedName() + " recipes failed to generated."); - } + r.run(); + Logger.INFO( + "[FIND] " + r.getInfoData() + .getLocalizedName() + " recipes generated."); } } RecipeGenRecycling.executeGenerators(); @@ -278,31 +271,16 @@ public static void onLoadComplete(FMLLoadCompleteEvent event) { public static void runQueuedRecipes() { // Add autogenerated Recipes from Item Components for (RunnableWithInfo m : mRecipesToGenerate) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); - } + m.run(); } for (RunnableWithInfo m : mGtRecipesToGenerate) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData() + " recipe failed to generated."); - } + m.run(); } } public static void runQueuedMisc() { for (RunnableWithInfo m : mObjectsToRunInPostInit) { - try { - m.run(); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData()); - } + m.run(); } } @@ -311,12 +289,7 @@ public static void runQueuedMisc() { */ public static void runQueuedOnLoadComplete(FMLLoadCompleteEvent event) { for (ItemPackage m : mObjectsToRunInOnLoadComplete) { - try { - m.onLoadComplete(event); - } catch (Throwable t) { - t.printStackTrace(); - Logger.INFO("[ERROR] " + m.getInfoData()); - } + m.onLoadComplete(event); } } } diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 0e69ba88d59..2af92fa266b 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1150,7 +1150,7 @@ public final Block getOreBlock(final int stacksize) { return x; } } catch (Throwable t) { - // t.printStackTrace(); + t.printStackTrace(); } // Logger.MATERIALS("Failed getting the Ore Block for "+this.getLocalizedName()+"."); return Blocks.stone; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 2c380e6eba1..e5b61f049d6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -330,29 +330,25 @@ public static boolean addMixerRecipe_Standalone(final Material material) { } // Add mixer Recipe - try { - if (oxygen == null) { - GTValues.RA.stdBuilder() - .itemInputs(input1, input2, input3, input4) - .itemOutputs(outputStacks) - .duration((int) Math.max(material.getMass() * 2L * 1, 1)) - .eut(material.vVoltageMultiplier) - .addTo(mixerRecipes); - } else { - GTValues.RA.stdBuilder() - .itemInputs(input1, input2, input3, input4) - .itemOutputs(outputStacks) - .fluidInputs(oxygen) - .duration((int) Math.max(material.getMass() * 2L * 1, 1)) - .eut(material.vVoltageMultiplier) - .addTo(mixerRecipes); - } + if (oxygen == null) { + GTValues.RA.stdBuilder() + .itemInputs(input1, input2, input3, input4) + .itemOutputs(outputStacks) + .duration((int) Math.max(material.getMass() * 2L * 1, 1)) + .eut(material.vVoltageMultiplier) + .addTo(mixerRecipes); + } else { + GTValues.RA.stdBuilder() + .itemInputs(input1, input2, input3, input4) + .itemOutputs(outputStacks) + .fluidInputs(oxygen) + .duration((int) Math.max(material.getMass() * 2L * 1, 1)) + .eut(material.vVoltageMultiplier) + .addTo(mixerRecipes); + } - Logger.WARNING("Dust Mixer Recipe: " + material.getLocalizedName() + " - Success"); + Logger.WARNING("Dust Mixer Recipe: " + material.getLocalizedName() + " - Success"); - } catch (Throwable t) { - t.printStackTrace(); - } return true; } @@ -378,32 +374,26 @@ public static boolean generatePackagerRecipes(Material aMatInfo) { private void addFurnaceRecipe(Material aMatInfo) { ItemStack aDust = aMatInfo.getDust(1); - ItemStack aOutput; - try { - if (aMatInfo.requiresBlastFurnace()) { - aOutput = aMatInfo.getHotIngot(1); - if (ItemUtils.checkForInvalidItems(aOutput)) { - if (addBlastFurnaceRecipe(aMatInfo, aDust, aOutput, aMatInfo.getMeltingPointK())) { - Logger - .MATERIALS("Successfully added a blast furnace recipe for " + aMatInfo.getLocalizedName()); - } else { - Logger.MATERIALS("Failed to add a blast furnace recipe for " + aMatInfo.getLocalizedName()); - } + if (aMatInfo.requiresBlastFurnace()) { + ItemStack aOutput = aMatInfo.getHotIngot(1); + if (ItemUtils.checkForInvalidItems(aOutput)) { + if (addBlastFurnaceRecipe(aMatInfo, aDust, aOutput, aMatInfo.getMeltingPointK())) { + Logger.MATERIALS("Successfully added a blast furnace recipe for " + aMatInfo.getLocalizedName()); } else { Logger.MATERIALS("Failed to add a blast furnace recipe for " + aMatInfo.getLocalizedName()); } } else { - aOutput = aMatInfo.getIngot(1); - if (ItemUtils.checkForInvalidItems(aOutput)) { - if (GTModHandler.addSmeltingAndAlloySmeltingRecipe(aDust, aOutput, false)) { - Logger.MATERIALS("Successfully added a furnace recipe for " + aMatInfo.getLocalizedName()); - } else { - Logger.MATERIALS("Failed to add a furnace recipe for " + aMatInfo.getLocalizedName()); - } + Logger.MATERIALS("Failed to add a blast furnace recipe for " + aMatInfo.getLocalizedName()); + } + } else { + ItemStack aOutput = aMatInfo.getIngot(1); + if (ItemUtils.checkForInvalidItems(aOutput)) { + if (GTModHandler.addSmeltingAndAlloySmeltingRecipe(aDust, aOutput, false)) { + Logger.MATERIALS("Successfully added a furnace recipe for " + aMatInfo.getLocalizedName()); + } else { + Logger.MATERIALS("Failed to add a furnace recipe for " + aMatInfo.getLocalizedName()); } } - } catch (Throwable t) { - t.printStackTrace(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index 68011ace71a..6cea2539ec9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -286,39 +286,33 @@ public static ArrayList getOres(final Object aOreName) { } public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) { + if (oredictName.contains("-") || oredictName.contains("_")) { + oredictName = Utils.sanitizeString(oredictName, new char[] { '-', '_' }); + } else { + oredictName = Utils.sanitizeString(oredictName); + } - try { - - if (oredictName.contains("-") || oredictName.contains("_")) { - oredictName = Utils.sanitizeString(oredictName, new char[] { '-', '_' }); - } else { - oredictName = Utils.sanitizeString(oredictName); - } - - // Adds a check to grab dusts using GT methodology if possible. - ItemStack returnValue = null; - if (oredictName.toLowerCase() - .contains("dust")) { - final String MaterialName = oredictName.toLowerCase() - .replace("dust", ""); - final Materials m = Materials.get(MaterialName); - if (m != null && m != Materials._NULL) { - returnValue = ItemUtils.getGregtechDust(m, amount); - if (ItemUtils.checkForInvalidItems(returnValue)) { - return returnValue; - } - } - } - if (returnValue == null) { - returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); + // Adds a check to grab dusts using GT methodology if possible. + ItemStack returnValue = null; + if (oredictName.toLowerCase() + .contains("dust")) { + final String MaterialName = oredictName.toLowerCase() + .replace("dust", ""); + final Materials m = Materials.get(MaterialName); + if (m != null && m != Materials._NULL) { + returnValue = ItemUtils.getGregtechDust(m, amount); if (ItemUtils.checkForInvalidItems(returnValue)) { - return returnValue.copy(); + return returnValue; } } - return null; - } catch (final Throwable t) { - return null; } + if (returnValue == null) { + returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); + if (ItemUtils.checkForInvalidItems(returnValue)) { + return returnValue.copy(); + } + } + return null; } public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, final int amount) { diff --git a/src/main/java/tectech/loader/MainLoader.java b/src/main/java/tectech/loader/MainLoader.java index 14115b86e19..9d907ac0f3c 100644 --- a/src/main/java/tectech/loader/MainLoader.java +++ b/src/main/java/tectech/loader/MainLoader.java @@ -27,11 +27,7 @@ public static void preLoad() { creativeTabTecTech = new CreativeTabTecTech("TecTech"); // set expanded texture arrays for tiers - try { - Textures.run(); - } catch (Throwable t) { - LOGGER.error("Loading textures...", t); - } + Textures.run(); ProgressManager.ProgressBar progressBarPreload = ProgressManager.push("TecTech Preload", 1); From ab402cee0629f604ad70a0ebe817d1a86b244ff3 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 15 Jan 2025 00:53:02 -0500 Subject: [PATCH 08/15] Change block autogen to use material mass for duration (#3804) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gregtech/loaders/oreprocessing/ProcessingBlock.java | 6 +++--- .../gregtech/loaders/oreprocessing/ProcessingShaping.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 555341aa45d..04e975aedbc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -141,8 +141,8 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { .itemInputs(ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) .fluidInputs(aMaterial.getMolten(1296L)) - .duration(14 * SECONDS + 8 * TICKS) - .eut(8) + .duration(aMaterial.getMass() * 9 * TICKS) + .eut(calculateRecipeEU(aMaterial, 8)) .addTo(fluidSolidifierRecipes); } } @@ -171,7 +171,7 @@ else if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) - .duration(15 * SECONDS) + .duration(aMaterial.getMass() * 2 * TICKS) .eut(calculateRecipeEU(aMaterial, 2)) .addTo(compressorRecipes); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 9a42178b1c4..97457466d9c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -58,7 +58,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .duration((10 * tAmount) * TICKS) + .duration(aMaterialMass * 9 * TICKS) .eut(calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)) .addTo(extruderRecipes); @@ -67,7 +67,7 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(9, aStack), ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) - .duration((5 * tAmount) * TICKS) + .duration(aMaterialMass * 9 * TICKS) .eut(calculateRecipeEU(aMaterial, 4 * tVoltageMultiplier)) .recipeCategory(RecipeCategories.alloySmelterMolding) .addTo(alloySmelterRecipes); From fc5ddffed18ea42257cf5f3bcee51724e4d1b774 Mon Sep 17 00:00:00 2001 From: Pxx500 <81298696+Pxx500@users.noreply.github.com> Date: Wed, 15 Jan 2025 23:03:54 +0100 Subject: [PATCH 09/15] fix error in tooltip (#3816) --- .../multi/production/turbines/MTELargerTurbineBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 826bac7aa93..783987b6074 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -162,7 +162,7 @@ protected final MultiblockTooltipBuilder createTooltip() { .beginStructureBlock(7, 9, 7, false) .addController("Top Middle") .addCasingInfoMin(getCasingName(), 360, false) - .addCasingInfoMin("Rotor Shaft", 30, false) + .addCasingInfoMin("Turbine Shaft", 30, false) .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1) .addInputBus("Any 4 dot hint (min 1)", 4) .addInputHatch("Any 4 dot hint(min 1)", 4); From 07c8aa4c5d95f7f8cf53e33cc1be3aeb4348304e Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Thu, 16 Jan 2025 06:25:10 +0100 Subject: [PATCH 10/15] Lsc wireless mode improvements (#3814) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../MTELapotronicSuperCapacitor.java | 125 +++++++++++++++++- .../resources/assets/kekztech/lang/en_US.lang | 2 + 2 files changed, 125 insertions(+), 2 deletions(-) diff --git a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java index 4c2da0c2a22..0f49ec3c34a 100644 --- a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java +++ b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java @@ -14,7 +14,9 @@ import static java.lang.Math.min; import static kekztech.util.Util.toPercentageFrom; import static kekztech.util.Util.toStandardForm; +import static net.minecraft.util.StatCollector.translateToLocal; +import java.math.BigDecimal; import java.math.BigInteger; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -57,6 +59,8 @@ import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.drawable.UITexture; import com.gtnewhorizons.modularui.api.math.Alignment; +import com.gtnewhorizons.modularui.api.math.Color; +import com.gtnewhorizons.modularui.api.math.Size; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; @@ -64,6 +68,7 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; +import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget; import bartworks.API.BorosilicateGlass; import gregtech.api.enums.Dyes; @@ -111,6 +116,7 @@ private enum TopState { private boolean wireless_mode = false; private int counter = 1; private boolean balanced = false; + private boolean warningReceived = false; private final LongRunningAverage energyInputValues1h = new LongRunningAverage(3600 * 20); private final LongRunningAverage energyOutputValues1h = new LongRunningAverage(3600 * 20); @@ -183,6 +189,8 @@ public static int getIndexFromGlassTier(int glassTier) { private static final int CASING_TEXTURE_ID = (42 << 7) | 127; private static final int DURATION_AVERAGE_TICKS = 100; + private static final int DEBUG_POWER_WINDOW_ID = 10; + private static final int WIRELESS_WARNING_WINDOW_ID = 11; // height channel for height. // glass channel for glass @@ -477,7 +485,15 @@ protected MultiblockTooltipBuilder createTooltip() { + EnumChatFormatting.GRAY + ") EU in the LSC") .addInfo("it will withdraw from the network and add to the LSC.") - .addInfo("If there is more it will add the EU to the network and remove it from the LSC.") + .addInfo( + "If there is more it will add " + EnumChatFormatting.DARK_RED + + EnumChatFormatting.BOLD + + EnumChatFormatting.UNDERLINE + + "all excess" + + EnumChatFormatting.RESET + + EnumChatFormatting.GRAY + + " EU to the network, removing it from the LSC.") + .addInfo("This can potentially brick your base, be careful.") .addInfo( "The threshold increases " + EnumChatFormatting.DARK_RED + "100" @@ -1217,6 +1233,7 @@ public void saveNBTData(NBTTagCompound nbt) { nbt.setByteArray("stored", stored.toByteArray()); nbt.setBoolean("wireless_mode", wireless_mode); nbt.setInteger("wireless_mode_cooldown", counter); + nbt.setBoolean("warningReceived", warningReceived); super.saveNBTData(nbt); } @@ -1229,6 +1246,7 @@ public void loadNBTData(NBTTagCompound nbt) { stored = new BigInteger(nbt.getByteArray("stored")); wireless_mode = nbt.getBoolean("wireless_mode"); counter = nbt.getInteger("wireless_mode_cooldown"); + warningReceived = nbt.getBoolean("warningReceived"); super.loadNBTData(nbt); } @@ -1324,13 +1342,22 @@ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, f @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); + buildContext.addSyncedWindow(DEBUG_POWER_WINDOW_ID, this::createPowerWindow); + buildContext.addSyncedWindow(WIRELESS_WARNING_WINDOW_ID, this::createWarningWindow); builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { if (!widget.isClient()) { canUseWireless = canUseWireless(); } if (canUseWireless) { - wireless_mode = !wireless_mode; + if (!warningReceived) { + warningReceived = true; + widget.getContext() + .openSyncedWindow(WIRELESS_WARNING_WINDOW_ID); + } else { + wireless_mode = !wireless_mode; + } } + }) .setPlayClickSound(true) .setBackground(() -> { @@ -1353,6 +1380,7 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setTooltipShowUpDelay(TOOLTIP_DELAY)) .widget(new FakeSyncWidget.BooleanSyncer(() -> wireless_mode, val -> wireless_mode = val)) .widget(new FakeSyncWidget.BooleanSyncer(this::canUseWireless, val -> canUseWireless = val)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> warningReceived, val -> warningReceived = val)) .widget(new ButtonWidget().setOnClick((clickData, widget) -> { if (mMachine && wireless_mode && canUseWireless && !balanced) { counter = rebalance(); @@ -1370,6 +1398,99 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont .setEnabled((widget) -> wireless_mode && canUseWireless && !balanced) .addTooltip(StatCollector.translateToLocal("gui.kekztech_lapotronicenergyunit.wireless_rebalance")) .setTooltipShowUpDelay(TOOLTIP_DELAY)); + + builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { + if (!widget.isClient()) { + widget.getContext() + .openSyncedWindow(DEBUG_POWER_WINDOW_ID); + } + }) + .setPlayClickSound(true) + .setBackground(() -> { + List ret = new ArrayList<>(); + ret.add(GTUITextures.BUTTON_STANDARD); + ret.add(GTUITextures.OVERLAY_BUTTON_EMIT_ENERGY); + return ret.toArray(new IDrawable[0]); + }) + .addTooltip(translateToLocal("GT5U.multiblock.energy")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setEnabled($ -> buildContext.getPlayer().capabilities.isCreativeMode) + .setPos(174, 112) + .setSize(16, 16)); + } + + protected ModularWindow createPowerWindow(final EntityPlayer player) { + final int WIDTH = 158; + final int HEIGHT = 52; + final int PARENT_WIDTH = getGUIWidth(); + final int PARENT_HEIGHT = getGUIHeight(); + ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setGuiTint(getGUIColorization()); + builder.setDraggable(true); + builder.setPos( + (size, window) -> Alignment.Center.getAlignedPos(size, new Size(PARENT_WIDTH, PARENT_HEIGHT)) + .add( + Alignment.BottomRight.getAlignedPos(new Size(PARENT_WIDTH, PARENT_HEIGHT), new Size(WIDTH, HEIGHT)) + .add(WIDTH - 3, 0) + .subtract(0, 10))); + builder.widget( + TextWidget.localised("GT5U.multiblock.energy") + .setPos(3, 4) + .setSize(150, 20)) + .widget( + new NumericWidget().setSetter( + val -> stored = BigDecimal.valueOf(val) + .toBigInteger()) + .setGetter(() -> stored.doubleValue()) + .setIntegerOnly(false) + .setBounds(0, capacity.doubleValue()) + .setDefaultValue(stored.doubleValue()) + .setTextAlignment(Alignment.Center) + .setTextColor(Color.WHITE.normal) + .setSize(150, 18) + .setPos(4, 25) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD) + .attachSyncer( + new FakeSyncWidget.DoubleSyncer( + () -> capacity.doubleValue(), + (val) -> capacity = BigDecimal.valueOf(val) + .toBigInteger()), + builder) + .attachSyncer( + new FakeSyncWidget.DoubleSyncer( + () -> stored.doubleValue(), + (val) -> stored = BigDecimal.valueOf(val) + .toBigInteger()), + builder)); + return builder.build(); + } + + protected ModularWindow createWarningWindow(final EntityPlayer player) { + final int WIDTH = 180; + final int HEIGHT = 75; + ModularWindow.Builder builder = ModularWindow.builder(WIDTH, HEIGHT); + builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); + builder.setGuiTint(getGUIColorization()); + builder.setDraggable(true); + builder + .widget( + new TextWidget( + EnumChatFormatting.BOLD + translateToLocal("gui.kekztech_lapotronicenergyunit.warning.header")) + .setDefaultColor(0xff0000) + .setScale(1.2f) + .setTextAlignment(Alignment.Center) + .setPos(0, 7) + .setSize(180, 15)) + .widget( + TextWidget.localised("gui.kekztech_lapotronicenergyunit.warning.text") + .setTextAlignment(Alignment.CenterLeft) + .setPos(5, 20) + .setSize(170, 50)); + builder.widget( + ButtonWidget.closeWindowButton(true) + .setPos(164, 4)); + return builder.build(); } private enum LSCHatchElement implements IHatchElement { diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang index 4c41a9ecfac..732177ddb04 100644 --- a/src/main/resources/assets/kekztech/lang/en_US.lang +++ b/src/main/resources/assets/kekztech/lang/en_US.lang @@ -113,3 +113,5 @@ achievement.tile.kekztech_lapotronicenergyunit_block.10=Mega Ultimate Capacitor # -------- GUI gui.kekztech_lapotronicenergyunit.wireless=Wireless mode gui.kekztech_lapotronicenergyunit.wireless_rebalance=Rebalance Wireless (One Time Use) +gui.kekztech_lapotronicenergyunit.warning.header=Warning! +gui.kekztech_lapotronicenergyunit.warning.text=Make sure to carefully read and understand the tooltip before activating wireless mode, it can potentially brick your base. This warning won't appear again. From b41b94b1129305c31adc12e2b39a1a86d5e19334 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 13:02:05 +0100 Subject: [PATCH 11/15] update --- dependencies.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index fb4972f50ad..43964d60f9a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,14 +36,14 @@ dependencies { api("com.github.GTNewHorizons:StructureLib:1.4.2:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev") api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") - api("com.github.GTNewHorizons:GTNHLib:0.6.1:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") api("com.github.GTNewHorizons:ModularUI:1.2.17:dev") api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.2:dev") api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-521-GTNH:dev") - api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.21-gtnh:dev") + api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.22-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') api("com.github.GTNewHorizons:Postea:1.0.13:dev") @@ -64,7 +64,7 @@ dependencies { compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.2:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.11.0-GTNH:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.16.2:dev") { transitive = false } + compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.16.3:dev") { transitive = false } compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false} compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.2:dev") { transitive = false } @@ -72,16 +72,16 @@ dependencies { compileOnly('com.github.GTNewHorizons:VisualProspecting:1.4.0:dev') { transitive = false } compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.106-GTNH:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false } - implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") + compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false } + implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") - compileOnly("com.github.GTNewHorizons:Chisel:2.16.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.3.0:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } implementation("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev") - compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150') From a10cfa7c06ea09185d90a82930c22fbd2c6859e2 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:49:50 +0100 Subject: [PATCH 12/15] Remove multi-ingot (#3815) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../bartworks/system/material/Werkstoff.java | 5 - .../system/material/WerkstoffLoader.java | 10 +- .../java/goodgenerator/util/MaterialFix.java | 43 +------- .../java/gregtech/api/enums/OrePrefixes.java | 43 +------- .../java/gregtech/api/enums/TextureSet.java | 28 ++--- .../common/items/MetaGeneratedItem01.java | 8 +- .../oreprocessing/ProcessingIngot.java | 104 ------------------ .../gregtech/loaders/preload/GTPreLoad.java | 25 ++--- .../CUSTOM/Livingrock/ingotDouble.png | Bin 696 -> 0 bytes .../CUSTOM/Livingrock/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingrock/ingotQuadruple.png | Bin 799 -> 0 bytes .../Livingrock/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingrock/ingotQuintuple.png | Bin 812 -> 0 bytes .../Livingrock/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingrock/ingotTriple.png | Bin 741 -> 0 bytes .../CUSTOM/Livingrock/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingwood/ingotDouble.png | Bin 1487 -> 0 bytes .../CUSTOM/Livingwood/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingwood/ingotQuadruple.png | Bin 1541 -> 0 bytes .../Livingwood/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingwood/ingotQuintuple.png | Bin 1541 -> 0 bytes .../Livingwood/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/Livingwood/ingotTriple.png | Bin 1512 -> 0 bytes .../CUSTOM/Livingwood/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/WhiteDwarfMatter/ingotDouble.png | Bin 5215 -> 0 bytes .../WhiteDwarfMatter/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../WhiteDwarfMatter/ingotQuadruple.png | Bin 5240 -> 0 bytes .../ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../WhiteDwarfMatter/ingotQuintuple.png | Bin 5265 -> 0 bytes .../ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/WhiteDwarfMatter/ingotTriple.png | Bin 5229 -> 0 bytes .../WhiteDwarfMatter/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/bedrockium/ingotDouble.png | Bin 561 -> 0 bytes .../CUSTOM/bedrockium/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/bedrockium/ingotQuadruple.png | Bin 518 -> 0 bytes .../bedrockium/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/bedrockium/ingotQuintuple.png | Bin 471 -> 0 bytes .../bedrockium/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/bedrockium/ingotTriple.png | Bin 533 -> 0 bytes .../CUSTOM/bedrockium/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/eternity/ingotDouble.png | Bin 11176 -> 0 bytes .../CUSTOM/eternity/ingotDouble.png.mcmeta | 1 - .../CUSTOM/eternity/ingotDouble_OVERLAY.png | Bin 1986 -> 0 bytes .../CUSTOM/eternity/ingotQuadruple.png | Bin 12938 -> 0 bytes .../CUSTOM/eternity/ingotQuadruple.png.mcmeta | 1 - .../eternity/ingotQuadruple_OVERLAY.png | Bin 1997 -> 0 bytes .../CUSTOM/eternity/ingotQuintuple.png | Bin 13526 -> 0 bytes .../CUSTOM/eternity/ingotQuintuple.png.mcmeta | 1 - .../eternity/ingotQuintuple_OVERLAY.png | Bin 1986 -> 0 bytes .../CUSTOM/eternity/ingotTriple.png | Bin 11952 -> 0 bytes .../CUSTOM/eternity/ingotTriple.png.mcmeta | 1 - .../CUSTOM/eternity/ingotTriple_OVERLAY.png | Bin 1990 -> 0 bytes .../CUSTOM/hotexohalkonite/ingotDouble.png | Bin 19607 -> 0 bytes .../hotexohalkonite/ingotDouble.png.mcmeta | 1 - .../hotexohalkonite/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/hotexohalkonite/ingotQuadruple.png | Bin 22175 -> 0 bytes .../hotexohalkonite/ingotQuadruple.png.mcmeta | 1 - .../ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/hotexohalkonite/ingotQuintuple.png | Bin 24185 -> 0 bytes .../hotexohalkonite/ingotQuintuple.png.mcmeta | 1 - .../ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/hotexohalkonite/ingotTriple.png | Bin 21013 -> 0 bytes .../hotexohalkonite/ingotTriple.png.mcmeta | 1 - .../hotexohalkonite/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/infinity/ingotDouble.png | Bin 5389 -> 0 bytes .../CUSTOM/infinity/ingotDouble.png.mcmeta | 1 - .../CUSTOM/infinity/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/infinity/ingotQuadruple.png | Bin 6263 -> 0 bytes .../CUSTOM/infinity/ingotQuadruple.png.mcmeta | 1 - .../infinity/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/infinity/ingotQuintuple.png | Bin 6404 -> 0 bytes .../CUSTOM/infinity/ingotQuintuple.png.mcmeta | 1 - .../infinity/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/infinity/ingotTriple.png | Bin 5727 -> 0 bytes .../CUSTOM/infinity/ingotTriple.png.mcmeta | 1 - .../CUSTOM/infinity/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/magmatter/ingotDouble.png | Bin 4130 -> 0 bytes .../CUSTOM/magmatter/ingotDouble.png.mcmeta | 1 - .../CUSTOM/magmatter/ingotDouble_OVERLAY.png | Bin 1986 -> 0 bytes .../CUSTOM/magmatter/ingotQuadruple.png | Bin 4651 -> 0 bytes .../magmatter/ingotQuadruple.png.mcmeta | 1 - .../magmatter/ingotQuadruple_OVERLAY.png | Bin 1997 -> 0 bytes .../CUSTOM/magmatter/ingotQuintuple.png | Bin 4801 -> 0 bytes .../magmatter/ingotQuintuple.png.mcmeta | 1 - .../magmatter/ingotQuintuple_OVERLAY.png | Bin 1986 -> 0 bytes .../CUSTOM/magmatter/ingotTriple.png | Bin 4358 -> 0 bytes .../CUSTOM/magmatter/ingotTriple.png.mcmeta | 1 - .../CUSTOM/magmatter/ingotTriple_OVERLAY.png | Bin 1990 -> 0 bytes .../CUSTOM/spacetime/ingotDouble.png | Bin 36573 -> 0 bytes .../CUSTOM/spacetime/ingotDouble.png.mcmeta | 1 - .../CUSTOM/spacetime/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/spacetime/ingotQuadruple.png | Bin 43580 -> 0 bytes .../spacetime/ingotQuadruple.png.mcmeta | 1 - .../spacetime/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/spacetime/ingotQuintuple.png | Bin 44631 -> 0 bytes .../spacetime/ingotQuintuple.png.mcmeta | 1 - .../spacetime/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/spacetime/ingotTriple.png | Bin 39647 -> 0 bytes .../CUSTOM/spacetime/ingotTriple.png.mcmeta | 1 - .../CUSTOM/spacetime/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../CUSTOM/universium/ingotDouble.png | Bin 699 -> 0 bytes .../CUSTOM/universium/ingotDouble.png.mcmeta | 1 - .../CUSTOM/universium/ingotDouble_OVERLAY.png | Bin 143 -> 0 bytes .../CUSTOM/universium/ingotQuadruple.png | Bin 673 -> 0 bytes .../universium/ingotQuadruple.png.mcmeta | 1 - .../universium/ingotQuadruple_OVERLAY.png | Bin 143 -> 0 bytes .../CUSTOM/universium/ingotQuintuple.png | Bin 662 -> 0 bytes .../universium/ingotQuintuple.png.mcmeta | 1 - .../universium/ingotQuintuple_OVERLAY.png | Bin 143 -> 0 bytes .../CUSTOM/universium/ingotTriple.png | Bin 687 -> 0 bytes .../CUSTOM/universium/ingotTriple.png.mcmeta | 1 - .../CUSTOM/universium/ingotTriple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/DIAMOND/ingotDouble.png | Bin 283 -> 0 bytes .../DIAMOND/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/DIAMOND/ingotQuadruple.png | Bin 273 -> 0 bytes .../DIAMOND/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/DIAMOND/ingotQuintuple.png | Bin 267 -> 0 bytes .../DIAMOND/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/DIAMOND/ingotTriple.png | Bin 284 -> 0 bytes .../DIAMOND/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/DULL/ingotDouble.png | Bin 734 -> 0 bytes .../DULL/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/DULL/ingotQuadruple.png | Bin 728 -> 0 bytes .../DULL/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/DULL/ingotQuintuple.png | Bin 1136 -> 0 bytes .../DULL/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/DULL/ingotTriple.png | Bin 734 -> 0 bytes .../DULL/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/EMERALD/ingotDouble.png | Bin 283 -> 0 bytes .../EMERALD/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/EMERALD/ingotQuadruple.png | Bin 273 -> 0 bytes .../EMERALD/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/EMERALD/ingotQuintuple.png | Bin 267 -> 0 bytes .../EMERALD/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/EMERALD/ingotTriple.png | Bin 284 -> 0 bytes .../EMERALD/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/ENRICHED/ingotDouble.png | Bin 403 -> 0 bytes .../ENRICHED/ingotDouble_OVERLAY.png | Bin 419 -> 0 bytes .../materialicons/ENRICHED/ingotQuadruple.png | Bin 375 -> 0 bytes .../ENRICHED/ingotQuadruple_OVERLAY.png | Bin 379 -> 0 bytes .../materialicons/ENRICHED/ingotQuintuple.png | Bin 358 -> 0 bytes .../ENRICHED/ingotQuintuple_OVERLAY.png | Bin 362 -> 0 bytes .../materialicons/ENRICHED/ingotTriple.png | Bin 388 -> 0 bytes .../ENRICHED/ingotTriple_OVERLAY.png | Bin 395 -> 0 bytes .../items/materialicons/FIERY/ingotDouble.png | Bin 283 -> 0 bytes .../FIERY/ingotDouble_OVERLAY.png | Bin 419 -> 0 bytes .../materialicons/FIERY/ingotQuadruple.png | Bin 273 -> 0 bytes .../FIERY/ingotQuadruple_OVERLAY.png | Bin 279 -> 0 bytes .../materialicons/FIERY/ingotQuintuple.png | Bin 267 -> 0 bytes .../FIERY/ingotQuintuple_OVERLAY.png | Bin 271 -> 0 bytes .../items/materialicons/FIERY/ingotTriple.png | Bin 284 -> 0 bytes .../FIERY/ingotTriple_OVERLAY.png | Bin 290 -> 0 bytes .../items/materialicons/FINE/ingotDouble.png | Bin 283 -> 0 bytes .../FINE/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FINE/ingotQuadruple.png | Bin 273 -> 0 bytes .../FINE/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FINE/ingotQuintuple.png | Bin 267 -> 0 bytes .../FINE/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/FINE/ingotTriple.png | Bin 284 -> 0 bytes .../FINE/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/FLINT/ingotDouble.png | Bin 283 -> 0 bytes .../FLINT/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FLINT/ingotQuadruple.png | Bin 273 -> 0 bytes .../FLINT/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FLINT/ingotQuintuple.png | Bin 267 -> 0 bytes .../FLINT/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/FLINT/ingotTriple.png | Bin 284 -> 0 bytes .../FLINT/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/FLUID/ingotDouble.png | Bin 283 -> 0 bytes .../FLUID/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FLUID/ingotQuadruple.png | Bin 273 -> 0 bytes .../FLUID/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/FLUID/ingotQuintuple.png | Bin 267 -> 0 bytes .../FLUID/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/FLUID/ingotTriple.png | Bin 284 -> 0 bytes .../FLUID/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/GEM_A/ingotDouble.png | Bin 403 -> 0 bytes .../GEM_A/ingotDouble_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/GEM_A/ingotQuadruple.png | Bin 375 -> 0 bytes .../GEM_A/ingotQuadruple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/GEM_A/ingotQuintuple.png | Bin 358 -> 0 bytes .../GEM_A/ingotQuintuple_OVERLAY.png | Bin 143 -> 0 bytes .../items/materialicons/GEM_A/ingotTriple.png | Bin 388 -> 0 bytes .../GEM_A/ingotTriple_OVERLAY.png | Bin 143 -> 0 bytes .../GEM_HORIZONTAL/ingotDouble.png | Bin 283 -> 0 bytes .../GEM_HORIZONTAL/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_HORIZONTAL/ingotQuadruple.png | Bin 273 -> 0 bytes .../GEM_HORIZONTAL/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_HORIZONTAL/ingotQuintuple.png | Bin 267 -> 0 bytes .../GEM_HORIZONTAL/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_HORIZONTAL/ingotTriple.png | Bin 284 -> 0 bytes .../GEM_HORIZONTAL/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_VERTICAL/ingotDouble.png | Bin 283 -> 0 bytes .../GEM_VERTICAL/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_VERTICAL/ingotQuadruple.png | Bin 273 -> 0 bytes .../GEM_VERTICAL/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_VERTICAL/ingotQuintuple.png | Bin 267 -> 0 bytes .../GEM_VERTICAL/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../GEM_VERTICAL/ingotTriple.png | Bin 284 -> 0 bytes .../GEM_VERTICAL/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/GLASS/ingotDouble.png | Bin 283 -> 0 bytes .../GLASS/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/GLASS/ingotQuadruple.png | Bin 273 -> 0 bytes .../GLASS/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/GLASS/ingotQuintuple.png | Bin 267 -> 0 bytes .../GLASS/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/GLASS/ingotTriple.png | Bin 284 -> 0 bytes .../GLASS/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/LAPIS/ingotDouble.png | Bin 283 -> 0 bytes .../LAPIS/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LAPIS/ingotQuadruple.png | Bin 273 -> 0 bytes .../LAPIS/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LAPIS/ingotQuintuple.png | Bin 267 -> 0 bytes .../LAPIS/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/LAPIS/ingotTriple.png | Bin 284 -> 0 bytes .../LAPIS/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/LEAF/ingotDouble.png | Bin 283 -> 0 bytes .../LEAF/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LEAF/ingotQuadruple.png | Bin 273 -> 0 bytes .../LEAF/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LEAF/ingotQuintuple.png | Bin 267 -> 0 bytes .../LEAF/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/LEAF/ingotTriple.png | Bin 284 -> 0 bytes .../LEAF/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LIGNITE/ingotDouble.png | Bin 283 -> 0 bytes .../LIGNITE/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LIGNITE/ingotQuadruple.png | Bin 273 -> 0 bytes .../LIGNITE/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LIGNITE/ingotQuintuple.png | Bin 267 -> 0 bytes .../LIGNITE/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/LIGNITE/ingotTriple.png | Bin 284 -> 0 bytes .../LIGNITE/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/MAGNETIC/ingotDouble.png | Bin 283 -> 0 bytes .../MAGNETIC/ingotDouble_OVERLAY.png | Bin 254 -> 0 bytes .../materialicons/MAGNETIC/ingotQuadruple.png | Bin 273 -> 0 bytes .../MAGNETIC/ingotQuadruple_OVERLAY.png | Bin 245 -> 0 bytes .../materialicons/MAGNETIC/ingotQuintuple.png | Bin 267 -> 0 bytes .../MAGNETIC/ingotQuintuple_OVERLAY.png | Bin 245 -> 0 bytes .../materialicons/MAGNETIC/ingotTriple.png | Bin 284 -> 0 bytes .../MAGNETIC/ingotTriple_OVERLAY.png | Bin 245 -> 0 bytes .../materialicons/METALLIC/ingotDouble.png | Bin 283 -> 0 bytes .../METALLIC/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/METALLIC/ingotQuadruple.png | Bin 750 -> 0 bytes .../METALLIC/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/METALLIC/ingotQuintuple.png | Bin 742 -> 0 bytes .../METALLIC/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/METALLIC/ingotTriple.png | Bin 755 -> 0 bytes .../METALLIC/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/NETHERSTAR/ingotDouble.png | Bin 283 -> 0 bytes .../NETHERSTAR/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../NETHERSTAR/ingotQuadruple.png | Bin 273 -> 0 bytes .../NETHERSTAR/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../NETHERSTAR/ingotQuintuple.png | Bin 267 -> 0 bytes .../NETHERSTAR/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/NETHERSTAR/ingotTriple.png | Bin 284 -> 0 bytes .../NETHERSTAR/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/NONE/ingotDouble.png | Bin 283 -> 0 bytes .../NONE/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/NONE/ingotQuadruple.png | Bin 273 -> 0 bytes .../NONE/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/NONE/ingotQuintuple.png | Bin 267 -> 0 bytes .../NONE/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/NONE/ingotTriple.png | Bin 284 -> 0 bytes .../NONE/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../NUCLEAR/Fiery/ingotDouble_OVERLAY.png | Bin 419 -> 0 bytes .../NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png | Bin 379 -> 0 bytes .../NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png | Bin 362 -> 0 bytes .../NUCLEAR/Fiery/ingotTriple_OVERLAY.png | Bin 395 -> 0 bytes .../materialicons/NUCLEAR/ingotDouble.png | Bin 403 -> 0 bytes .../NUCLEAR/ingotDouble_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/NUCLEAR/ingotQuadruple.png | Bin 375 -> 0 bytes .../NUCLEAR/ingotQuadruple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/NUCLEAR/ingotQuintuple.png | Bin 358 -> 0 bytes .../NUCLEAR/ingotQuintuple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/NUCLEAR/ingotTriple.png | Bin 388 -> 0 bytes .../NUCLEAR/ingotTriple_OVERLAY.png | Bin 143 -> 0 bytes .../items/materialicons/OPAL/ingotDouble.png | Bin 283 -> 0 bytes .../OPAL/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/OPAL/ingotQuadruple.png | Bin 273 -> 0 bytes .../OPAL/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/OPAL/ingotQuintuple.png | Bin 267 -> 0 bytes .../OPAL/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/OPAL/ingotTriple.png | Bin 284 -> 0 bytes .../OPAL/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/PAPER/ingotDouble.png | Bin 283 -> 0 bytes .../PAPER/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/PAPER/ingotQuadruple.png | Bin 273 -> 0 bytes .../PAPER/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/PAPER/ingotQuintuple.png | Bin 267 -> 0 bytes .../PAPER/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/PAPER/ingotTriple.png | Bin 284 -> 0 bytes .../PAPER/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/POWDER/ingotDouble.png | Bin 283 -> 0 bytes .../POWDER/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/POWDER/ingotQuadruple.png | Bin 273 -> 0 bytes .../POWDER/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/POWDER/ingotQuintuple.png | Bin 267 -> 0 bytes .../POWDER/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/POWDER/ingotTriple.png | Bin 284 -> 0 bytes .../POWDER/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/QUARTZ/ingotDouble.png | Bin 283 -> 0 bytes .../QUARTZ/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/QUARTZ/ingotQuadruple.png | Bin 273 -> 0 bytes .../QUARTZ/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/QUARTZ/ingotQuintuple.png | Bin 267 -> 0 bytes .../QUARTZ/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/QUARTZ/ingotTriple.png | Bin 284 -> 0 bytes .../QUARTZ/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/REFINED/ingotDouble.png | Bin 403 -> 0 bytes .../REFINED/ingotDouble_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/REFINED/ingotQuadruple.png | Bin 375 -> 0 bytes .../REFINED/ingotQuadruple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/REFINED/ingotQuintuple.png | Bin 358 -> 0 bytes .../REFINED/ingotQuintuple_OVERLAY.png | Bin 143 -> 0 bytes .../materialicons/REFINED/ingotTriple.png | Bin 388 -> 0 bytes .../REFINED/ingotTriple_OVERLAY.png | Bin 143 -> 0 bytes .../items/materialicons/ROUGH/ingotDouble.png | Bin 283 -> 0 bytes .../ROUGH/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/ROUGH/ingotQuadruple.png | Bin 273 -> 0 bytes .../ROUGH/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/ROUGH/ingotQuintuple.png | Bin 267 -> 0 bytes .../ROUGH/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/ROUGH/ingotTriple.png | Bin 284 -> 0 bytes .../ROUGH/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/RUBY/ingotDouble.png | Bin 283 -> 0 bytes .../RUBY/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/RUBY/ingotQuadruple.png | Bin 273 -> 0 bytes .../RUBY/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/RUBY/ingotQuintuple.png | Bin 267 -> 0 bytes .../RUBY/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/RUBY/ingotTriple.png | Bin 284 -> 0 bytes .../RUBY/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/SAND/ingotDouble.png | Bin 283 -> 0 bytes .../SAND/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SAND/ingotQuadruple.png | Bin 273 -> 0 bytes .../SAND/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SAND/ingotQuintuple.png | Bin 267 -> 0 bytes .../SAND/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/SAND/ingotTriple.png | Bin 284 -> 0 bytes .../SAND/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHARDS/ingotDouble.png | Bin 283 -> 0 bytes .../SHARDS/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHARDS/ingotQuadruple.png | Bin 273 -> 0 bytes .../SHARDS/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHARDS/ingotQuintuple.png | Bin 267 -> 0 bytes .../SHARDS/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHARDS/ingotTriple.png | Bin 284 -> 0 bytes .../SHARDS/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/SHINY/ingotDouble.png | Bin 283 -> 0 bytes .../SHINY/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHINY/ingotQuadruple.png | Bin 273 -> 0 bytes .../SHINY/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/SHINY/ingotQuintuple.png | Bin 267 -> 0 bytes .../SHINY/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/SHINY/ingotTriple.png | Bin 284 -> 0 bytes .../SHINY/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/WOOD/ingotDouble.png | Bin 283 -> 0 bytes .../WOOD/ingotDouble_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/WOOD/ingotQuadruple.png | Bin 273 -> 0 bytes .../WOOD/ingotQuadruple_OVERLAY.png | Bin 141 -> 0 bytes .../materialicons/WOOD/ingotQuintuple.png | Bin 267 -> 0 bytes .../WOOD/ingotQuintuple_OVERLAY.png | Bin 141 -> 0 bytes .../items/materialicons/WOOD/ingotTriple.png | Bin 284 -> 0 bytes .../WOOD/ingotTriple_OVERLAY.png | Bin 141 -> 0 bytes 364 files changed, 35 insertions(+), 255 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotTriple.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotTriple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuadruple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuadruple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple_OVERLAY.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotTriple.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotTriple_OVERLAY.png diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java index 5ae7136934e..85e31fc20ae 100644 --- a/src/main/java/bartworks/system/material/Werkstoff.java +++ b/src/main/java/bartworks/system/material/Werkstoff.java @@ -763,11 +763,6 @@ public static void initPrefixLogic() { Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuadruple, 0x200); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuintuple, 0x200); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateDense, 0x200); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotDouble, 0x200); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotTriple, 0x200); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuadruple, 0x200); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.ingotQuintuple, 0x200); - Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasing, 0x380); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasingAdvanced, 0x380); } diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index cc3fdd749e5..e25402c57cb 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -40,11 +40,7 @@ import static gregtech.api.enums.OrePrefixes.gemFlawed; import static gregtech.api.enums.OrePrefixes.gemFlawless; import static gregtech.api.enums.OrePrefixes.ingot; -import static gregtech.api.enums.OrePrefixes.ingotDouble; import static gregtech.api.enums.OrePrefixes.ingotHot; -import static gregtech.api.enums.OrePrefixes.ingotQuadruple; -import static gregtech.api.enums.OrePrefixes.ingotQuintuple; -import static gregtech.api.enums.OrePrefixes.ingotTriple; import static gregtech.api.enums.OrePrefixes.lens; import static gregtech.api.enums.OrePrefixes.nugget; import static gregtech.api.enums.OrePrefixes.ore; @@ -1976,11 +1972,7 @@ private static void addItemsForGeneration() { WerkstoffLoader.items.put(plateTriple, new BWMetaGeneratedItems(plateTriple)); WerkstoffLoader.items.put(plateQuadruple, new BWMetaGeneratedItems(plateQuadruple)); WerkstoffLoader.items.put(plateQuintuple, new BWMetaGeneratedItems(plateQuintuple)); - WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense)); - WerkstoffLoader.items.put(ingotDouble, new BWMetaGeneratedItems(ingotDouble)); - WerkstoffLoader.items.put(ingotTriple, new BWMetaGeneratedItems(ingotTriple)); - WerkstoffLoader.items.put(ingotQuadruple, new BWMetaGeneratedItems(ingotQuadruple)); - WerkstoffLoader.items.put(ingotQuintuple, new BWMetaGeneratedItems(ingotQuintuple)); + WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense));; } ENABLED_ORE_PREFIXES.addAll(WerkstoffLoader.items.keySet()); ENABLED_ORE_PREFIXES.add(ore); diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index cfcb9f69499..dcac7ae43d6 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -135,7 +135,7 @@ public static void MaterialFluidExtractionFix(Werkstoff material) { public static void addRecipeForMultiItems() { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; - if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { + if (tMaterial.hasItemType(OrePrefixes.plateDouble)) { GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) @@ -146,24 +146,11 @@ public static void addRecipeForMultiItems() { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GTValues.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass(), - 1L) * TICKS) - .eut(TierEU.RECIPE_MV / 2) - .addTo(benderRecipes); GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); - GTModHandler.addCraftingRecipe( - tMaterial.get(OrePrefixes.ingotDouble, 1), - new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } - if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { + if (tMaterial.hasItemType(OrePrefixes.plateTriple)) { GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) @@ -184,24 +171,10 @@ public static void addRecipeForMultiItems() { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GTValues.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass(), - 1L) * TICKS) - .eut(TierEU.RECIPE_MV / 2) - .addTo(benderRecipes); GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', tMaterial.get(OrePrefixes.plateDouble, 1) }); - GTModHandler.addCraftingRecipe( - tMaterial.get(OrePrefixes.ingotTriple, 1), - new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B', - tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { GTValues.RA.stdBuilder() @@ -225,7 +198,7 @@ public static void addRecipeForMultiItems() { .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { + if (tMaterial.hasItemType(OrePrefixes.plateTriple)) { GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) @@ -236,16 +209,6 @@ public static void addRecipeForMultiItems() { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GTValues.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GTUtility.getIntegratedCircuit(3)) - .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) - .duration( - Math.max( - tMaterial.getStats() - .getMass() * 3, - 1L) * TICKS) - .eut(TierEU.RECIPE_MV / 2) - .addTo(benderRecipes); } } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 81259da9bfd..f5886e03b9e 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -101,18 +101,6 @@ public enum OrePrefixes { 64, -1), dirtyGravel("Dirty Gravels", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, -1), - /** A quintuple Ingot. */ - ingotQuintuple("5x Ingots", "Quintuple ", " Ingot", true, true, false, false, false, false, true, true, false, - false, B[1], M * 5, 64, 16), - /** A quadruple Ingot. */ - ingotQuadruple("4x Ingots", "Quadruple ", " Ingot", true, true, false, false, false, false, true, true, false, - false, B[1], M * 4, 64, 15), - /** A triple Ingot. */ - ingotTriple("3x Ingots", "Triple ", " Ingot", true, true, false, false, false, false, true, false, false, false, - B[1], M * 3, 64, 14), - /** A double Ingot. Introduced by TerraFirmaCraft */ - ingotDouble("2x Ingots", "Double ", " Ingot", true, true, false, false, false, false, true, true, false, false, - B[1], M * 2, 64, 13), /** A hot Ingot, which has to be cooled down by a Vacuum Freezer. */ ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 12), @@ -688,10 +676,6 @@ public enum OrePrefixes { plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); - ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dust.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); @@ -700,11 +684,7 @@ public enum OrePrefixes { plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); - ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite);; turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); @@ -718,10 +698,6 @@ public enum OrePrefixes { plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); - ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); @@ -736,10 +712,6 @@ public enum OrePrefixes { plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); - ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); @@ -754,10 +726,6 @@ public enum OrePrefixes { plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); cell.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); - ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); dust.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); @@ -977,11 +945,6 @@ public enum OrePrefixes { plateDense.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); plateSuperdense.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); - ingotDouble.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); - ingotTriple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); - ingotQuadruple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); - ingotQuintuple.mCondition = new ICondition.Or<>(new ICondition.Not<>(SubTag.NO_SMASHING), SubTag.STRETCHY); - wireFine.mCondition = SubTag.METAL; // ----- @@ -1058,10 +1021,6 @@ public enum OrePrefixes { Arrays.asList( OrePrefixes.gem, OrePrefixes.ingotHot, - OrePrefixes.ingotDouble, - OrePrefixes.ingotTriple, - OrePrefixes.ingotQuadruple, - OrePrefixes.ingotQuintuple, OrePrefixes.plate, OrePrefixes.plateDouble, OrePrefixes.plateTriple, diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 7abb799e210..f7e7453655b 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -32,22 +32,22 @@ public class TextureSet { TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, }; private static final String[] SUFFIXES = new String[] { "/dustTiny", "/dustSmall", "/dust", "/dustImpure", "/dustPure", "/crushed", "/crushedPurified", "/crushedCentrifuged", "/gem", "/nugget", "/casingSmall", "/ingot", - "/ingotHot", "/ingotDouble", "/ingotTriple", "/ingotQuadruple", "/ingotQuintuple", "/plate", "/plateDouble", - "/plateTriple", "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt", - "/screw", "/ring", "/foil", "/cell", "/cellPlasma", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", "/toolHeadChainsaw", - "/toolHeadWrench", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/toolHeadScrewdriver", - "/toolHeadBuzzSaw", "/toolHeadSoldering", "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong", - "/springSmall", "/spring", "/arrowGtWood", "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless", - "/gemExquisite", "/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil", - "/block1", "/block2", "/block3", "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall", - "/pipeMedium", "/pipeLarge", "/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, "/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir, + "/ingotHot", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/plate", "/plateDouble", "/plateTriple", + "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt", "/screw", "/ring", + "/foil", "/cell", "/cellPlasma", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", "/toolHeadChainsaw", "/toolHeadWrench", + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/toolHeadScrewdriver", "/toolHeadBuzzSaw", + "/toolHeadSoldering", "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong", "/springSmall", + "/spring", "/arrowGtWood", "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless", "/gemExquisite", + "/gearGt", "/oreRaw", aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil", "/block1", "/block2", + "/block3", "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall", "/pipeMedium", "/pipeLarge", + "/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir, aTextVoidDir, aTextVoidDir, + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + "/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - "/plateSuperdense", "/handleMallet", "/toolHeadMallet", }; + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/plateSuperdense", + "/handleMallet", "/toolHeadMallet", }; public boolean is_custom = false; diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java index 56980e26951..22967eaf7a0 100644 --- a/src/main/java/gregtech/common/items/MetaGeneratedItem01.java +++ b/src/main/java/gregtech/common/items/MetaGeneratedItem01.java @@ -584,10 +584,10 @@ public MetaGeneratedItem01() { null, OrePrefixes.ingot, OrePrefixes.ingotHot, - OrePrefixes.ingotDouble, - OrePrefixes.ingotTriple, - OrePrefixes.ingotQuadruple, - OrePrefixes.ingotQuintuple, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, + OrePrefixes.___placeholder___, OrePrefixes.plate, OrePrefixes.plateDouble, OrePrefixes.plateTriple, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index e937f3f6a5d..b830f33d994 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -30,10 +30,6 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist public ProcessingIngot() { OrePrefixes.ingot.add(this); - OrePrefixes.ingotDouble.add(this); - OrePrefixes.ingotTriple.add(this); - OrePrefixes.ingotQuadruple.add(this); - OrePrefixes.ingotQuintuple.add(this); OrePrefixes.ingotHot.add(this); } @@ -189,106 +185,6 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic } } } - case ingotDouble -> { - if (!aNoSmashing || aStretchy) { - // bender recipes - { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDouble, aMaterial, 1L)) - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .duration(Math.max(aMaterialMass * 2L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - } - - // Enable crafting with hammer if tier is < IV. - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GTModHandler.addCraftingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), - GTProxy.tBits, - new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); - } - } - } - case ingotTriple -> { - if (!aNoSmashing || aStretchy) { - // Bender recipes - { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, aMaterial, 1L)) - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(3, aStack), GTUtility.getIntegratedCircuit(3)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) - .duration(Math.max(aMaterialMass * 3L, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - } - - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GTModHandler.addCraftingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), - GTProxy.tBits, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); - } - } - } - case ingotQuadruple -> { - if (!aNoSmashing || aStretchy) { - // Bender recipes - { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - } - - // If tier < IV add manual crafting. - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GTModHandler.addCraftingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), - GTProxy.tBits, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); - } - } - } - case ingotQuintuple -> { - if (!aNoSmashing || aStretchy) { - // Bender recipes - { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L)) - .duration(Math.max(aMaterialMass, 1L)) - .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(benderRecipes); - } - - // Crafting recipes - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { - GTModHandler.addCraftingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), - GTProxy.tBits, - new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', - OrePrefixes.ingot.get(aMaterial) }); - } - } - } case ingotHot -> { if (aMaterial.mAutoGenerateVacuumFreezerRecipes && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { diff --git a/src/main/java/gregtech/loaders/preload/GTPreLoad.java b/src/main/java/gregtech/loaders/preload/GTPreLoad.java index f884ddcfecc..d517e1313ba 100644 --- a/src/main/java/gregtech/loaders/preload/GTPreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GTPreLoad.java @@ -231,10 +231,10 @@ public static void runMineTweakerCompat() { String[] tags = new String[] {}; if (mIt == 1) tags = new String[] { "dustTiny", "dustSmall", "dust", "dustImpure", "dustPure", "crushed", "crushedPurified", "crushedCentrifuged", "gem", "nugget", - null, "ingot", "ingotHot", "ingotDouble", "ingotTriple", "ingotQuadruple", - "ingotQuintuple", "plate", "plateDouble", "plateTriple", "plateQuadruple", - "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", "ring", - "foil", "cell", "cellPlasma", "cellMolten", "rawOre", "plateSuperdense" }; + null, "ingot", "ingotHot", null, null, null, null, "plate", "plateDouble", + "plateTriple", "plateQuadruple", "plateQuintuple", "plateDense", "stick", "lens", + "round", "bolt", "screw", "ring", "foil", "cell", "cellPlasma", "cellMolten", + "rawOre", "plateSuperdense" }; if (mIt == 2) tags = new String[] { "toolHeadSword", "toolHeadPickaxe", "toolHeadShovel", "toolHeadAxe", "toolHeadHoe", "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", "toolHeadWrench", @@ -258,15 +258,14 @@ public static void runMineTweakerCompat() { } final String[] preS = new String[] { "dustTiny", "dustSmall", "dust", "dustImpure", "dustPure", "crushed", - "crushedPurified", "crushedCentrifuged", "gem", "nugget", "ingot", "ingotHot", "ingotDouble", "ingotTriple", - "ingotQuadruple", "ingotQuintuple", "plate", "plateDouble", "plateTriple", "plateQuadruple", - "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", "ring", "foil", "cell", - "cellPlasma", "toolHeadSword", "toolHeadPickaxe", "toolHeadShovel", "toolHeadAxe", "toolHeadHoe", - "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", "toolHeadWrench", - "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", "toolHeadBuzzSaw", - "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", "arrowGtWood", - "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", "nanite", - "cellMolten", "rawOre", "plateSuperdense" }; + "crushedPurified", "crushedCentrifuged", "gem", "nugget", "ingot", "ingotHot", "plate", "plateDouble", + "plateTriple", "plateQuadruple", "plateQuintuple", "plateDense", "stick", "lens", "round", "bolt", "screw", + "ring", "foil", "cell", "cellPlasma", "toolHeadSword", "toolHeadPickaxe", "toolHeadShovel", "toolHeadAxe", + "toolHeadHoe", "toolHeadHammer", "toolHeadFile", "toolHeadSaw", "toolHeadDrill", "toolHeadChainsaw", + "toolHeadWrench", "toolHeadUniversalSpade", "toolHeadSense", "toolHeadPlow", "toolHeadArrow", + "toolHeadBuzzSaw", "turbineBlade", "wireFine", "gearGtSmall", "rotor", "stickLong", "springSmall", "spring", + "arrowGtWood", "arrowGtPlastic", "gemChipped", "gemFlawed", "gemFlawless", "gemExquisite", "gearGt", + "nanite", "cellMolten", "rawOre", "plateSuperdense" }; List mMTTags = new ArrayList<>(); oreTags.stream() diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble.png deleted file mode 100644 index 038facfc4d4f5272bc8382b7b4e72757dbd9e908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcmV;p0!RIcP)-9G=L*7K;&D&n_bUkh!r6ro;W;0{;0$YbR=9b471{6kv&0va zQB)6#>gL|VJAD22g5 zv=|IG=?^y9>2>IDwOPBnL?Gb%A#sT(aT-N-cX#;kw$I+X9jCuT!rT zsMYf1(s2wuf++4sP<#^4U$%JBe!`8_Wm1VS^?HfAQ>NjRsZ(o9* z5AQ=zlt~hLn8gbwSt~}?h+sthr1c19GE6R~qs@nyS3RT>F>c;k!Au5-X)eUEBM6E- z&3gL*@t8`fkj7rru}qDSe+Fsh1OdMbr&hv<&r>Q~q*AgmW3w2szz@N+I7%w!r&3Ij zNo#0Ykl?IBwPJI*TwvBcjvfgRk832fInIn7Wn$z2Mi2cyW7#`Rxl|y(XmLJs7OzJk;P)YUr~dvxUat#r{1_g| e{co@PAHD-6)cQx?p@_r)0000ZASh8 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple.png deleted file mode 100644 index 7aeaf258c308d34811321afc47ffda79b742ef2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmV+)1K|9LP)&K}b>$7R?j%1v+TpXU zF9a_M{^j+5f`wzdjb`h5?q1#6H}LXwhN%h5@bhu=Ts)~!22eEiW(d+qu))^EIpax(ZqpKh;> zQZBh%4jm403zJw2+uPqEQ;m^ejLY8Mb5s(IxUv2w+uIL#_44aTVR3R2<$$m$KR$kf z5EdPesb84Gaa>YiuxZ5pfk7c1^f+ei>MFnf_KfA%mU-~)H%J_^nF*FIEh8|bIz%~= z)EHXr7FLhR7=y~@i?rH3Dl@Z8PF2`>^fUGOD@bW^ghHod9HHnAd`962izOo*VjUCe zHcAM1^7JVpO{vWK>$iVkFSDB-+ zw@WVL&}qLQF)31lM9^uqkitM>sLstYiULHCG8zOZfn{#COtaabJT-|)3`sa-;E%D= zkaY`G&s`viLvr~NK@{Qzr^HdpL}3zzRWuJ9)N1GHc6)?D$luD-6{4|6)^%yOPtkhB zG?GfCf{16Z#WKF%K#hh0bCm-9ZiiZJfoNUkJ`@Zf@9x#d&(& z9#Pkb*UVM!(YniZSJ9`PKE#g002ovPDHLkV1k`^c<%rJ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotQuintuple.png deleted file mode 100644 index c09f4df763039e1273512276bd3c8ed7cef920e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 812 zcmV+{1JnG8P)Nkl_Xz+10D!N*xo;aIn4TZ--p-r6_WBmHc}AK<_^QXz=^=mp z@h5lh-V*=q0 zhz~z{-)?Pf^TzfzUdyAgg30+AU{R_K)`B%Sj>ChWex|{I<4{+cCr|c~E)MU!{T2@% zKIG-wudqxOc)p923asJBAHGL*SFje=pIygkG{ymA6o-e$$hydBbiwBH8~pdr-`u)& zliz;*1a+KFkJa%i4lcge zrl}hQhUwV}zUR_d2|_?4@QgwFogV-0J!UW%(Ov0MXz3mg|rRTBh51ct$tK4q4Z7Z+sdoIKJ{a=?w3UL?&6mPtujX}Y~D^tyc((*tICfl(cjvkBA*Qgt)g+soKk=i&6uWc}$PUr`HlmwwV zETao9bxjhU6I|)i4aOKF*grZ$H(*W0=l8!80^s9MKCstcc#g~I99?RZYBN|JQPmA) q8gqQOkLxLXU-8A4-wFT#fd2vh>w;>2WQkG$0000FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingrock/ingotTriple.png deleted file mode 100644 index 0e768c27cef251433edeaafe55cf18a8d548978e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 741 zcmVSs;!vik8bHTZ?032sqEuJ}ZhV8psD5W4T@YIX=SBzV{cttoM z9C&-_Etls7MteN@)DtvY&ti;E7>3w*h(A`xIVj5aB5y3b;+oGl znQzVGa)lB{C)~yJs(8jjR0R=-%~Gy^{S{jK6jI>wl=Z*vVo;jqe3O-*erB%Gpu~}8 z8P*o~UX|tVze6a=ZOrVv0@Jbkvsty{M_Ien6EzWouU99j&g zW~R|%(AqJK6C4@+PM6H4#I}PGfvw#gBrov&3P0Sq&g}H#palU&$pGIE=yrQ_cebcj zeYAL#c?7P8aV};!z2GJm9e=s7omO~SdGEq*^ z-(F|??>m%!4L=-m_>plAjgR9Lbo)b$l#ZiEjFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble.png deleted file mode 100644 index c021697de4cd1b6006fd55b869272d6a5b1d8500..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1487 zcmV;=1u*)FP)4Tx0C=2@Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zq`Pr5XFtiGGF=HTsPf(iyFpC zX=-MOA(r%#N_s$06hhzo*nfW7Goh^{QeV0-+{^C#=A4{kuY|XHL7)pGBVmOb8*37WQ7UIhsUTi6F4Xn)3B}lGAUrH?5j=*LRR}v ziB&mE3mjs@v`q)Kh)2{2vv0P*WZI`HhimxlqAcpxPj)(B^o`Ie`lS>HWf p46~}J5unAn(5yd>ko5Ln>k~y*4r3c{wEh49002ovPDHLkV1jry&N~1A diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuadruple.png deleted file mode 100644 index 8865513d4a786bc76defd046ea750c3c27911eb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 zcmV+g2KxDlP)4Tx0C=2@Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zZ)62Dp?px zWo2QA5z+-qO6f*W5J6x1)W4th89UnzJTRQIXXm}lyJ}fORyj5!yY{58pOzfCT}|rq zFpNdRu|2Mh&4MfMjf#A1W#qNCCfC&!IWA`8)CtNzB`yKda9>}OZf!#@DtRCLTwPXz zlS=Wo6M(IiguLyQq`y=46=?)uz|>(nDBDih-&>JUu~0>^kxQx~jes~)=jmB3KnPLo zd|dmtBV*qLDDncZ0n}3=>E&%L0Cy!<&j*=#dCE>pJ01{gGd87Q)JVFu9MMJq5E|85 zCMq2_s6cbp5eTEcXv<4JAdlrGC3sy8DFORcE-pXna_4Ila)3}rAVf02!QoO&9RMEK4a-A%)FFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple.png deleted file mode 100644 index da6028ed86ed4eec09471cb0d811c1d620f2c138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 zcmV+g2KxDlP)4Tx0C=2@Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zT90u!GTCn$H>DLHWF7>4g`R()Ryw30E@=4dG=1R5-nxA6l=Ot;qTP_ERz(LW7+}AaldpbT zfw%iDZ3IlSfth|-jLL34E@#Dvejg;KB{0fI6?D^Z6krog_GQ&k05xo6beNq=fNYaH zsAqK&pl%_i1u+GPd+NxI%U&rZyUAIPz$D}Ub~XDCU<3fJY8g3qqtYuSl9cr17Xf&d$jr5V}EEXgPz@+^?%P9Y)hjqrH7M*uqjPNwz> zVIRaZcPLQ{Y~i??Qs0-gl=R1HXaaCiPACWfDoCE^{cJ?<{Vi|-__-YPC)pGNnBMpC7XDej@AiS&p rzkgwVNZ3FDAz9L#fJj__c@v)>D%59-I0Y#i00000NkvXXu0mjf6Ug7b diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/Livingwood/ingotTriple.png deleted file mode 100644 index fa160110877882cb1bb2e10f318ddcf7bfa230fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1512 zcmVP)4Tx0C=2@Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zEL7$RC&Qc7*iiSm%4kJ6uMNoilfO~n3K3fLOtP;IcGjvnUQYWYXcLE59$mj%UY#lHl zU?DK5k1Y0z&TS0WKcdnPK}JXUHsoB{uD@SE&d)SqRu&PEB2T>9f+2e`)0_k4hOQS1D&ur`sUm7y;wq$D@h|JXMG O0000FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotDouble.png deleted file mode 100644 index eca9d7dc97f4a400a12fc1c513785c3894d66310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5215 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 bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple.png deleted file mode 100644 index bd0699f72fc508b438db7cbae863a8beec8377b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5240 zcmeHKc~leU7EeGxVo?M|1e75lAP}-ABoGh@s{~@86nHL7k_n_FBqSjTU?`&UTmThO z(IP@0RtsWPutgSIzy$?S6pG7pskCJgMMdxlsBaQb@wDf><2kSYnVgx-+~xP(`@8qM zli9)!3p7Dlp%4g!NpKL81OJ+8kC}$>*>?C1h(OF>r$t69IG_rU$|M4z2m%zTQV4+5 zLIDDyzE$}}%$|qNpS_Bo-!NmNX|v3-jV3W_m^gFe{#j*FWNq}z;&xQ_u z`?`@AWCWcvT5#aHT2$TPFw<8O9-Dqm`RKv|#-(KF|p|&-N4jU~FZ0ZO(-s#(JfPz4dSU2`rxPc@$)jS>F__5(HEa{5-?QarW3t zX5~M^FR#fhCpOeEsbl7K`ILsN2Q6D~U)Y^Ztp1Ms=EwE9rriIu2%qvO z*8z3p&e(gN8}+#tP|5q&T%P$aVt4vcJ-bf9qKl{}qTa*9m*Ut_h5BZpbcy51t4Au= z1lF5fj&`>E@s@Rb_7GGO6jH$kHt=;Oo z++S9V(-KKBMAryS>Ajfdio4e_Y(9SaPtfV1nW@lH08c>-wVR%$ATv z-$a*NbHq-CKDh%)SsPwHak~bEY3yGg1y)a?r*Ut_Dvl5 zb={Th_%@-%4`0t+Q%<;OKVl;CWUc*j7%8S3{g&_LUmA8uzW&hNsOO8vH=P<+t%;PK zA{O_JA1UT_?wYZycdT&8#cuK3hus|{O}c2W!niMau&EvM9WB11?&)nIlSaOBan632V-+#ddi$T(GtPD)|mHw+_6W1#(AL}Ws(SilL!?_E3J@B5iRmMPPLFIXtgFUXc??nF?# zRu^4)HZ)#^{<4v~Y?(tblr1!un1)Mk8TM)(IJ>sGJf%IY30~lk@muYKr`Emst$GI+ zlB@QmK5#w}J-|J*E#_wD=EIwL<=-jF1{!GJ!|H$?P3S$q z$^g{BkrI@3@~sq(8^6!1zsFYj%Ix$!+2=pEoXE5ywH&jZn3EBoIN!0UaKVvLBxwMY6 zV-MR+Zz%pbD>d$kMc>+CS>nN-=g1aLRKNB8`=*wz9fK(cRWDL{Mb)6kh@weg`WiogqM$63i1*m1;B;kg-HzbP~A^xK*(pH zzaX=4EU6!qAPh>AK@n+Tk-W4-9*vLo@kV*6=`es8QhGt?g-Qb28wGgD_yRhI888I_-!ae$3Wb!8#i~>)cNNiH zB8$i3X*3!ZN5B#Y7}x?MPfb#QYD|*cUJEga!Gz>InNX?_N|FFACdiefC>UrotOwr4 zCzi5U@8FZ3j)K$fxTrDP%rKm<3ZyQFcdxwf)ykP#DmkIf|KM5Fo_3gpd-Hfi0)_-p$QT+K zgfL_h9>UQCI6RTep9T>w6T)2yil#@Uh2q0d6fOxz2B~}uk?TQ%qal+pAc4fi&~SJP zjY^_G1QJ;X#plrjBr-7wms2PP;~}gxDPE`05>EGJ2Q$zFciejkTLdZuumc0l0(n4q z#CuJoPz*&VKrNkk3YAEvk%=S{k&45SJl-2cK{7eqids-S&YeimX|#2r!`Z;hg4#xf z0d#UW8M>bg0u>Tjq(mZOptUgpTF-ZC7QCPMpaNuq3J3HD-!DV5&-CS1s&u~rXUBE z&}6k>tVtCw0ZfXA;PElluW#kTzvu-#MCDRI90h~J^LQ8%nMT5JNg&)66p)Ii68U@z zO`v1p9lBg1P^dr|&J5Dr2m6YP?O^ z3;QQhymSWB#tiH?DTBusJPon$#^DrcaKL}(XQ~)~=Mn($X_1fO_Y+;8==vxIKFau0 zcYUJkqZs%o<4@i7f1?Za{)Gxkg8v4o;Mb)`kINh2S1n^{P>dXbm}Ra#kcj<7max!B z5zO*8>P4Cu*}JVT)jWYkhTIi_OhlgcYvGNtgC)CynZA)8t#@|eXCvmC`rmnD8EeE2 zQG_HT8~kp(G9wIH);$V)=JzXOt?yDW2Y>2t!L_W0F}=#>kgy%jjgGym?&ZA5*!oK? z1u1YUMYLZH)pOYiIBdN7%=Eq(A29cug;@ohSxzMgtC+;V?4M~=2h*d}l?k^?R@7#0 x$TK-EqrN(dEGh2C2AM=}9^X{m=-O92%X-xly^IY8%i!=3!Tw>)W6R^R{tHU)-%|hp diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple.png deleted file mode 100644 index b1fcfa3550c3bda4ad80261d4b523862b7a9049f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5265 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 U?}0f73Jb>Y@TH$wwtmZh0heO!rvLx| diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple.png deleted file mode 100644 index ccb1a58588a71301c7a6f79dd894b7d5d4ea07ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5229 zcmeHKX;f3!77hvm5d~3{K_x~IR5B+(B4LmO2^zr&2u{t-%?(5{kpTiF7SZB>wp6VY z8VU~7p#{s6RurLXp#_Ae7A*xINWm6~ARq$P@tp)zT2K{q22r za(73pUNH^rj7FhQ(>S3l9{98~zO1Hzch{j85DI1PpBfpX=0V9Ag;FjOOAw4YMS)-t ztyqLYX9V36PT>bdiZu`^+ zg`Nj>m;%cqZNodWjTpaN+gj7%nv;F&m+!uP`c2!G$ll}k zgX@M{Qdy_bJ0z=M!M?l}$@GEp*u>>KBbpq8ZXdnsb)rvSzaemQ4ab&Tan``f_uiPcTdUoNexkR^4Fl*W7^-I+-JxbpAF@H5tT%IlKA7 zP`jn84n0?r-H~A%^r0h<`blDanELupcJM0ekeO7E3;DzaMG|t{=k67~s#? z9%VPK;=xA(PW%?tpM!S(X}66CBl6l-?rNTWO+;+k_BCxwp-Y3B+Qp|1@TTa)wmVw2 zhJ-NY^;Xs9moH9uvFr2LJ2wJHeQHl`yPx?V%Go(L438uZja%%UZz;^9RIUZpJ8p+> z&;%SVO8T_6l058k@ATf2_ae?R8ml(ra@wnsIXcOMcC78Np*U}Uz)0A$YQwUlhFjXI zQG;T6Pjnmp>u2_V6qFgNJwB6f{;hm(F0T&lUwnhdvRu*ksQn7QL03k84p+((@95nP zj!Iqgm-6*XQt7`%Q_ug}7Oe5ru|}$=&C)>S;+{oHWm=cyTW30oVIbL~#gc+z_9)NS^+Wml}CQo8c&KiJe{*)l-w z%zr#Qr__Duvj)S#M!EEP&$>J9$0J?&4Gkmu0KZfH8#MH$WzPp$!vUTaS4DwaydR@b zW;?{e!4aI`;FpsG%n!Zp6K3cS5wkuFUt5I5O;55*tc}R`3Ux@lv1HcaM@0CNS!?8%- zO^R9kd8vrUA?3X15PaGSlVQhl6N;Qv`wwQyb!}^XZf??FebE2p40g*UL13WU7f7af zrra)E-a4gQ*XgI8lgpNo>{dyo7iCdb(Vb zp4p$9rHr~*Tbk}ntu1kVYP&Tq!NFr@`!R+6U0tI7<29JFsb$U|4e5G)i)UgU*=+2Y z_d&6BL)!lKyYZz9`Fxl1^84}i^A+bN+c2H}wYY+peJH|fQh(e-ZVG>3_TBe}lnDi0 z56x@nO`3|KD3LqfR# z!E2=oF!@m^zW}WQf)fxmMu5bLWlU^;#rIf@Sjfb#qj8B`MKBUC4oy`eYg1Q8!l?-` zU5E|vNBe0RfIy0UBJdq%k z5+-`6)a)ccG9J+1dZ;474%HCK&r)}*J8a9n{maI&cr}~`zziz&@Xd0fdPukWw7M1 z#uy%l#l#x-X9(r6SjaGag=r*jA6Ov5QHW$Aj!L3Xa01Aiit~Z#bRkhF^cIQ86R0>c zl^T-4h>;4ACgm` zm61vas3>GI8S){KaIiN-!BIt^L+C_61yMFHY8ih(G(r8qY z?`u#rqEvxaG?J2tc*>X}#=0;-Hb7a(*rYuEs7UV$)f|U`(fi0l{M_sGuZ7Xo?eXjV;0PkSq=X<72#EU)sfg(+i+> z6dwcu6@zFnjtUFBaRLPNlrK@>E2PkA-V_?;O?H)Bq)vvENKhQm5oiVa)1(!~bF5N} z--IW}BgQfS#c)It?yrgw#xo`ur^d^a{Rn>%#m@woFlK#^JbV#=-Ls zKE{jj5AFb{-)-_%`o5Fvom_9Fz*~Xeb=Nz&-b#VD0>A67|C?Os*Edv%4EzmB2DeLu z=4(mdR?Auu8mmH~rp`3J%usoHM_{y6bGU5FZnJ5Y3zx)S{RuCe6c;)F(f9o@v*g#AG+s4x4C^09^QNM z#AEx6YrL>~YskSWR-JWgnBst{#AmSG_U8KLMS;=w(>t8ngD$!+vzoS`tjb(_*0F1L zXJ5ua-dAoNsM)az?^j%;H@n+4cqGQ3OLue2F6^4LvFO0oO{iUrwA~dJShr`B(=Iu< bajKTvrfYLjU_NS{)*g4 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/WhiteDwarfMatter/ingotTriple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotDouble.png deleted file mode 100644 index 2fff5f5aaccc6d7a68b429828158dcf661ab3968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmV-10?z%3P)Px$>q$gGR5*>LlfTYkQ5400cZMTzX>K$KL81{vBtD`dqVoVM@g5qDH}M1#65;_= zRD_CX2)7W#pDS^uFmsamzL|++c6av4T6?X1)`2%m*LA7uy8PVN{sr=QJo0+I0^s-i z0a&e8SeB)5w$C6TgqmU)25z?-%d)6es{rixd)n=`G)+@e1VRXDx7z{8WHOviCjczV z!sqkR@AnyvMoNKU7?`Fh0ZsFGJQAQ(D&cauIG@kVW-~SM7Z6}L9O7^|)cJ5Ypy|3U zE0qe}ZkKR4{ACaG`JBh&f!%H=7!0bu*Xw0G9=|LU3I&qMB#lOcR;xv`*~DghttXq! z5|77!BRw1r0L*5ymx4$n0>J%#XSG@p2n5uW(P%_2m*aZ9vfu9&Nj{&a)9LUH!0B|7 zPN&snxm>1PF0-Cg{+wI18Aw<*f_fsqunNFvi zPA49Z2laX#(=^%bc08X?QmGVPub0JQ!SQ%xu~=}qTr>?{Ie*u}<#PFR{DlxQ6beZp zgbW6QQV1c15YjM=FCXZy^)r>y>2$si`rrBi>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple.png deleted file mode 100644 index 0d037db322fb782d28a1a566e529e70c45475c68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)kP)Px$z)3_wR5*?0lfBB~Koo|bEM`72u?Z>sK~cd%h!%oBSP7EO3-DfSY`hb%K(J86 z+DbdI5yV0TQwU0;QJ5`U1Mash+wWV=oSFAM&m0(qzsNLA>3JRi$z&3M?RJar`^x)H z=y#J4LcZ6AVGxZ*@qM38rvt$0bYd_VNXK!MAV3HqRaFI`QmJscTmbNWpF|?Tcsyo4 zp9chnVc-EZNwF)}EjR4c>l&`O^V1GWJQ8Z1H?RJ~dXhb%f z{Wgd7dd=hUKvh-J>2y$!$Kxy(i`NsH%_gN%iEg(`zu%|V>k$gQ##5`+uq^8%^n5-8 zuv)EN1i4%efcyQB*`BpeRE2!H@{xm;2#7K5;SKF?$_;dZ+LV4CI!fud=e zv@DC|a!DeQV87oJi^Vt|j{xYpj;`x88V#P$C$rfs2>V8`*=%qehe#wsp-}iA2wc}y z6o7ZgzYw^t8~nr%2_a-AlaWFQnNFvr5JCzeq+uBHkA`3R3ACB{=v*CFQ~&?~07*qo IM6N<$f=-C!RR910 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple.png deleted file mode 100644 index 63b3ceab49fd895fa216c555fddc40551671357b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 471 zcmV;|0Vw{7P)Px$kx4{BR5*?8lD*2}P!K>*7Ne5HMp9@%QNcop7J@&d5+t1u;Jet^_$EFeK0jq^jzx*XuEvOehwMKR05%Uh{Z7kY$;CJ|DejvssqQ z<$Hxrr$en)V=x#n8jTnZhs0tr09vgUrfGhIo=ztKR;$(9pj0XWaJ${uZnxxexoC>( zy0qJEE|&|w??({JvTz)SUjT}tP_NgcPusS!ZJWd40Kjgyqg*c2Y&Hpk03ig93JU2YBhqD%VlP>8Q1F-0A1I=8Az(CzD(1^^E?d0V87p!$z(Vlj{s3PB^1wow28 N002ovPDHLkV1kYK%hLb= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple.png deleted file mode 100644 index 7769caa3d5e4f355895f06476e7445aad2adef97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 533 zcmV+w0_y#VP)Px$&q+ible?-SK@>$-4|XZtZPIk$14RV`K@9{S7ztwL2ly{0CjN_%QQ`Cnx_2T*Zw7P97kTSR{)~X zC;;pA8qf2T&i7p;giup#+a?$c;&~peRttc`;Xtp~ldkJ(%0LJqbzKLbSS)fnodEDW zk4PlKa5!W-ohky`wsBoo0-EMHjs&RJ>sXe>`Fv)vSg47=g#hF67{A}I&d1{s%`{Ef zY&IDT1|*Zow>>PEOCFC0x~>zC$5lTZ4l|q0UQejiYUJ~I+U+*oZkJA{gU|O`Pq|zs zo6UYPJsyt$EEbCwK`NC3;C{ceUayJ8Vrt5CI;B#naJ^nR91hB)TCLLW_xS-}7zTwx zL0vW)4H}IGyWI|e&1OS7ou*VOaXz1MU6+2pPaqI@5daEvKA)4z<&;@Eon|x|al73B za2)3gfo7Vf%x1I9=W`;F2;1$JP$OC*3vMHk3~NL Xp0C_1zlz*=00000NkvXXu0mjfNulU= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/bedrockium/ingotTriple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png deleted file mode 100644 index 8a67e90e7414be36363ce16a490451c3bf4414da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11176 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotDouble_OVERLAY.png deleted file mode 100644 index 750c50da6c1af16aa510d165995ba9d6dfab2d57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1986 zcmah}eQXnD81Ep!*ccgs$;XhLHw+ku6OTsm$kj_?$&if zAZ+q65o8h;1kn(g3NmztB`_iQ!B-HO2#EiPAexQO;lO|ag75Xqku0%E+k2n;J-_F9 ze$VqhE$-5ijI=3fDwQh3>9Ci>|4ikZIuico+Hpb*wkFGe*UP5 zzSo~!JfiTz7K~D*6^Jy)SRSu0FHu%F3*>1BT(l(7*Dv*xE>Qr12bK?jK*W(0O)U zPs<5x%BBacH}>=h@2{Vhe#m$J)UMu^kB)jfn=g#zUU+5t2k1t=yYTVqy**QUu``YB z#}`Qh6W825eu})vZ$Mg#@(VwH+jHJsJYwwc`?Gib;y8Ek{IP99Y?va{7&Tmk2eT zxm8u!2Mz>lu1^ac96rYS-dpXF@=a~-JXOE%p37Wy=b65xccq#gSMQ~qbT8PQefe_c zq*>+tf2;d%-#C4%=cOepHmy*Jo#H3`n{S6TcsitwxzeNFGeT_GE&<{gb9 zsAw$pFpV{gnMDg;&PcOFD98{1GL1w6{-8uftZ0;&g3pRsgCbFgTw_HmU2eoChyc;4 zb!r?ditu3)g(L`K5m}BZw-?7r;K_jk640%kjs^14@z+zpdy+G9nuhLToVW= zSx3>5Toi`R@mz*POP+=h(3As7s1q4b6b3;#H{s4QN#9VN=#N&xG8*6q0SJ>|G$I+Q z#OZP;(Mr`mJ`jp}K!uYindkn~=Ba#?H_`MH!J%7{?PwXa*^(h?_lp0944dq8wo`YV~HlmeAokBS{$Ihy_5D;Akma1g_S?;uYa3m^)OE zR;CWRMk}IhBA{hK^az6AiYiGUicjpF3*HTumT5aJ1IUGwS_&s9LhHeelvYm>x>-0* z;R&$7@?69JL8CVbfgek(tqxv-(HoNH`2DB=wS!D?qn}5jqfXIGtOSV;0~U=NnQA)d z18^6>F^s|ZAzH2H2pz|=T8uTbUQ9>eCd}(40S4Q{noK5OG_Z8SUlKUEo)$r&52^;m zfm0V12g!@IV@3j4Ukwzkp*|Q+U_S`<-^m=$gzc!GY3 z#ipE+%Mk>j3L;#6w@!3FforqXX)pAc$~s!lW_*pL+Pkh%w=a(C{xH3(|h7REStP}?cps&{g3A?88>ZqZJ3hR%+2|+wByf_nOo;y z`t5Yt#?o!8F4=DAaN>)$=~bQGGqULb|)VOS&1l8w8|b=p4Gg zdB3%0t(kvj&6#`l-RF6J&%XZhvXZ#iB-jrgJiwLu^idK0{`|p%hr(Ex=ucJHH&hQE za41N96jA>9FnR7a@@==<;-!n3%Y89!D<@JTku^ER}TmH2zV8X4v!RhRBh~MV>-5qeb6{>rv>lW$!{HRyuUvO@wIA!1?27}2bDeo!;Lu-D( z>@6`i2IJ4KZq{yT=K`T1GqG%r5sA-mQF(iQd+>O8xq-an;1tWh{z7F_dm4r4dz-Kb z;_l>i1`(%@(aR?;?Y~0*Jp8su>-Ze@P)W#kib%}fGPEMlXuVm;BA(cD06zpRP1fC}-Xsm0)9c8DXOa$k3b%8%)k z{lsx1j63?oeXJKKv6fM5zkhIal#)JLY$qc(q%kU4&tK3oNlPI7iY-M>xTMhiav0Ow z#{kOtHW_Sb+~p|pou)G2wX!pJMNzbs5?#@laS?mjtFPi{#Jnsm<=m@`58=4^N=71W z9GOH_gR^S%-UiRYnm~Eek>&gL6I=C-d`tv(uW{RFH{9V4Z-pLP9^*6yGugjeR7TK% z%cT7oX{#8KV&8F>A0b8@d$wlhxXu-nN5;Z)2jA`8lDPol{C^VVE6c<|>`a9k@y;2U zUcnY?*Uh(_TKNiD)IY#ETBn$DU)z)~Shu``Bdd2^Bp+fe)t?+}7D%@gd0NEdl_G z%ieP&q5wMmjF-5R>yIc{lsROd>0l)z4i+&V{CNlL%8=)&yw7%94>%YkOf9W>8PoN8 z_tfz2hAuPt+9B{)c~^(9fC(XeL9u}BRrgK*2kze+zOlD_N+d~+IXAJd6OvEEtdfrD zP-P;*-_|#c**f$QX3&b8Ga(O2_GGMWpz{@g>5!ECiaE(W%KUY^|%n|^p(HzRbPj%M%J3uU76Mv4izQv?U78hgx4 zjFKS@(sQ~EXZlYA*!1Oz)?u>zEWdTKcw|Q%xTC-#iz1w3(YQ9`<%^9UzZX9|-X?Q$ z>~S3%Ut{1(aw1}+>2#Gy=QRu#EX%46F{740O?vjJ#Mu?P&ynX<#oMpU%TB1sHBqJO zu<<0*7^|SY4ek*0vSunCcXnV5$3`_*PiM>uM_6ZyRF_SqX8H1?yN~;Mgk7!DtEEHr z!mn*T@Gmenu5xDz<2?RK2>p!qtuf;^n_T2K+4GfmBH<$P<4Eww{u{WIUxU-alA;W* zFGf{U_kwdEva#zUwM}02RW{_xnwxosD^n@$;`*W)dMFmnO7vEDZ)20j5i^@_0er0wgvsV-JX{$?Z+VG2Hz?-(L}cO!Be20gc^pLuQoS4 ztXX?8X7oyX;X+Z6#c+sFG{oaH>fBv99I}H-+mIOV%?J~JI9aw*MAdk>WU1A7DG#cL z`anG10cS`=dst*YeQ>1LjFrk>NAQ?Gy9%s~9^j7Eikk_OC>FJPlyo$+`1JB>(EA-N zFu~|?Cz1nO8YkoBY9PkeunaPg0+V{-HOTdP7*h-c7bxt= zFg10k^a|#HCoFNk(OPi5!7F#_3S4E+L_BO(%`6%z&4eU8EVx3+J3({Vh$U93N3mGo zY2iHG5-<3#U0g3j5(`uIYp_D_!(a2OvE4M#V3pzTTiC6fNi?M69zu61F zMlDr-Fpf%HzWR2?oxoM_;!%Jn^pHzY#pN9filTQ@<^eAEVhlJ}ABcpvz9M zf6vnvA9nliix=JUni1@|?8W8=@m`2rK?yKfjL5zAAtbaN6HH7w8Yi8F6 zGs=p%m6|&8wK({^5p|Np-aZgrg7T)C?$9W5?LPQ?vLBPpf#M4rkhdE`7BL1-Z|6iU z;fDTD)0va3P@v|Q<-0lTy$+M$fsJTuY%J_Z&()vy!AsUX*vDS-u*419&u%=o%s+If zd*8(t0lA)$pA5jNGS=yVSB+Cjc%m@mFm~i$;}OZ?2HU27uSruqtz!^i>oTf3p&(bH z<9D*wn4ehf91l@796Yx`{J|C&6ipi%AnK~HU4FQEp0W_f1f5n0!|NTh&&W&HV^+|1 z83~8@Lxl&6B?x^{X(P6O*Ho!1&u0os^R8(k^2Mzb+dk)+;?|L5ed2r6@~Gge!T@1o ztZ)V?mwfA?9d1Afw6@6&K2e0f0dCxKGZy*|s`PgSbRJ({{P;-JX|<<*JJfyLN~E{i zHt>piC$fKIch?O=E_#~*(YSf`l}YU@7n2jX|B2pQZ{YG`#{W%^$}j3c$*#1&ij`Z{ zNJL}YmJPKh`&(=QY}}2(LBg)y^r^?vXC{}PCF-s!@El8t#55{1?2)&mn`V%LaV|3A z+rw-3>v5EnDqnhM=mazE018$r`#4IAomr}&7}LV z%v3?7&D}8HY5TACamEjyxe6SXGk#eR@mk`hLofCg=T|H_4084d*WKJ{0Q9nkGQ<4P z<;duRnNVLwC-6xcpn{bR7EoE=(2w{3Zn<*8z+L=x`!_L;VtISh%f$uX{Yaq;nJ-t+ zNuwMFpW{rVaIiGz5{SFYml$XQc(wsU12LpK=jN15-MwcDLv7ce5x8zMaS`L6*a~TCw#7by7P? z#yOhtKP@lCPl8bxMo`UXKn?+o$_ZnZlpL5ezFnBCfIunsY-NW|N))j@%tyiZ^Kyx| z)F;vgfbCsdUfwWB?nI^uRm`C*ldMwh0H6rdS4R3miF)95zSnIStI(+(X_-iWs5%ul zu|a1f;8qWhuLr39E5(wwkb2g5{6cQ#cf{ad@T4w3kF-K81}&$&recP-bF!;e!Y|d< zemofced;D{$w}AW&L|Mqk3pt?bc1^0bk>~zS(C#Ac>UUKn^9$3D@Kdd1)D}Yc^G!N z>m7ggY|36n@Km37*5UduxYmfGzzQxPD`x>p)(}jp2);-4^;ZEm`chz#L}ERb;uG_z zuYyE=i19ynq|UZV-~dvD2AC@Nl7rC>lLWKk3%XaT;)ViKOYWzqOL#KfBBCLSQ4kM0 z0B;SE53T)KDtk+@bSMwXp` zQ$L1lsqJaB4Z@?_rvV?gdrJEVK!Tr9Xw21$rotgCmB7RLMu0DQ-qG?+t~-CF_hHV|)fm<|vPC+YXIc zfT_F-!JVnG53FS=rW(plLF2^Y^7^PCDZ6)ota*s2X?0rNo3XoTrkq-KLX^J=+jij- zi)Qu^W!fLXuJE&qPc!OUBGM#GoPtcRz$AvBeFF0R`5#qST)yR47d(>3P3jK7GoZbmgfpvG)Ci75iJMG~)HdVdu$iH5s(zKeL&hD!d&~u$DL?36Y}_&? zxV$Ld`?VclwB{5yonlu;DUC|2ej&dONjW;|zZD&vBK}H?njPAC{K$l@&X7ZzjZf}b zEXEnRRhhPFu|e{2CS!zq2&HkD?!oJ+%r8!o;994Q`qzj4l0Rqf)Rm0B*=y_|Ua*{H zt8}S3kKmA4bIyJgkL-bqQYvtn4;GWHVmX+CUb~bx4=ib{luC`JXKnPMq8oWSJghQ%N(g0Lz zcZeJ8kTwZ-2z{b{XX8nKsay_gg&#gtO12wR2c?*yP z-Ynq@6dftJ#MAmzKj!s8!R_vs2r(^#6buE@$Ku9Dx88{)XZGX!_5o0#w#P9>=TDV9 zMCZ`!lzLYXX5qh=NdFA5YSM=$R~!nH?&#WyoPU*YR5r2DgR#NB{tm$IQtt7KNmm5@ z7%f{F0h*o4NbY!3Qyq=Im)mXa1eICjIIQ#nhvoGyZvhr5!SmKKMIdX$yUH|K{R_6r zougQN zN+k+|R>LGo)PO`bBphm9tv;_|`f4bz4}R%%Jz(Y=^ET!2Ywb6V@w>^2J?Jw2nJ=Lq zPp+;9(#g97gh8P81}ScAqlrd z)y)U{CVoo`r$4YR3@q;K6lzTIQF_zUydJ)QosBe92R|@IAK$wSnjxI z*f4NKOc@R(BEcvlevd>fR6(9T1E}Q43;tx>wi(!Y29J7*NgNcOJsV7;0!Z>w0w3UV zh-;{v9j=L3T?G79yUVz_Im>KdIpX*XXsQH8Lz<2swv561eoV&Gb(H>{_Bc=NgWs!w zH|pRG;iwDi^ncs+{Qevy+F9<04|dngI3K6{S8U{caPt3rzHQ)^RBFbk$rq3UFofwB z5W>ou2e!{RsBI*Q721^|Z|e{(brPskN0ykJ4j1Y_LigD;3ch~_>ALK{d2(>Q#C17+ z)!psJeb;GYu;O*qZ%?9$pJSGrbiZlTwucFOwJH#RWz|}=zU-iE?AwEJ(oM0PY;y~m zF*x1;!#qR|dFEUetw$8vh78&?#kjJ*ZpHNWNl(k9eEG2WQ~6=?EoVy@u#wf}p*_~0 zXbs>8RZ6Fk`mP(|WEKeH?~M9zo-C1#T02j@$%cM9YC7Z-nvR8#zJYq=Z_P|(k$6q@ zxt8$PbbBAY8CCBR#t;Vy3h@VcBpGv|=A4bc+3v7d4|yEi>g{jcdCY|J@Pjby)J%2_ zi_CDUiJ!-U1W&@hqtYbLSLsXiOsvH+kY2O->Dnv74Eyz*zU@y-th|o6x^jtkB5BO{ zCf{sZmG6r)eU-+i<2QT~@kl6tSEj9ck=k)Pd$T?EPr9(ZjAmwjvU5#v&N@sq9 zZ#xk+z-D2cDH5|~t@+w@byaKex+1}hIREy%#@gVR_||yfqYGUdR)w<3=>m94`maDr z1=J4P@ul>H{#JQgMm)KO@P*P55kE19A__6R#VG()UKz~k-XP_k8*JbaOg_EHG-DHo zU|{$dW6-Gi#-#aXPwl{3=n745B7^+63Nbw*&};jOVnm_qP7G8&+Hr&(maZZ0SpauR zz+L#XiG1@m?9Sltm*!0o@k>u%f>IQ`v>*QAFiEiXaOvrS0CF%C?1gg%bkSCt5}Omq zNaV9eTP&Sb$9%P7Vtqu^3#Z_IJoJ43;6Ib!+5;B_UG+em@AHDzP-;?Bq&C}bmFAn8 zYpWZeCD31KTatV{PBvcmg!lev5#PF`ALDc&lkkxxoj{L6Oxvd?n+MYfbr8C4^=MTN zkCzB{V&kEz*rlgy(zeF6JjSMLUc;+`#-~Sp*}6K1eHf(WH5HQAHc{jbF3`DY1E*t} zXiXhzcNReR`D>-%zQ?(z0}b}C|AK}@270it!#jxFZ?1XQjq(Le1$SFHaJL`6F+!>z zz|yHNEI6D#j|jzg^%*0PLz?Tw&GlkM@VcWFK3@CKi>_g$NNc+ERlOOW==wobtXNz^GSO`|{LJ0Kzw~+s7Flu`x+8Wa z;hm<%z2Bj0iej}TaZIO_J@%(RL~8iaBC&s6wctf8UyzJLUA0zRRXwz}K`J4wA|i|{ z1uGak(g#vtksxKRC+8H@{0t_~cB)VBXVQg82 z%b5?KIDC44D`eg*shAGMHgXZQtj+J#RFexvKtTVY_yiTd__sJi*T%i2C;F4|c_Dh1 zW%u0&sHs$UKXSZb*wusWsB5nAH#aU9u znyW|f>JzBF6y-p|%*K6~d^+*s+LAfs{dtZ1y`FxhQK8d)im&P7iAL(#;_Yu+w^(gU z&-2Zg|BHc4qimPVXGInv$sw?f)LxA2>eYU;H|A$5QJ>U{MN9vR<=jPyWVZPzF4zs{ zQ!KyZO^}#|?f<^njD`qBKw?q)PJZ)*%x`BU*90A8@qXvB?^^{O2ch5|RKUp%Sy_U# zg9K{HA4-Ab1gwS9e(Z2V$ot{4p@!TM5I4K6kJkh%50MsT!K43eWpa=_sO_Q zm=l+ZeE1oUGP57jM|14Fl8~iqgJeZTaKDqu%RF``sJo9RfLFCpQEtOL7WK>8uWbq| zmfCAP>K#T36lJ_`FX$t&o9a28|x~@ z7=EhnJQEHfgOz3Izn^Y8#)@hhWF6v#-C42cohYY{a;d#&H5CJQOW2hNPr1++*WeSK zl`1zk?;9EtEB5>$-4;HfyeHO5F0{&~9QHUXGR#~F%A2zJ%Z$4J(Us$WPHUdWpSU^_ zXRnBRxp)q4_<-u9BL+?V?cMuk=ua)Mav0`(qqN;}asK!;R+}uPc8gA9ZZ5_N8|j%F zX;JvY#%=YVmB3GYxfw0JX~9dE|BMQEG`Wl{T|qw=*T@^4SZqSlKKS1JR2w|s|2K*S zevdlfqJ8rv8HKiFYN(|ufj@eE7y^nvK1T>JdveF|D&_m^|7)?2Y+rq-wdhP5*)dTn znDIg;en{X>B=?6YEY%-#V)s)OL0l!=?1zV^Gudkom~EQd~n$VV{t2FKHHga>Hr0yGpMm@P>b-PLBOe*$lchB$^AXtv1u7@xM7p0N&ku#=<@DQwpmS5N0Z-796y@FSQPsde=GMe!XOxc-6ut2z}ONCNChO0a>1e=xR&LB!v$NP zKF{xPOXW(;qM~nhdHB|e-6-LQ&Gj6v%cnDX3AnJbS6gbn#@j@BZ)xSBO`HigIsY9l zbJV?ETptSJ9D0N;C1PB4(=>~;T$c;~RPP0uW|v~*-b$idp%!YXlUHuo{j=K%C~_+g zx>5lv;(M>3c=v@j+Ogw`RfB@2J5yBV$j_JnscK8_^EOD!%jmpE7Jdu%;PECp+Hf59JjkWg`+=-P9Lu zdik7g=I-h?Oo7jULvLNQUplAcM_)NK85NZ|9>f1PA!Y60VE_BVU0DAysOO;r7BL86 zS*&5Jq;-pUM&ADQWR~b?%$&#ANVVCRl0=6>@nGWG~~7Hgpaeab6bIFc(HmA z%`~D7W0(!t9_Xs*oEshp3c-eM3BA)MQ811vs|(`w@O!2I{(&x2umZ$^}UguI@mAy=pj z(f4dkf~^OkGDhuYB?&Q?qs#p)kpp717=PJEe)%I2w;%TNf(1eWX+B7|W zbxN_cz49Bng@0u`DNXo5--y%he7_`o5c`V}k)_{CW0l@m?D5G)ich1VA%?aF9!*XD=i zNJz_t&euMS*UO1~AI=t$p-6<2P#EMj3QZ2pS-(4~I&7xR>!wE9}jhe6QT zWqlJ^zsaQ)qC7#z4&cC=$aGpcXZ!c@U=sb(s8JP_VuvR8UVmIHj|q z&?+8JKCvdE2ByK%ipz4#S0GYb4|jXufvfh`drig7A?%-x7=r2Jf40;{K+s4=z9|M; zrdntA<(WK0!mVfnZq|KM4&6k5;fPZfDWU?Z2mA8_qJ&&8E*Z5qFU4jiW!X;x9tZg` zAH(0lY{iC2hyVLEsB3MzWy3$w?3`!ImG-TyDUP-#)=@4$IblmB0(9c_V_fd{x3oO4 z=Y88wizTs)zOIC++PHL4VdHf(sv~*O}h=GtXpq4)VTN*tK zDmXf7`qeJhZM;Hn)RHlZ%2Q<+Q2g{62=di5KqAaD@<~6hKaFkjuGnYIm!M`w$C%|o z@vfpoNM#xCSRk$kqi?IIEV3V7B{3k*Z}1j~sL!r@+`AiAM_()NzO*JXGbayfyN_Z} z175>W^InWldE!}NrJpHy!k{-{s_1+4U&V)onF^kgME%uVLwp41q9K=M-41LbPqB9R zI(rExm`FJk9R-ZoyW|y$umu?G91f*{8%rPuwRC#TpVoYE-kp^VISw1)o>BJ@uJ{p| z-D5Y&J0`r1?=#Z!8Er$T0P8-uHn@oZ%b{$#7x55UKU8a%vGdC4j+?kUnzs}WqUE6f zDv{+T70^dE@F~&ic10Q;^)|cQu787t^}rQ4a#YtLrfq5VvfOUb+p**oNOHZKl8NeM zRx~FcvO&ka=%Dwu-QNA;Bv(ciiI7b$>=*k$7W(Rg9>H_f!l7g4DPTs|W1zVB!_ zrn@Ax-^g(a-8+22>Px$pBVuIlt4Rw;bUmKzVLmAN(^#Lm{54-3*D*GyGJf>LMoF$& z_TJE6wz1pfY$Hw>oMy2%xzK>>mvfiwPHvHrA76Em=dZfh3l(kf2vin~X?Ew`dkRxM_yc`B~Ee z+(^XP7)Fd`4U8U`5N^{inc;goydmRQUf8je|G+2+Zw>$IuE2e!n|f6StTjlCDL|*H zfn#v@^w!gS8_n%#c2$1~DBZI|oURx!h(1WtfJ_I*w&^Z2NovRus22+vW!H^~R>lXi$sD(VP-|@YdEE?+>xHL752I9wJ=)S}fib;hk>WplR5Ng6`Tr$34-1i^Iuil)HmO zC9A6DqaNsLzY6q5e+B#D8b*E6^G92ki(}X|l`{i*u+TEk&H;-K4afkNmNQ$moBMgP zjaSGuUNpG_;QNuVfe60}vLvT8wL){W^?XevZ$YXE+Jo~K^xi$#J2JQybKX#!bFCfx zhJ*xL0(g87oG8{%oecWD@`HKG_!|G?m5oEI0%_1{QWrLoA!+yw zn{%XnhZkdZz$*^rnQ5s1DVjX%lEMD8!lbJXng_5FFriHcQ7q`NKF~y2b^ClZH2)QN z)U6*33D+@w73%2sNbQs^axZs&OezD5j`utyEAMc{Ctk0F6 zVnoyqE9avvJ#N{ z-ZjthOT^9sne*pMNDfX0AVs_0doA=fc%3Ar?9alQC$yFxNFjF}5C%`^iC$q857@K3 zpwY!4>6;=7HRhTEH)BE`zVxD4LT!3QF25p5ZLQ!F`i@;@v4s2dJeG(Lwxl9>o@TA~ z{;Zo|{Lx?KU}yW3A9}XB4*5M8LfSN?Q6K>kr;({&kaLrq0Ghvw+Bb9^ntyaodGTJ9 z;5|xQ6As;ELQfC`GpIPDTIq$Bq9M|#CBe-sngLRovAECg-%3fK^gl`jl!EL}2+%VI z%LGc9qythA`UP#tmPpyyJ<<>CmQU-5$8Az8EL7E>R=--jYc=eCIGWWKGnsa*dZswzdVJK&nNzo4R7FW{BH`$1 zUa>y4Z>`|mie>nefT52jsUrVI-;Rj0JW_81t!^ghr5&VLfSg$&j0EK^n{7nq9%LvI zvii~Iy=8}KhS~H6UoV}M>hjf}t2>+KDWr(ovPeh6wMU23!WI6I$MkBhoY3;()V-Gx zY^0gbq4y*Z{HU@)Ds3)??m~+*SIkKt%ob9QB58$IQ)-4Y4`1C|U43y^%_}73#71|` zaOg;9@w`q98$JuXPwk-aJ3~FE~hqdgnpiv_F z@YhdUO)>i}2WlVn!MzUC3!u1pcvQZBL1ivX)0Bc7!G^QeKeSVVR`+{VkZY?07Nx?E zVb^aQhKRbA44r&g0T6awi4-Ar3-mS0pe2!uBF_p(9FsBb^rMz&YAmmzLO&^S`GOp- zbexw^yx;gvbb=mvLfOzezOZOq^83kqJ+P8@=kMVyuP3DBrpCAGB$)W+ekBhxjdGhw z7x}r$FSERVuj~b!9A`h)K9A7t8xMS~9sg>wEtiDF{;QlpZ}&7Wrw|%tL~G|gSXDqr zsN7NGa#vZoDE+z|V7RxK{u-T9(qBARi762nxru?OvZpW1QP7`1leUaw%30~hNZ!Pq z&>`l8JvW3(!t}@8U^w_Xb0>7Ar|ZZ|k<#Nn_&0Pye{!mBJ8n~M{a5`+?NB_4jE^eW zeeWMG_bzry{m4a10vltLqp7x_2V&uawSq)-I5~}Op%c0^zph4uY1-}hbp~qAbWWbXL+GJXJ}vjdz{P*jUtSZZ*4x0G z?*E~dLe~)CP@d(cs~6}#7!HlQ`2c#Wy#5(85(D16vaz05dOf%%LIt?@3E22ZE|buX z2T2%6kzoH(l70S``J5rIODq$ zQ4Ufb%b;{e%h2YtXZH@*q#dSx8UoP}6~QFDi={QQT|eAEHwQo0<~uQQEh=a>G-AJV zw;8&1CHREi5B?JszfGb5Se|l4+do?-b&*jH?6PG6II#C#2PKC0U}Oqbl*HjPqu}2J zt6@gilo3X(Wi z@=e=CpQ!Ga`sKrCfT?yqn``ZVUr&M3W^fS(QIzredmDBhlr{H1jz z&j(elMaKa%@aOwKTSR(=HYF*a9NZ62cArrHYkS4pzsxZl1U3H{7htfx;hI8ju504l z#j|Mf++)mC(|M!-4zj)B$QVf?*98l2Ir|tSqkrjMW9M>02%hXrggBdsgEHy`r3kJZ zL(z!+Fp+Qup}5sTNf}D*HN$fx zvKD^CS?)(mlkYK{=Wk;DhG(v)#JChUWunmMglbivs=R@bN9-?A z5C@5%Md{N3RH)HuqLTpbziS9ff(l}s+>T7j^hOR9v`l_x_%zuv*X~qh!(XIgD`U_x znAwL$DvCUa4Lfc7Gao}uT>W^gE3?Jny93q*=gKBVz%)o)yQ*$zdM)YR8Bowy1GU6I7|ZB7!AV0a<*YmZSlT~Yl=g*UgnyKU-+nzNtLA%2iuKXl!1gx7d7&;u`#kcSu&>JwAn zjbS%73kJ47x+)gbS>8OKU|gH(gF|GxlvEuGgc{=%j5$wbX#mr03b>L+?&W># zkAoZP(L>F)mZTkC>{%7wk?GnWc{c+Z0*iut zqApeN#Ls-70F#4dd^KRpS|@#cO(Sb`#g0Q7#qe?DD`Ek|tTFSfT?MOL% zs$$vV5tP1BqSjzemqhF6d?8ghgSazYY2slLu1bvL8!C H^}YTF^FEr0 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 52a6d53b7f0bb0f8f81d3f49c825d2a4aa5f5eaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1997 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 MeU_If7c=ntKeBMVo&W#< diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 0243d6b9995f6c2447dfdd67c8f46e27f89913c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1986 zcmah}32YQ)6rRcrZBqjkp+d(gD%b2Bdyl);(%sS(wq4r=fpE>v{Ii{OcV{~@ZMT&} zDQGK-)J7sI215~0#Gsha$`O=HQYc6fLj(bp777#rp&|tT*`wB^iJR>1{BOSZz4yNN z{#WNIn3^(l^iTvrQe63tBKV)CeFqPOznQllvIvs2Ld?zexN>t*k1Ppd03gWt)_3de z`QLd)tSBtrh~cRfX=R5!>n7)?m$i)_@$r<+>2u1-s>_)MF~4Z;69Y~!tI1wDW6((d zyfJeJIYYJ$6mg$H2uU)Q@=;BKPKz(*CREN>XVeUYxvaJt`oJb zb%*fLtGnwvKW&vhTsd~wE`QsR#`d}m`+eJMPNfP@O?&1eY?auY^I*l+*3s?wvFeQn z=O{NvzIN;25&E?F7Fy?=ob$<>-ZoF(fYggSG8%u%KiSlFAp7cHK;H7(#F~08X-0>~ zmff9s|JaYZ=}+G;V25-pE<5}7i|CGFhR$t&FTUD*bU50bJa<%Z>DNgui{6X7GUgH^$bop<)tqX5F*0JE0Qo8Qf+ewE#Gq+@%KcDva zq@u1rbzRpxTduV}JAcXQC5XIT-qh7_y#n@SNH~ACf*`|Sr-r2^eV(>Qc_iW7*H847EiV$Pff7i$;QhkitalSd^H7&zhOQ&?rPLwPUl~9yC{y0cy}0 zbR_PKh!r#jNl?@#^8!=k$cvM}lN~Ej)i6U4m6escO1(~!{RCyTS_zUSXc~tIT&W7F zYy=M}Suv70jRPp0EQVE43ZWV;>yye=I|lQJB^V65-979fC9VThgovTq<>PYLF)b*= zOPt6v(MOszS@bjqaJ^upa09Dnah9^0aE=qK02o=yWT6v0u8^X#Ar5FfkXa`}62a^< zQanfDM!ki{4YZlWS*zKI3$%f>nk{B4O@f4fp)A7DV*|bO(Rg^sLt9O}i6>c{qm5?V zV6<3pE8xwzV75Yji@|3!=`ob&m^?`ivan@hko5y19P(qRrYw`=aoI6iN5+qy0ILcR zYRB9xhZYvc&0aAGid9xqjxw3`MypXz8AyYfrc80fOdu<8v@|Y?)ahaIn(z$F9V*Cb zQwLq66*0LoU{y)>N>ad%X-S}(Pwbr=-VL5rSqG~E$VJk6hNKuu?94qc;hKA6u-g`Jw`&SM`|V_oEn;^)khc0TGRkI>U0Y5)`%q@L1f)m9QZ{ zfV%*WVGJhr(Q2bW83dl!aM&K+VzB_TiDwi3iX^C&tPFDeP&FtH zoVutu==fMWCM1BBB|y^}>VuOM-iJO!uVQS3cHw&$Xe0X4B8Ka=D54xOE8Ifx1pN|= zO*{20M-YN4$Z+*tJJkFTuFZOvBgbngJloKj@(P-~d}Y~~J4*k%+>=dbvOHA}?o1nf zW&`0%zF140yHwzsFz?bHr=ejDX+AD8sU4~7E$^qU6N-|~hJi4g;T;rpM z?Jd6ybQ<>G>)-#Y8EccT*gDRvU$XZcFE}qvJnH{>!p(dBntN?qTQ-mC-Z${~FDrjY j8~#OS*VP80Eu*&9whvi#d|YQ`bg8?X1&(b~7B2e-AZ@kK diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/eternity/ingotTriple.png deleted file mode 100644 index d2d556499e5f59ef2f5bb45a1790d4b1a128643b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11952 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotDouble.png deleted file mode 100644 index e361b133c172cb39f8cefb45f1946e33859726b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19607 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 bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuadruple.png deleted file mode 100644 index 97f9b4b8c13ff3c80af027dfa4bfbf57bb636003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22175 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 bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png deleted file mode 100644 index 0d5871d7feef36b1b30d4ed20963aa1c8148899f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24185 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
  • 3H$EYbUX-noQW1#Z8M74wiqf?#l|BY1BIOT$X5Q6Cu$%nN8=+uXpnc{ zEfOH>Vy+ltskgFD70K4z(V?9kxI3!&StcwE@0Zu}t41*~n9uK8OHA7X9{~yZUC2N& z(Bx13pn0(hcHMw)|BmF@5UC!5rqT;0GQ96p?-=E%Nq)w>0g(A|`dBUl`?LXVGP#|ClV`N_3gc-F-q9$uK-+A%nJRo)b2nUfL z3D!Z+{ER1suUG5mo^IXn-zZB27C@P93{i*mCa%Z8-04u62c`uaHl-FDzx@?scf9=} zJth4ffjd`9ZNdL-Nj7lGk8##m+)cEGsXyx3-I51u{TR-ZVE!&vqg47){y#UA{oI$) z!I%gJiZM|8ci-@jc9rH6ADA>RjJ?tA|PivdyTY15NLA4T@t1qllWbbc2 z4Olnh5qU*6Uk5f>{|R7&b2{;G50TdcXq`?`wr7u^;T59O?D8Z(TwM4s_dKy)lcOfx zbpPw^ArZp16$XO%W|lBJtq>uS-1^hBM1OB%JrBVTCWF^|HvA1cd`ja86Tc89$6fUeHi^vzFZ@Bdz=nqD8w@wIU--FE`{sB1h4x#bk?X({AXD8!Ao*pnIjzz_ok>|{%L&Xv` zWuR3(RSp)u>@LlZJyb=_rnM$=(W|S829mrzhJ#gh(!#1a_Y4$UsN>$N7eCVOEPnsu zZOB0|+&s5lf~JtWo@y>r-+tCqR!jbD48@H8|0BYMO!4vk%O@|we;c-80bZ3vrj?Gln6Kw){1 z>Cw7*sus}#N9TFsjw5Jxk4d!)9%2ZndLXqDY#4ll^!cWcYnW1L?wkBu4a%e_3u~ z8+g@Aoqj#un+8rFS;zx79R~sr-ARfb#>4q`@K74PV*5%!GOcOh<|i68_D)s3B5!#g z$6m;wyZYV~rn4b7<}?B`I~3qtncX%HA+)HNO_`ZyX!DkSi^p7oiPgU_$+ z;j$kT;Np%y?STM(9|rY-aO$x8YPx z%94e_tyzG2VW?ntXqPb60BLPC@477nLhjVd*pkpBnywPqdw diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png.mcmeta deleted file mode 100644 index dd8674956c1..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 2}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/hotexohalkonite/ingotTriple.png deleted file mode 100644 index 57fb4042cacd76665a4861451ae1bf3ecd6806ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21013 zcmX7vXFQwl+s0`SJ8I9wrZz><*n2CAqV_CG)rc)(@4a_xwPveI6|rgUJz8S#5_@~{ z`#-O8CvWn(uk*UjaU9<(Mo&kTgpi&P3k!=xT}??J^GSw<1xUun!#oLnMzdpKz4)W9 zByR}AK4>GzW;gcUx=G@H%J%)&r|KcoFHQe;Yd_W2{;PfK_E$lH+*FPkZf{2xCmoN) z_7vr3%TV9GW$h0wN{|Qlxx?@TX-{Zfg)$%0+Pz|qDgWkPvt;=9+hKtHM!O(-q~%pk zK~BbW95vr!Y~7bntRioF5~2fwFG5CQn&EK;Q?K13XBMpu>*|aIxr=Bb$O+b8QqB8b zbnSm<{k%oIcKOrL+W*XOC+Lj)>gI zYx zhc?;#_1WOGz{RqKURv>UnAmW2%&!SS^cYz*uE67(a_}&>6R7hvNkvgMqWkp(lfX z06>J3!iJP?0?ko5C<@cykI>jd2VSZ2kFXC&@HzAjIM_3T*2|5`%+bGRR|OgJb-pQ0 z8-9|X_7wgd(Wq3~1IU3fw|VS$LDj@~lGpHtjQ^=>+ENc%5$42gz_*%s-&IzC9HHbY zMv*0T;+a~D(T^qz)!e|_QMD>rxDr8UG%qf)AiPvO$5vhsj#l?=ttfF;6VGfM&_vwV zWG^YEv)k~HDRLOH(CLHPyZCZW#t45W;nBh728Q5&Pt zhD)xikk^a-7;E`TDriQWZ&J{cpaG84BoK`-IAS0VvojHwJ+PBbBm{r-ogY^de=&@x zo{#rWgJZS~H#js`sGAaGe9XM^Cd^SL!GsEA^H0UZ_8q04p5-A6XJr>p4)BXof0`{X zaa5&;w9%q_U%Y(3cn9&;SCE2b96mVw;wRB(qoakpJ9Tn1rY^mirogLQzCg^ z#vE@!eS`O5z+=9=^EYrHk9YovN?Q*=vaBTW8cSx;bcoQ+i}7)V!jus@_e4%%zUQyG z=`Y1!JOjD{F9VI67I<&6Kn4{KNuShfa_h3~jd;9d_SL%1&+p_OWrv(Uf>s`$(L3)# zDW)D?2`(o&)WOBf7~8$@_Fl_W`uyM_=p7&)jaH--L+z^j(b?#Jw}@Cgyj5j1yUj;+ zE_@+s+p!;?z6g+26#EG>_>S$*!>JV6!&SR--PU}?Ci^%d8(1s*fbXB6P(ld4T|T5} z^HK1{q62icNa|^x(nbYu;pIz$Lqj^Kj21qmoyy-sp;l>$5`Rqm)+N?|^4OMD5gE51 z@P+}=<;5uYj(tcB@O8j*UKlEAurg_1zVH-oSDF^N3}rvx&tvM-FjRS-Q&YtucnZ%^ z>a8&%kToMok-^#l$Tf~t;?6gyN0V?r|4|Y(dlUPfk8BhMcKGZ)n9Krmg;1)M1PJ61HR zTqLOe$3krT=}+!IqfirTu$MvxJ6nK{sXi>J_VdMRmdpdIjd88@eyzLJJ-S12Z-RDc z(_x<@o?ld=^V(`x(^sB}9{!WG@!KD)4kUS#&2X4yO^2+~`JTjR0c*bl2*|N9&+;+z-!>c}dfKZ<4JkOnFg zQ2?vp=*R(1+1gk2`=3FD=IuWkeCD174k7M8SPCA6N{lP!wwOZfg50JweAZr z8mJ;@a~>vR1+Gr0B@7y~bM5!~+=c|?37o=F*!-hXcF~{5wmpBcf~$)PKAy`N!>w22 zGtgGNL1a#m&M?y>8W+(EyJsfYAac`i}8XyTa9jx9dRnb$~WF2yg3M@aK> z5OfAXOLudlpvku-{{j;J+>UYR9}=A=Xd?#3l;h%U!ArIIuQDc|dJ&~E+p^@yb018*L{E(i;JsM9RRV9xJ5ksgO{WM!ekyMC^K-p!2E{K(=k_ z@(%p5oELnBJM9$L_}(s*va|%fD>^xk)4t%V-0D>UW@cusdPMY21^QRgGb5}|il2~I zbO=6iE;KhY6N?9M##ijFzCR#`Cljr~Dk%W&lS}ajIpq=R&cgoziOx z?mp0*C3hdyoM{=Q8f<12dk4Tf&0JhrnUp3{1B|^_cmZ+Uln zLr95?vlXilk)#IyyICvg;Ok+t@Tjg4yc?p5*Vcb>hD+{Zw%{G_TM;npjA?bNYK|K7^^3%Xjw~eV$le`D;@-_haFhFCIM-LA7Xie3`Zz1obnD!O z+XUJ+ay$Lif{9{JfEgc)|5*YS)jrH5$vN!aLWMMuPl(V~J}<+iMPs=v$UzDOykv>R z?ekwbKvT%0SoS9>2tVX~ zSWpE)@1^`9^?lf!TyJ4Cuot#^dPJPw=x4xf^~MM165Z$_r8L@ejmiZeP|WMuO*p@W z36#P0m8jb;ebLBMSx^Q{Zwkl(hQ8ZxMq$%9faB>UI|2VzRii{-%&DV$#_&L_h40j+ zp1K{=#6q`agrmqou04p>H%CZf?i{0=6{G+Y(WGGUljhJVSK5bnhkvtAwBTzoTv`1d zbh!Ja>Les-AGrG{x;rJUo`e#H$d?r}Zqel4wjZvbt81|#t*zRWfaTF#9D-H(f%iXu8(JxobLR$iW1 zP2yq7-;4e?ErE3?d68^|uEH+dGdNpT>34!f{pskR zG2(>8SQ!Po=*$7AlY}V#;1lb_YizB4TqVJPB^WYNC{|W zi%@zpcmn8HD3j=v#h}H!fGzq%lAB}u?I1^@*djkQ-#~lpppXGcs!z6If%GRjn%9876w$$3P+eqQ&018Qrl4G z>s3-)r&#LADgAn3+;blmrRA5SAK4m~#g>cCx{YXeBGuHVpC7`S@eMED6g%eK<++PE zDN5CcV;)lq;ZJrTME9Ir6AfUQeg*7r zs=dk(ku}g8=F~HWuTPN|1gCQnFg)zK!-9(S={KlO$Fl#(d(i6$9&vh z4ut;{H9u~7Cwt3qg}VeLigz*l)Af-EDiJG15y5Xq9|ukbcGin@;^2TTv)_AD;(fT3FYkFrNr06CgwZTAgbCLfYa% z^-%@5|F?$wIMijzCZi!ih!2*$jP16o{BAE?0XmRlm>t711Q-`|`lvT?!jc{69R{q{ z%cqo8d#l7FL5budeW#}bzkVcgU|4ux5nk96u$DOaX9?HYkM2|X3e^cx;VPn0J50F& zJ_#w_3@W*VS7OhG$^L2J{OYNFd~{K_+l^PzrXR%Yf1tS`&mS~4Hl1i6&_4qu3t$a8 z694r~ho`7}O=q=pISBiqWiY;@W)!Z7T@9*Ue>QnFH-y-RV_7{A?O)15y6a3lD|-RD z<;5T#*wIYD+s?rTs!qUrIU4#BYEWajgWPL*RV~%}@s}w15kBkoMJ||!6<^o@Q`Gl$ z?3WCT@#cf{nA745obg~?1)iY#`vBRbQP$;`@^$QNIhMc^EA9ZCwN5_v-3D1XEpXzF2=2>Tb3{0p27gYPZ(xh@!@kkDBTZ0D@IVWIecm68FZMvp0 zn&2UO!@QtqjoGc$psBQ^5*8EF0QXE@5~OrC!6Og@Bzc~jfOAHqY>sY$4a?L;1DnyDig^rhCiOW?MUn8oq{5#fD57YqiwPKIV)kfKJH&Y0UXF8Kq$qA8p%M~d{U z>$rzrOXGEfLMCHMUh?`K8GpaUS#~K^aK93%w!EjkfBGc#4Y;zXoyb_j@6rt^!EvQ| z9eOBhl3dq4zxOtL4c;9F3^ZQ8xK9*Q;z0tUTG;L0~Ic61P2QqZ?_EtQJ^4q629*%Ouec7%iwTDDFzPRLi^~ z8ba8p{=SwQ(Z6N3K8)%e^LT00l}h1cR({#Jz-{A=P?Mq`qnSZQPLm%hsz!lwT$T_v z(1xk!mYLhVHfv;wH*ev6*UV%p{9xjqRU1EXcK98xvZo1X(SUCKd+)nH+fnE1viex8 zh-77jj=za9e*=W5r-}=1>DHBM8v~b|OAKr{x!W6?AeY4 zd}^}$RvgR{?HEP#<|Ool$RQ4o#f5vn)3Nnm4~2)0F5CKB)yW^>`u00BEQ+6Y}?tLsbEcm2)bbs-O5`&Q#3%z&4bJfv_M z*VWD?>`s6%Jdqhh3mLl5S2N;l8%1ZG)^|NP;C%8 zK_&iC9JrsAjr`K;!4E{p+NVyPr^@pE@7+USeh) z?`hJ;>a#U{7!uFdF6B7EQv>eD8n*J?+scM~41C>$|1SO&hk5Oy(D+vO5HWwqYE)h( zTQgH^i?Zzg++emLlAnt47Id8g?D!Y$;Qe>#tUbe(?1p zc2lJwl|0CPIZ2zVS6r=)z5aCFft!`XX!-VYBli8T#aVS$_865a+sVSq8{>RzlPZI8`XHgyq?D)f)dY$R*K$Y9h9ii4 zx*z<$MD@k@e(fRl1HL$H`pF(;*YZ%s1fGKsy_($w3Kau z0KWV!&u%Pb<{C9EJ^T`yt)eRup$#?3Q(Wt!e{(GNowMN?`JW!Z@2U?+S{68Z#c{M24QAVCWCr64ZkB|6}9I?Mx|EMCeRbG=4Gwg_!^UY^hEK9z1>u(}()VWkV(y(! z3Js_p|EijjFA)9vz?2@(kUS1MC z?|;M*BF_md@GF+$)C=?x9y!VbqmgI-kUeIVaa{c_iK{@sy6T|K z6?5T$pwWpH-a-{yo)>axD6nc_;|B|aD*`2dd!AH$5ka@^>x=9N(p86O=@~CSrIK&& zkCF?p#C)X_m;wzO?E=zxWA5&Up<~;w&yvjlTio3PoleBl*HJ?6Ph&J^|7)SUQSZkT z(1^Gd`9Vum;oxb}Jwv4>64J?o071C z7bA!qDT25?Rrn>lKrArwqg9A4lZ7zo$JdBUOgW3a4@1Fi&4B)Qb3FjxEt%7P4lQ%b zK?J+t=-d9spADM{5pLk>_5|;a8wEwsY)XemB9Q9$Jjw*}a}Z$uN9nb+ z!DoN_Z~pSVP%3}r`z}EX$Sv=de3uRO9wI~%ESfV^nFul5LzqI7lV0=?eLCq=6g_n<4XODcrFF4pIo0TKpb3n?Kezo4HyH2lg%Bq@ip>H6C(ES zZY_y6YNSxO{p!N8*YftjH(}NoGBsSoZ2K*GK-n+2)A>b;m!k6{X#^@k&Hky2 z@HavA&R0g)as&b~m-62_n4^r8Zc(MT5ixDJuilT}hb?WC!)$&#gshNI$#T<^{VLbq zG(TsOm@%yZ3FH84j8ECpGX;hKq+RBOAXrdsO?}_2Ib=$Alx@SqbrpL#DSiBm=mZ%! z`r76rZm@os-&iqr93l&e@IAkmY6rzayk4-Z%Co9Lv$>B@E&hO~b|zhxYFhGLokrag z``u;7$e|05D2ik=ZsE>r=9Pt9;3jdzug|dL-8YK4iQ1P${y8$-Ti9C+Bvqh3lG)fd z?yGPC`NH!0qOFFGexXh~8&8#WnjwStw3F;!J3h1sy9`Fz;@dELYjwWEq(npw6`tPH zVCJaIPIS*3@cP>4qoLXrn%{s75vD2*jr!7a_6$J>Gn0w7%8Ws7%fpPjj&W>b8l%rN zhC}a5j6Z_}axrq53^1!2)SP@fIJzR10HO4&Z!LS=z2?7jkI03h=)LlD7bs;t*dlSt z9)9^*1>a-;5!iZB0*XcVc!qQaOiO1IP{EMjDLJ?SGo8?Z{m%EpkwVoc$DxO+QVqFP zW59&BT&V@dnX55*FuhvP}JA(WOKtcM>ebbftQ+&Ud3 z;lCKgyBebsNEg&VxwI}HVNLVHpM3qLCYlq}6wO8LSHC94vvt+9(+@5dqoPOG@&e#$slDbuYLLD zK=NL>wiFWPv=~&r4EGwGx)kR%Gfo~~cTTK)`;`v70i!bb!VUW==!}cWoW6C`J4@aW zk<^exef@s7tBe_8uB|$oqi-Mak{Q|7Em*<;I|zoiJd%Glv?OFf&11i~d+vZmm)y|x zM}?R7xT`={hL%lmwL#PJ0$a)1r?8ItfO8i1w;eQl=Sl8NvZ${AMeio9BhF>%PF?GY z7@C@Hb@!_udBFuPA+B(L)fJcquP`8=dhn!K_{b>oye^WBXJy|*47B9Q#waUAyosF@ zQv7jfK(;k3Gz%saLa7Y)5|v14U)6ahn>r!KFMK;4bu_pml`nn6O}+H)S!&3g8>$*| zY)YMPY4XNg@$I2%vgYWA#ZN3Ive9>n*u*uXa#T%UkzB%cGAc_y$zQS_CGy<(Ovm!28ILd%2lDRQ#?K zM#ijtA2u;(;VXd=1jN~rPLYeaAWxUIXj*I9dLnS6I^NVrqLH^nYJW0d$=YVF22kUb+>E60Op>QaMZ$>|B(@&-=lY_5(*!%O>|Of{&_@wg`TH z^u6=`Q5;dy@7Niar5KjrVC!y6d>4^9%Yhe!DW8Dvs5GFo-0KXlAfi2~YW_Fl2AS?d zX&ribz^P4b5_QUx1aXbHBe27^s|%azc%bl=O51P#RUp3(1G$&JWAHr=d(`wHo;Ytm@k!9p6Brl@UWY6 zQpV@eFGwJ1OI8JkGcTAiUBv29n+zL!sM^9BgM^*!jIUw9vcM0&u8VVli_$#+%!KoiJ9vynEIE-g257uWb;9hZ|Kgd4 z^yX(6^Ky7Yw65^-7Az^Lpw-|FL*Zb(5rnmf z^CmnZ*I=zn671C^X7lp`&s-EVbtRd8V)dtqVnO+&*aZ~dBO;DQ&PD~=P$`4g`yC#K z?D$oUkyj1p34{ST-%Pl06$+-8bgvgp#4nxE9~aLQ9)04H8hR#zN%P9bw@X!YAKyM@umpmx|}Xr)VLvhly(U)X@HY2e}Ip|7>X6ymGhuSAj{Bv*lL?C4YNa$NjY5MzD0&&aLD<`pMKj-o?XG2Tk0YjF?a^D;sM?B!c*4lz+H>)A3+ zshdqH`zO1&hP_+Yzu#kvDW6}GfXyQds{2L*IIegx98c28)G?R}v`Kfvzz+<237trZOlrCltC*4P%`EYpLchQp7#SXbn|bF z|5YB*a1L0)T!`mhfriY89QBV-9W=MNkQ<^K_uf}~agj&nqy2yxpm1!BdoN(xS(xR# z^C1Fz6}vEya;*>=cA?9%|5?>oM2)bGpc>NyqvIq0v4Sk^6cl z7UHDtl}h@>OmygGtuoGz=ss*+No$0eA3LFh&m57(BF9uC-+-G4;r_Ac*L=0WFjim7 zA`Qc`J^L%94PtApe+2%=rwkqVKF4Cl-os9Diq0zeY$Uo#Po`CZ5}aCvt3PA;^G2~? z7Tb>l-(DaX4XuZsFw>W^V46Kcore*a&`oa=%b!AfTeiVE8>2~~UuXn9RL@iA?x@qZ z5mlB(0UI#~&RX7*?o#*ZJ)>dfN5QWu1Z}*X=$j6MnS7#Rn}@@w4Jca>&#Vs0*5-x) zmXEGN{-8R0-a8%Tufd)9aj0n&Ag;X#Eg>vFB5=4>*tcLZ1qd1F^sHt0n)xezWRMx} zC%@!|!DusY0i&`-))YG&3Z50)&<9t*M?9}h_c^58NXt_ar4FfVRi%DZxa z7N;JfU?RZQzdWlzr|;cbq4EkU=Yx=zCgq9CZe?|Wh)_>N5^YfjJkgk@XvTG5+Of}R$~@< z)?%i9VvQ9xMm%m71!%7e?wiWufv@BHH9r>>_V0HdNL*$vD?g!>yOz5_j8gY$p6GcM zt;HDsyJM$bvOzTz-HR{W-{acx6WZTCw|T^M&!n~prH|qA z@cxTm`26Z6F-SJ*+>x_VBQ!sy*K$-h$+}O;<5hf@dYhr4(RePs{Plq^>#eb%Le)hJ z=vm-F(RfOwBC7L{<mW@^)b4ZkXZCSYvpRrO*HQN6(!%3L6 z2T0^%&53AYq=<4@YJQM&UWc*n0M>2rr(M(*DfxO0rv7f}#dGzk)krAPt(U%<5^Ev* zd*d@eAZtfBmjPqGf!`*Q4s{%{ZO6GB?Qu%I!lNE~(p;c(WdoHbH+e*83OT{tA*Zj_BOOM1DRO`%I}b#% zT=u(xn~f-VO)JBRGxN$wS9^At*Fzfq&F+eeY;6CzoLwdF zC-O=ZxBqd-4O1BKOZO+D5bL>H##N&C_+Hm!uy@q&)5mx3as*&PV}Ii3rVCI{R7=o1 zPGmeg0Ip6Wf#Xnh!w&MOjUM9C|5CLlNTr}cSnF|!SV^&qNMx~V?~h(~VwY@Ka@7nb zp?jM;XZ?;h@FAF?D$aJd15ZVraEHhm-_cSTiD^ zRz(O^&$Qqhsj;muR!4Uea+Jt3nT4890f*t-Po6#-TH!N)x<{MTi;PH}=lpHH9bwHnHy{s z0+)It0`hfaV{A1=9=e!?9FLCsZWT>$!V@O!cSOAxjpTlKW1TNqOs!)3o*6&EQ`rQV z+z!TQfaCXRKkP9gyw$N!tlS)v@Rjc4r?wNL3BkG#pcRw#E;MKICzSTwETOLHqhknsbL zgAqiLTcA7dWwBs{kmGE!9#yOdy;?-~K=lpLHS_W~q4ZCc8T;-p-C=FH7HPoOoy41p z@5ot&kGv9rEkfS2aw3dT{dT>BN^amGI+1K(PBRIk!3z;(u=$;g5_=j-ULvD*5K%@= zgk~0iC6`{lu@zDgdyBA}Uvh#y&$V*%va)%CKWUom0?Z)gm>UoM*9>(r!77{uN|M>2zdEAV`1#|sV&uUBJ7@cHqP_v(s%dd;1ypz>)k7x+q_ zGc2ga!RZ}=KXd$LAeM7$1TR)RUltjXNaLx$7%2GmyIv}iBO&P&Bjf&^cJSbTAy)PB zgzBrgnkKu|0J*;Je#9@D?VU+Hi`*wnKTKbQIb43>+^bG^8Sef&8O;j%k|IGZxEC%q zOT?xJ`$k?v+5nH0{_D-b*n`l~m;lx3cHVZe&Na5gIf8rYK04@foJA#3EsgdBXtlWr z?q?k;R^v_`0?u@QGUvxL%#c`5++MtMB)^_5#5-Zu@HCDC%(p13Nxhai41tE{e3RJM zUP_h0(%!EU!e9&aX&qLaL2_}OoJ@27B5pqzBwyhSgBJ)s*A6eh=S=I)O~S!e(CIKI8Y&s@(E)~QLk z_;qcSvH!u%p2Wekr=@?w#<`OEi~GR}&Ev9fKhx2W@{GCpW)L;3ZzhGHN4QEOx^V{K zCzO-e`Ga0Hb0+J!Sc1stFEq#EbF7k!A7qUB#u*_rht>rDFEUr&)UG_sR?@ zEqFNxXJJ4(Gtv*4S~0-QX|iUaJ-{YBjZ)pl6O8E@?G*YP!gw}F=5$6`#K%-TIhkR| z>G#+s7&qHa6lc$l(a<(~n=C^MFXh~yn-?3u_+#xnfj3XQYZe9PDmZ}e#UQaD)A}P0 z@3?7k1NgdzNp@2{_Ho+psh#n{W)3L^?~jAP*ah!5eN$@qtbt8&{lB2x)TOLtkgCff z9TE+9cR3wwg||S;iCCU0qp@_;9|JcTEw8v@ZoZu>E&6%O24+i5lfO(e6|=<9j~G2I zof5S)@38}Q3cO(9`}rRD)@*pKs5CAN=$hd=A>R?(a|J_^(KX( zB#m6F*m;e9y`VzFFE^za!J9drDr?J7ojH-@Ed{8t9((VWJj`qgRqCg=<;_}Lj>=DB z{+Y=h&QNJz_AujDtcUEROk#2S#&V$vps4^glL48H#Rw9@z58qbc3Ea0oEH}u-UJF5 zlz=Mvv9-Vji{1Zp)@q8b$!{&&DIhoFqBG0$2HaZco{N9YH2cGlKjV*f4uHr#M7hFq z<{+!qW6wX{-8ATgl4WwVlDK^&zUKX^Wxp|4F?$tw=1e#4+O7||Z1i2-DRW)lV*{u0x3+rtQ0>u=?kcCWC;_t*GZcFx#5Qj3P6 zWLrp${@$0Xm-6G5CNB-`95-=6;p&Uno0z33xK_20rO={;A@z%B(oc~52UUXz_|hWT z;fd=eT;5Dt=qQ-c?3$}NT4{P_pc8-V@)HXCy-h@VATFr-`SS*HLNZZ-A;c<+FeqFj z?y=URIPBATrf7&0)$|&@tL6b&O8kAhCHZvblY(F61uPk?kUZ75Z(fpb4)Hfsg6zIh zS;u;uG#t-wdf@ki%wL6?bf;6>U*@AR28w~f%DGDL;!Q&3W0iB|+a-mlJj9AVhKr69XB8B{VV`eBPQIlfElHROPD2%*T2 ziB`wGdol$jLv!oHZ!2*69>9+ke+J0uM%!_hn8fzYmn(}ZA_u73cIiE}VaHvlvbDk` z&4m;5>#VaM)CO55mVy5{rO#YDaS}S{Hw-4N21S0IR7j2*P|mz$6rCHk*`wdUU{%H! z5A>W|U~Y8rT#g9HLHrh1fEk7wq{ZJ|wJ9C|)Gm3?ERlm4{irtn!xS64adNJf*Q)z} z472z2*1sg5zWIkPLdF~@n0uhgwgo-%8=kht`Me?DlA8et=O?Hjg;qMwY05RwJ?baf z_$q`!9zIn0mZ+ZqK?t)5CjKit9xJvL4?39uw>@U;~QWc(RbGF?O%#7wxuWTH8QwG{{1?m?XCJi|Nv+zTFB(Ok#2 zoahTQ7?wuc2fT#HXa#kL>WQn{Ke%6K5n(2AkM|w7{H^HHv>&%2(1_{DuVtRQ<@y)} zMXXj#4CGz`Oe6vSY+fc3-zn<&997zmCI|Ioe!B45{~OfRIB#inCWG;(iD+7{i|U5E zPksASvX3cdoRb28t?#Y@h|)2|TBV4NqxcfIyGL~|;BNnyB$zmGOJaoa)bOad;~TId z^Ch1S1Y=lAzW`JeN|5B}lBI1=i7{auc^QzG&prh-+HIYNmUFTHk(K=0L0+<|FQ^Jo zjP$5KqZ1=Z>Fb8oKE=bHtf-D8JVNZo%UrT*NYCon+IF(1)ygoTxDvKxj4tyt+je?W zgmw?b4L2>F)H#9>+-UMwjSb_NISu`)-0YlJeIT5MMyCQtS4*8tc&e^)p%|d9T@$KT zy*SoL4>+;PI407Gh17eC3vxPFa2`qO#bLCkAa=%3Z%+0u1_7yZIT*Q4?6F|@Os91c zl>famVeGpIf*eLt@#6M>M%Yvhj}5MG!J1H#f4c}Cw*;-$De@~Nkr`8f^JCs8KO_U2 za)28Vl}Cu^&4pmG=NLjKE6jzuv8g3l(L5wAPk50x9k%)Z4< z+b~{(p2-33rMvI9UnyduGrQ5{KO@IYM;+O_=QwAH`9%}=4Vt-bAE%@4APjosGMFmE zeOzpPc#!=&KIRsKL4|8*o{AAwS*~Ln>vF92{7LZ8Pf%EoPv4@6eTOS95ks=A4L*9( zdZb!Y3(wq7A-mM3(**_E2 zBHbXf4RX$Aw4@fk_*Niom9}|_y%!!PBM}qsapRN}@cXpWc4~Us7<0slhz9x64`n!4 z|Cfa1G{jhXaQ6UB8UjNvT_k0OL&Db~(ls$%LxA=Ns~^jVHj8Jeb_pLrUL{&45K$Qj z)``_SKAg#9NcWml=6B1;(fu9yOW7q}@qsH`@tsncN>t~U`H0%Bk*=TD^sKby88Wt-tL^a{=D{o?5!t-a zwO-WkQz)y`n}3gA|9L;S0mZNMf$58YOPwBGuPI_s!FkK=FFx=y?EX0u80M;g38eCK zZn%u2^vJKru$Ro)zu1CSqfD~wh?_`4$*Y=oc?8>^oxHD?Ihrh#46e6&QT$b9bu(xC zM8WG|B}}H+n~(*|6DqmPeH)PgV?E4quRv{VZD4QFR1=a_AZplrliWG#t83ZFwWnr) z0u=yk9`vVEcv&|>E{e$AF6c<=D6|%8+4u$Ys)C=FCFkkb+`Pw=dj-?vii00P{~=|s zsa;p)8$K7Ax40awHRz*O;Ej;o z#EWNAQ5n3@XlOhBg(n&Bgiqz`8|%f*UeD2&$ukbyLVH$RX@$QyN(B4#R^@+hvt|R` zh=QD2cKoZ|kCa}$_3&w=P5cNfSlpkfTG}q#=O`aVS2`_XT1`@Wsp0(YK z09tb;U?A4lnk;h*Se=MBA)RK%x=O#oPKdt2iUsRf8Fh<_fFpWMk64?|yi+WNe#(y^R0{5NQ2l)tAnZQed6HBSf6@n{)Oc*N9Zmp_4zy+IsGr&G zB^4=;@hxjggnabVeRjx?wt@u_GRj*0_VQ_rHY0h(g$dwq`?hG;pB*WF#qo7(q1|#< zCnJKlw;l2i3zN;vpvyj-tyLUY-4J5s9n;BF{OA81MNL^*(h^X%Qb{4HL_alI;9;8y zZIYa4 zD|8+XNFo>&uV!KnCH%M991;0x4fw{EX_o_cLc1ff#h##V{^m)EEH)xj>_wWB{q63_vj2@Ar%}P zVypO`X(nAF-J7mZ4u5_`er}cAQ(ERIp<~lFi8)J$0PIm$bEQZIH7WTS_Pqt1&&qww ztY6p7K&R+HgSN_DRY~iA@{%!9hn(AJHd>0x1XQg!6?zxZFiqQx*J%g`R@sr}wk7kR zZa|kk!XR=N;YtUC!A6d;9*ya5C7_XhfWBmia{7|~GBG8r{XlK01 zj4u3J)J%t=J*j0csU!-eh}$*&dBL<_Vyj;v{y8ImvGtd5r-P5$4yCmG?N9j)$ac$H zAK#2DXP#o8ARAhXL7wA&uJ29B63QRrbEatHvHWMCU5=euksp{?!k2@3Il)IKBQ7-o zNGLwV?j|P~Zp)I$eU?RD1Ze$EYI7{sl{P{ICN8=Hniw;~lD*WAs&IplYmn>#48bpi z0}@RmZGQ+Y=^TAd<2P1&fS`Rqj)z9po33Ik!sG)XA~E-Y&|Gyc)bTfjpI*m>(a|OF z_LAeIxFHQ@#Q{#1F=4Jhp6nY|)j__+D@~=F$E)$6Vpqs1PzZB@zYJ4v@*v{icPWhy zNdYdL#@R^nrsba&9lwRv|Cp}ApCs#zqTfuy-gOrn2N%Gv;+nC`ua4D==U5kPV;!Fw+z#3( zZ#(n>a2@51L1f-WUt%wY<-t6L;qo}aYjH64Ck0tRH*$FB8xcotWiX8RoW{S;r#SEy zQ3FH%eJ)$t{HfAp_2T)~P---Uc)$H|kgiPZz(JJeHRfv2+NyO_sSN)2OJoFs{f;RO zn>PK75~>!m%j3iXymq9)RGVUGj6H_k@s;W4+H*6e7n6ORvZsh ze%CoFXoy)u6Ati4k-cdDJj|VyqK#O7zvPx{>Hpo-LiAnxG=H@Cc=KFf0C3oMskS$s zje^@?FhfUu_LYKn@hZb(h4-r2gN|yFUZSB|KimZ!)F4h3A$UZRWG*FKxghPdQ9Iv|9*yhFi zWc4c92($!aMCP(FvJ@3)CaQwPKu$%Q>)rTO#B2sIUb-z(2I~GjcEP6s5hV04M^x!6#$qnHNsB;F1O^FtV%yn_hsn&1j6Tmw$`UuDm2Jqx^p0}z zSq_Cf<`J7S4o4?iw}Btdj~|x+>LX;h1)e=;&zBS@(RWVl_JkB5#7Ml`n2wASlI$#E z(?7jtggn8cq3+wX)~ePh6mw2yjUbc~)Nn1%8m$+m7hn88N3vR}jKLKIcKyn=q0OHxw*ly%?-S4zy)Th{ zFlQUPrsbOn$si%oM_@s>G-t?jG<`yr&!#ed$txFVI?)aQGhDa_ezh98(b4XHi2w#F z`2BY>Jg(=~l1)GLss1ntLh?6mUaBdFl$b;6dG+EU^&Oa-Cb!VEq0wiYdl!YqkU6yy zCGk}tQ-O?KtshALTc2htWsn{Uj`8>VQiJvb22z{Jps>qDA>HAUzd<;)fEgA)KQ{Ou8GVmC6<2poO9!V>U(c!n$|l_u@($FA3K7l7%lyd zE=5>tNrIRqUu3Dr$$Z_s{57ABjSeoS!3vI0*tsKGn;Q4|r`W*`UtVsO+bW*9{1pZ) z)Li3AbS97et==woR4iJ!+jqmTF(zU@$eyV_gAdkIdOEfgRnu=! zmg(fl@q$tJTS&pD;ehftC-ZMPLs&4V@P91o%%QIj!$Kl8qvyiA@;$wsyM(Nd7@Be^ z@IfK!-5?Z2!4-1+{xWL~d$xFOiW0+#Paj%d_M)w1V-Almp5+b(bg+Z#tuagw8}9b4 zOs4Swpk%^g8n*Yh=AZVVWpWJAy*;UHY|H4DbN?M@y$#)P<>~x&6wzxri0cB@qDq7e ztZix35Xu;HaY>IZW^k-)eVhm!*`WFN_G}e%Ezm`87;rY}Tf%0`EQeOmG+>jG_Jd9a zRg3|rp?WTDNgID(Vw?=i{|7H~q`7wyC+$fQ%d_G>t7bw#Hx#Ut(0hP9$F(fPk7 z&NL9JwvFR4IAt3uOQ{)Si^?uh)7Y~|ND|p)iy>vkI%Djzm0ek)kUhI-#+J26wh&`U zmPckRk9Ed->iP11KcCKh?sH%Fb^U&S771sI$bAg2{^t*9SLAWcS?3_t_}z|e6v(Nu z>L4S)HC{Gpbw3EFs5fj6j;WIn{980lPD@ zb36nAvW^~wzq`Ii8{>gqK^{dJjff{|Fsmh6oXG=*)KmoD%-E;BaPSQ)I-cs@I1rGS zS?YdQ6daO2`$Wiaxh-?uLEaJ)d4#sL= zM$FM=l{y7IOqa7Nf@g*wEo}OhH9Rap4Q{#7n9J(h2Pa=;(ZbDGiaT>V4vM#ncSEyk zRkGCchpT$zi|_0XrGB-0mwcjBs-`%g!UE5Fhe)KZ&K#9i?amn#FTM$hVcwJJ-Nri| z1-l3rww_;0nnXpe?BXx84rMp^TQ&S_fixUJ;jM-VhfLI&L)PbZMDf7X4b~hb(b++K z&>vWwrDDLzCTHjBMOS&P`n#RkecSlaVRp$gZQ)o|Dx{uUP2CTNRaGQ(j;+w*G^&Kt zi(hl60@R71rk|Nhi&FlT3M4Fv_eGl291t7>|7VS)DVFe8mr>;h1+(mb z+P65y>|}S46=<0HN-h zAyNm_4p%15QEfT+IteKevh1}F67-|s7!cmsV)?~j%J#SYuB>mq{|=kGejaxXb(wv& z8KkyH=F~i~)~CxC87c-wf`a}sb3JLEzh>QGk$aQhYfQaoBMD4ZR^&T~kf>)w;Z~F3B=OO8R@_vZQHQQ)F zqvthhobXS7Y+{fzq$`Lec^6p*YSGzKw4xJY(%3wg6s}CswkMxtE&uA`K1< zVLG7E#QmK<_n$5y^=H)XD7$31+E&nqHC~hMzE2h0oL9b`j>Ww-)tT9n@ODZEG^&n$ z=_BmV7FN1k$RXD*;zvAND~l82e{0#Hg@Vx%NSElHltX61JWvXv+iH`=3T@7$jF{F& zD*e-EWco}d(0USDE)47U>VbIkm`t9ZqZ8DGOczI?1n*kH>!yDeJyetvg0bv@lVShK zC=MlZTanqv9w-?dlAqI<>uN&s_f@k5S`|5Df)4W=9IV>3I-yEdAD33}Pa?y7Lhu2r z|7VpXYRh3JNIdQZyfN^@&tq@(sRZzm5Bv5Y7`)wDMh~DS9{iQ@vM`kVq;(#l$q{5x z)_t|%G=j2i`^J<=vN5NgUfHsARI0@=01)ZAc~Ens3OqIuRf{W`P>GvLfh`1_53B^i z-RJY-%Y?f1!xPiInVr#5@P{0L=3w44Ksc5CH)ZCT-Ky3SA=2*>j*b|=H6^{lrkkdj zq<<=q!`bRI)IVE~q1{HK)RRkh2pBTq_2C2;XSPl1(c&OgN}=Ys?bf6>+HRYIMzdcUKF6%`2$(nF@(%yaL>^1BvI^g% zl0JNNI0e0B*zdKd)}kDjy?afpDD2?SC1zkGJg)rTMwOW_zGRi^CDnv-&MD1 zPa91CA_YFf$ZTuycbu5jUQ(6fJa-`XF7{N+vw>wZg4o@W^eBCoY4 zC7%!CQ-dH|Wt*{ucXg77E?Tic?bzYwv|}%RaEA2LEj2fE8)Mrdl@c;10vn zemtl|p+QF=tc`XfAmseHv+QCox}6j#G~k@dl99C$a#zfZ*KEe)kSVy5&fI*xWWF(v zTj2?|6{^D0ZKD*l61>Z$c}+~1H^Humo6J7WBw@j?c@Zl-Q&gdyxcm(fS7Mv zXSM_}y4Bu%Pi?xcP!ak(-rwp&x$uxX3v>Vk+tYz+OWyY?#4FHp!_!*~2KDWWHjq`w zuVTQCwX5>|7<08P|ozHvb#oqZVb3RT?{INIsGPgoT z>GLT0^6_OW1M$Q?aNOksqs*sGiZI8C$V|U)X1iWLhMAkiIo(PsX5`B@i4$gJ&B>~88> zH6PgS$=Z2c!lmNkStImmNBB|tRw@-z4tr79O~40ms=E3)SbOL7r2_g#KCmKz$m$Hh z+UDjDn-KO?3fLF6?8X~dGo{`+vm7}vCufQv4!&wQdsMS~BYA_3c(fJQW`m}UXzL-B zWYR9co(YPY>Ra6+=}J*fBs{xsXqf&u?ik*)yGa@PFW>LqhZimBV}(ibZ<yC)Rwsis&9=yn#L=6uiV|hF<36B{qW~(B_A(ucrSPnoP1q)!{yO(CJRFv zxbDuO*pZ*XwxQ}<^PK6jR9*)mtmH(rg*gQm`4Bu(FTxfkN?+%vSaY^Q)STik`1hPm z2#Da;6G3Q21E-A)EK8YTHP=Y%kFQiP+2)q<^POZzV|E>>pw^%G|wBK!6wqG_+RadobVz{2hKx{eaWT&PuquLjp* zS{qp>0|*+4Tlh!BXVS4FzBJddl3fq3XR!n z!9k3F%2^%y#-y>zjRY4Fws5Z$nfrE+l8RRRNP7FZ12QCO{G<0RJP%D(!g9TgJ;8_3`n{mz1$L(^6)A)BodWqc1F#?B1( zEgVHoE!iGx9@EbTncW0JLFFgm_+QEMXI1&bdd#T53XR%O@UM4%6zyYTXM0ufxBAy zD+=Gsr_A0Zrx-$G|K^SnwB7nLKQFn|Mj!h)A=PIaVmGO$BKF~y;5XaIj|~xKLUGt? z7OW^^%{9c==ofcSMoA9cERuBOeKo9_ohDLs-7UHl3g#18n2Q#9b9{gLLTNJ9mK`+W z-#0NzlnAOcnu!auhQga7(tYO`{vDYw(}O(FdDz;1wYaBd_jllYUKCFZ(VyiS`;N3F zyt}hyY`^3q0z*=K{%&Pu#sbMDNv#rCF|NN!n`x6t{^2PS%!@xTVEP7&90X4*@(044 zT9%Hn4AlN{*t-QLvr!-(5Gu;bi9Fe(ru?3@wwl{NR+}Q&+)D6Oh!mR?{Gtci6iE`F zpfSin9r#i~uZ=AD?_4<2!l1Q+E@l7l^w&ZrW&l)_KppcAV$4bVZK0tm!7D#=z>(V? zhIyHIRx(jClgx047~bM@qpCu~wDPV>LFpk$%2yMFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.png deleted file mode 100644 index 89fef3a26f0b38d59a536ef0c945b9f757ee40ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5389 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 bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png deleted file mode 100644 index 168598eec79be19ddd7179ae2e5f25fbeaa9174d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6263 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.png deleted file mode 100644 index b55e436a27a143343990bc2a32b392084f82980a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6404 zcmV+f8T;mmP)4-hL+&nzH*Eoi{UB2^ZTW&sisB((`yfKFVVefT z2g9HV7&Z(+4+bRyJ}BA}U<$GTn>Hw}xyv5zIkV()kC~mBp6TiC>Z-~*^3I6xL(R-C zm*R?g?|90Gim$$k%KtC_5%EO|-qxO3`LMN44W{9g~$YSru^U+6ZMm2tV{Vv*#}m z-E}WC4Frqe8E_OAzxOPeh?ucJZ}T*&?BbR!+$yBl8=;I3v;@)pCrP$<=$(rA!No0% zT1Km*tev`tnd~CXBGV$I#A9bPC9N~^(4cfAAss>-qt;^H*uKQd#wty?ig8zHtfCSg zJ9{~k++~_u(w1aaS!N+9-PT;Y{tDJ<(L1t%t|d*+!$^bn4En)M?Rpmd3G6bVeO2c2&Y~`8cy#$Rx3hCR0+QD3D}5gEFm#kr@-MuP`bHly!y< zJ9x*}u^opjJYZ*hog`QwlL2C>hfNhuCdsBX%7iuXa=@rgh>ot}wL)^QVeH&sXu2Gf zL-fiL%~F@5*N_|x$gN9dJkkY?(xG4|4v3DgGOG6|8VBvQa28h4G6QMZD_$nCmPxRR zcYF<-d6-m@M<8(9aLpb0i~262!;xMZvV5^7{6RefiWb)CyTor zNS}cN&u@_(bfwN~mLiq0Y!Y~EXBB#yen<-B} z`wE}E^b2qD;QYyx)(RghW6nJKQT#_f45AC;25cKdfHrM16O%R(S9WGRwe<>LxcpHe zw(i}u_uv08@nh#ew!vS3u?DpOwl@a~0i})jKTrLLtZ9=L5k(X5#K<6ivs&cwju}CljV9idL72ZWxG)nNg%h zl7^s6Xc?IaQ7@!l4$yH#zn-9_#a0ew=Q#U`ArU!aS7Fw=*ivCD$s|eU0ixA5qjEyj zYoR@E@gSuM6+=0p=q^)cKG_&X<0+|7l#W9dYm^B!qh?IJvc{+yQrH|FcJYs{Biah% zr`(*}Wa4y~SsxMi5V=C+l6*2m8NVi83K-QxqV+Yrutn|~CU%EO9dTeo>|%>%p-VBg zjE5s~?NT<1w5w63B^cQO(UBEK^)5xJFtUYOSi#5w>j?JpON?n4`wO_oR5w*(gY1C5 zl#GSMkB;Gs649i*e*Gdd7SOuI^z)ya^WeXKRoRWxoAmRXp|OlbKpA%!I39`PaB+J? zBG$<`!lh6A-aGT)$w&X1wW5o4V$PiTAe{#vh2a#VLkipC%FdLhpM90jyzmwteD~~G zi|{cj;>>$LO!UYH=Q2(j5CK@9%7m0UBGoOf>`Zui>qq?h3qL2scOQGi-uJ*mEIxJ) zWC(r_#x=+VpaY_X!KY|ieEX>%keN0`*`jDXuH5Fq;s+n6|NI43PTqZs2VL+1;qd*f zXDCfTt|Jys+=XAaDe91-^m%o6fU=$dU$S!VDQ@oUa^zHpXD&X2Q9X=WVD;1~3LB8s zF?r)r=ZgJgOx`$@EsN4E39|u25$;mV53gQkWn_R#JE8bzaB_V;JZa!XNG6fH?n ziMhcrzTvfNuVPe4@5m;)Ry47X@g211aF9&MwWVrDq^4n5lw?|wTS*aElnD(ZJ@*F( z#Q+^e^s5Ql0fR#mFESWcq@+xhLaudiN`+HNvSfJc$+XgDR8EPyZL|+sz(i*>N|8G= z#IYlgdQ=n3crs&Z6qR+z0z1EzlWI)7yvnE=QZ_j{=n$?Qr3n<3gq_)diQ8fpC`8!9 z$t9vtU^i9$tB9T7yHZV98Q^9yNrcjF9k)&ON(xGLf zhjWKg?^EVObkM@>EhA)!6_(xXDicvKRvp~+WlZ5hF3D#N%7g{cnoCmc60fWgdLF6K z>=rwWoPeQ_sCWZc)QGxbzwA@lkX(3_afLELO;YuVmzNn;`;;Z5%EO74aU6r|2ySLK z7}GEnE4ZEGG_iwMDXMXUvO!I}5|ZS5be31i9EYNI*vt1BI1V%6;zmdCMZ>htc>Veh z$mmd;fNP(-)9Xjt51I7O&u% zCS}tiZvx87<@LS(94Pn>NAEq!_Vr!fb$5rSFFuFyVyx`4dU}&edlXfRLMxhF(cc?U zHV$=YP^P8kJZQ(b%N;Jfaha9PBj})m@w#a1($p^d>5Q__l^5{i*5(#z{PkD{bWqj1n4LvHx)^dlNw2BBza)xKuPM9D2_PDN0?TdelbA< z2GDWHBq_*6L#kZdwGLh>(WRtLMkwn;v>cL@W1`NS2Sx~{O^((I1B7cGOr}U(7*3|7 zwM(HLGS{Mvr%B2w@!~2;F`%e2OwgmXd=#xbw9{fQosw#oiByQiE))`{k`((TN0kba$&^AUaw|yN24winu{p|4kkw#Q|k*$)$&imT(+{5^#|2kcynC=;6m}m`LF^{+tIU zXo#0uB-uWl#T9bLp{^Bsd7rTmq(Y(MBe+;>Q}Fus%j6=aHa-_Vcgr7q<98mg8>coH zWCddlsqisT%v88c9KoyCM&x3Fj79$U-}(>l%!B{+*Z;n?qJ<^o?AZ^n`ruj2K{Dro z@!7sUVe9!H^6CHi79M=-;~%%y@vt)B%%dM*<;?p*w6IAA!k^pU#-q|cWz*v7&4jJ3 zAMlU==&uOztzZ0kd*1^ObL`wXkREt3c3fgq3us}5kJgg93V8CnFH+iovJNP<%eCu$ zl<@?|KJYl#E?i*aT* zJc6ohaDT|aQl+=}=2@J}5hKpBT!K#q%(G!^3MYlst;G;c{;b?+s zB&Mq-YeqY06AHOpOEGE+UXPr6k)Qp{&~w_X3i9M7+FC;6{|dG~3097U1Kx+aLsW z0m*DersqtYdn8{lu13U5Ya~UVvK(Pln=oFcaw;k;`)SJ9@ksEHiwiiFLR6AsI6zsq zBwlh!%A3SXYlMzZVHytd8x#a&LJ-BrP(tD~mVPy))IPaZlx>Z&UPDq0i5Hhi@&Tnb zR5HMe7N|vo5{mtFmy8w@(ZY{cFesYFr%Y}Ih?fG!={}vM6-ptPRFeIyPbvhNQ25bN zJOEws`u2~=M2p&ZeCIX~e(!fbY&TABFi3MI8VY=fJETI93&HExM$~jjiTK9f{WtH- zgFpJ!FIYr~6#-|@ypN*~zlVB%KvQ|tjn9o6Bfj^-OMLq4zw{;#{`ixhv;*US|%l7^U9%A!05BxUOIK!$I z77v7nZX~93dGh}~M~zQic~sV8`}!?8Z+_r$E?v05=Bc|eO^pd#7*}GY$JW-fn94y{ zE=wogMQvT0#-nZ|SN3;NRyyD*Hcy}8^39uU+;cBaU3?znhFImXcIp_q7U)#bSg^Ij zV1GbWJGayrNSet2-HLG+d%Sr05-S_W(P10oDjFfNsbw%3)6|NlROrA#OE959S!H?Y z@~arHMfd0?#&^+Sh;D}f42MH(W1-{Fq$RU5qtcQ>J6O-&;z5xTwIT+SA;xcWFq>h^ z^3GqIl^Fm=3OXwtic+FV2QxJDL5vq8l4?5Fy>hTPq-lC5K)c-rpss6@@r<-ka~=qR zLYg@b7FI~Igfc7VJcxUD0^AOkYX{Ma5o%7P!bwn8Hgq}xNtV!AT&Hnk3N4tuErSZn zxH3$#l(drMwIuf~%6JY*kq|GelH`4=bc~U0TAd|~^#PYOO&L242@=uk;?xeZRusb# z3RTis@JaHy8XFN%G&SSwCKVnHf`#ZPo)9?NGAI-B#wD*Mm9J68YZw;?bQYIMvH_*m z)FQ--7O^x~q1c`6QV55c@Cf2Xnp<I!_;-R8=KCKa!H?EE_w8=!kZ~yXdzB3R0 z$FKiOYlRPv&zZB2vH9Q`^8OH$DYSOEeq+G-=U?Ji{^Q?#lLvqJ#1qyEg;gGB9zDm# zBaeYl-$j711#Nj z42`7GF1nFiy~6`{&Vx(4yKLNZ4^Lfu0qc4gC0RRt43QaZCec`I1H-)on#O_9pp2&| z#shR1;q|(_c=<9b8yi^Hy)&@JcNoovm`2i64zwI>2{yRRgG;YrypZm(4Xo$=Sm)tz zIKOZ~Q&1EQRU@gj1HM67X-SG1al6f6GQ#-nH#@yejR2j6Hd+hHQnEiX^Fi$NB1YMi zs1<{dfc~jGNYj+6awscFsT~x;FwQ1)d#faq5rtELkas%0Jp(U@XrzNs4msnw!RW*- zl59+8VV%&8scQbz46>@>Aj`;VG3S9~{u9P|LT6!xB<)j~F;=u`M+-lZ!9*BD)J13q zM>|x51ZAC)PS0bU_USCFq46o3hH18swJzY$X?M|BGF{RyCS-O_q{`DMlxCa`h!>X` zr+v!CU_?mJUZfEQi)B0=Q;3F{13}!OL86VKOf1T(hR#CBc-p74xJqp;StS{z`!qt( zAnC>Hcz9S{acTP!nQ$qr-_247S_6OKpVj71V*9Uz6`3rpN-~R14dGH5c{G!EC z7^yh>==(T%<~<-3lko(Ez!m~3fvFT)E3WVLdFJ~U`RtcJA;cei@t@oK-~ABxojV6g zffq6!PjBf#%QRNjcIup&jTUY z+S-EBA~MU;sUuiij1g!p+3xS6tP*n`oI1(nTReFBg%|FO$=cc)0JgAL1hz4Z`Xidg zK?E9QU6)xhz=RQAx66gsUc1xjt!9yA}{+tJIZ*P@$UDs4q z1%Pe@(l;m^%Q&0+gW+iO6P@0!#Gm_jusX!q$li7eyZ<+CQ zKv`=L0qyn@76<1ohN~2YR@B1applfr5z0CZonD*qtWT%AinfZZQjF6*Gy;$;wdXfh zsb{>l{RX*E6jt!>Kl|A^5B~Gle#35_*d$3)^4h`R;kRQn5+ejRuMTjmM=mtK@#!bt znFnA0cfVz=aKMqAJ@X#!edr;Qy#vS`Y%SQi*5{cQFYu`^y`}!(8(;Z~wT^?8E@vKl zoO>U61RRH9lFSudSSSUy1fvx@dwrgJ<^sR+FaCxQ-}uUx?R^hE%tPnSft29+3?^d` zZzd-ii_Kx{PtIeMgKZp)72Md_Ls>`i(7DHX;o`+P54`fnI&W=l&E?!!R!GW0}%$vO>wmzm7i22jmB}wM%2SE_<(n~M>sXTbQ zLLJwl0)s-pORv6$bv+gr7k_3R0630CSt%ILQaTIXoe%%aJQxg62tl_SGoDQ7bUJ@7 z9snpXjHgpN-32B;BM)x3-Tfg7q3O26I~f>b{!AVKSPPYLP}XtgJm{_exiZL&pcW$( zwx%0}B;!3g-L;=7gZx&2$^nI=8BYgvyDN+*BkH;VoOjMZfJRUZ1}L0{Zl^UTQg;<& zBvs}8)C^v~c9qe{fiTa9DqESf6-U zpLkfGcvzqKXVoVjo?kdTzi@bd;qd&z;rYhH^Nok+8xPMn9=`wJ@cjpe?>{(v|G`h= z!B+H`6)Yg^5@*i*1=ItN!Zc$RdJF@PR|W%~IsY2}?8>jb$%Ci5T`R1Qv~3iiG+((cEFcycAS58wR&oip#9uNU}>kO+`#AeQHI z1}CBsJ-+$EMY5vDtZI=p0hhP?C_GE&+*yk6KTmL*2jSA32Pj_NdY07bFcFKat=`Kt zUm&O=(lX>n+cT7K4fvYiffJ1FQz2cWo9JfmPOf?VPvO7i!Ju+1N1`7o}FME z3za16t#N&<*byZMoNlKpDqWbPqluWYGr|Zv0>Cdppq^H9@CWuMFc~6 zKy+l4VY5SS6xs<8%WG6B$4bFo@gfO|X?q>7wNA6BFf&D2q^Kf-=!nOtzDfJo3SQ_l zao|dEgKZfwkP6jt@fe}&HaBz7Zky5zpgTiVZRj@%y(1Ar)2GM;BTr)D6|A&KX-TrH z3`LtM2GzR{(-w5b6_cG5)%eg_i#RB!bk`%SE3u8kUfyS4N`{V07$3(M8Po~ax1R&C z3bO#d@DFd*AN&?}^X@i-DrM-vP{Op+X5aBSkb-BfkJ%H)$vBPutKa%D1pI$L+W#Es SNCaE}0000FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png deleted file mode 100644 index d61448f5e898d4bceb66252870228c3019802071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5727 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 RuSNg>002ovPDHLkV1kEz{3ZYZ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotDouble.png deleted file mode 100644 index 6e0ac63c40ede331ed44ecd2c8bf3b11ef47b55c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4130 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 hTe~{$_PpxH{{q;w+ku6O@-=h|MmyKUWg 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png deleted file mode 100644 index f72f6627db3bc94a9b8eb8b6c4f24b74ebb7175f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4358 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 ACIA2c diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/magmatter/ingotTriple_OVERLAY.png deleted file mode 100644 index e069b3c3da276eb4e92eee9093e2cc787de1509d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1990 zcmah}4Qvy26u*JM*ch3C3G#W~P=;{r-Szuy9i!dW!n&2U;2^l|diTHXvbNXV-L`HB zBtwKb(MfC<)_p$VWhd;Q#vNNJwnb_WtjF@AuyO zz4w2up3>s1j0qVCf@Hazj&k^)t$x#o!{4cQo-hcKwo0(uJubT)^++Nw1ObBN^{wx) zIS+cqt}63x#_-V%*>%S}owJ-db!YR&em>{RoW=D-)0L@u!CAg!(y;R_EA!hHj2IVq zbMlg51-C{VI(OK0x^V73?TkI?Is0x!r(WJK_Y7EP*Z4jP-!DOWFIHUXn#Rl9{rx#< zj_j5-Z~qvSOE-A?7gya^HeJ=6T6%Fs>96p+m60X6f+N(UsBWGo)o;Oz|Su={0?= zNAU^m4?3=W)hB+^HYIak;Oz0P%dKA=^6y@GZZ!Y$yy>4}?+d*Jk5}#Jn{XLF)x7!0 zV)^#CckUcHPMsIlqOFCq3bwrGJL@SLHu{e}6T5zKp6NMzIREgtKz-Qn7+QzAV>N7**MyE$6kzQL1+3~b;kJnvE@Y3N zSw3)2GjQ|Ti5q>dRW5H|j!3(utpn?BHo(4&j5rs`2$Bgqm6@HkGk1SIf($DXd=*NC zyM$)NkcQzzKhQ)&5r{?*YkoAsu(d!z{U9KOZP>tfKVYc9*|0YZZo(b0gBrovECFwG zsgG^0Wi1?*|9V!2HA+K<5KtI28VZJGI%>mW#58R^j%bc2NSTUZd9# zcwtm%pfE^+qE?CH>2gO=f&`vySdF4YXsx!fu~E~g(}+?)OIj=zEkS813Wo?>ZVD?* z6c5X}agqd$1IVl-L=-^`qbe=q7wZ)p2J?s~7>c;vDfY0O&;crVOc6#5|zFDU>4c|7r77KI)rT`pMwXEyec~GFhhzgksPRk*!zraXD<58kFWl zR^aH^BSjd^I*J9jjyI6Fp3yNlLt2bD%kmZg3=C;BQ%N3ISXP)Y3sfG+tPvmyZ}J;R zjwNw}&dlL@%0%Fd#bm&FN>5l!W|M^?K+?ZV65!}D!NK{cJRIbqEJn`A5e&{!1{1C~ zn9aBaa3-8LSs=ez?>88A7|OA9ktl^2*fJr+1b{XY4q&LNEM4Gn*)U2&B#xdSqwo-F z!`uvumU$CqpAZ6Gg;A9wjV7JJV$hL#LT{o-V*;@dNHQEPm5U@aI#|3aJPmV)3Nq@{ zLDyJCv|R#>B1%3{4B9X?2~_oozjMR8!7&QsU=#qk2uep2Bu(mkgo)M}Xi`6uAZQ{9 z7CC`$`afvwCZX_Sjknb)$S`_S%AB|#UQjp4lrRPbG&brq!^TUHnFhdN2_sv>gaZKX z0yu_onDC5N8+cOBbDR$6ESw+LlY|-f`ze6K_Hbsi8JLV5lk}HGUTI_`P!NEsL2=;J z#l%7L;_aA`1UA+HRcojZPLTLB^wAC~#;R2>{NMtu+GlAI#|>H(F^;$uZXtMre#ynA zo>I#ZgrN!&Tzxl=_CA4YbG^$^;4_zXcC=+3K+_$2uh2KoKi~UV=HBA&;rV%2=A}nk zs!Qh2onb0DGd}qB+TZ5!Zri~{UE5ag-B_^mUP~1@dG_f|qdT|!G-8jJ{S_Iq|M*IahmFi-56_z@7&8cqr7f6t;Q~&?~ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png deleted file mode 100644 index 3a0d642d9d59339e5e299619366821426e8d69af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36573 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

    4Wxzky^D61GBlOOuor(xn$B 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png.mcmeta deleted file mode 100644 index 0dab81071f2..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png deleted file mode 100644 index b148b9e649c47594b7e966f81af2b382c6f3c84c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43580 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

    nF=iB>x0_P2OzHvMPA6JrGiotUqg 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png.mcmeta deleted file mode 100644 index 0dab81071f2..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png deleted file mode 100644 index dc736d53a19cf1af01bc274cfc73aea3d177d716..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44631 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 X6Ep36LdWtcfZv_lhFWDBHZT7lplKLM diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png.mcmeta deleted file mode 100644 index 0dab81071f2..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png deleted file mode 100644 index e988857b30c065ef8d6d2f6149f71483813479ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39647 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 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png.mcmeta deleted file mode 100644 index 0dab81071f2..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/ingotTriple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png deleted file mode 100644 index 9c813fbf4af7b642f17b185f71f48a3bf42871d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)4Tx0C=2zkv&MmKpe$iQ$>+V2Rn#}WT;LSL`8JdDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9_&~)2O zCE{WxyDE0QB7`A?F@vbgEMrcRlJFg0_XzOyF2=L`&;2=i)ttqEfJi*c4AUmwAfDQ^ z4bJ<-5muB{;&b9rlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR}1iKD8fQ@)V# zSmnIMSu0mr^Pc>Lp`5<5%ypWBNMI35kRU=q6(y8mBSx!EiiH&I$9?<*u3sXTLaq`R zITlcX2HEw4|H1EWt^CBemlTQvoiC2_F${F=0*#vEd>=bb;{*sk16O*>U#SDrpQP7X zTJ#7AZvz+CElt@2E_ZjJ_!g^xXnIYhG{7eVjf3Y3eF@0~{Oz zBL&J{_jz}BdvE`qY4-O6<}Gs7m&1M30002;Nkl7DI>_w`j}8Rus#Ym>6CqVa2*Kd<-%nv5DL$bppt`^3JkL95o3llfL_rRE hDu|L;JqP`3+yN*Ht*F)={uTfL002ovPDHLkV1h|pJbM5D diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotDouble_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png deleted file mode 100644 index 0b70635f4434879b25586d68612cfbaf795f6312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmV;S0$%-zP)4Tx0C=2zkv&MmKpe$iQ$>+V2Rn#}WT;LSL`8JdDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9_&~)2O zCE{WxyDE0QB7`A?F@vbgEMrcRlJFg0_XzOyF2=L`&;2=i)ttqEfJi*c4AUmwAfDQ^ z4bJ<-5muB{;&b9rlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR}1iKD8fQ@)V# zSmnIMSu0mr^Pc>Lp`5<5%ypWBNMI35kRU=q6(y8mBSx!EiiH&I$9?<*u3sXTLaq`R zITlcX2HEw4|H1EWt^CBemlTQvoiC2_F${F=0*#vEd>=bb;{*sk16O*>U#SDrpQP7X zTJ#7AZvz+CElt@2E_ZjJ_!g^xXnIYhG{7eVjf3Y3eF@0~{Oz zBL&J{_jz}BdvE`qY4-O6<}Gs7m&1M30002kNklJ{Xg*L4+{hmbva)-_f=H^0E{ts)HgBf;t0}O!`fFkAII0i zMC?HT7GPYliMX7v)LMs#DX?jpmC*<}Z#Bk1sWJ%_#cA6B0F)}x_XCtFlh8V$jD;-A z(6-$n6qf{muIr{j7Dxs3B~mWDI~~dE{gDW00000NkvXX Hu0mjfUob4W diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuadruple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png deleted file mode 100644 index b77047ead7010d7e9f05de6fb20bffe78d245fe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmV;H0%`q;P)4Tx0C=2zkv&MmKpe$iQ$>+V2Rn#}WT;LSL`8JdDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9_&~)2O zCE{WxyDE0QB7`A?F@vbgEMrcRlJFg0_XzOyF2=L`&;2=i)ttqEfJi*c4AUmwAfDQ^ z4bJ<-5muB{;&b9rlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR}1iKD8fQ@)V# zSmnIMSu0mr^Pc>Lp`5<5%ypWBNMI35kRU=q6(y8mBSx!EiiH&I$9?<*u3sXTLaq`R zITlcX2HEw4|H1EWt^CBemlTQvoiC2_F${F=0*#vEd>=bb;{*sk16O*>U#SDrpQP7X zTJ#7AZvz+CElt@2E_ZjJ_!g^xXnIYhG{7eVjf3Y3eF@0~{Oz zBL&J{_jz}BdvE`qY4-O6<}Gs7m&1M30002ZNkl+a!w~xQ^UlI=)LNYyq)_~X7Z+sCW{THGUH||907*qoM6N<$f)oWP<^TWy diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png.mcmeta deleted file mode 100644 index cc8a1f3c962..00000000000 --- a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 1}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotQuintuple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/universium/ingotTriple.png deleted file mode 100644 index 8b8af64f491c151a25243bf594f104ffc0ef8f10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)4Tx0C=2zkv&MmKpe$iQ$>+V2Rn#}WT;LSL`8JdDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9_&~)2O zCE{WxyDE0QB7`A?F@vbgEMrcRlJFg0_XzOyF2=L`&;2=i)ttqEfJi*c4AUmwAfDQ^ z4bJ<-5muB{;&b9rlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR}1iKD8fQ@)V# zSmnIMSu0mr^Pc>Lp`5<5%ypWBNMI35kRU=q6(y8mBSx!EiiH&I$9?<*u3sXTLaq`R zITlcX2HEw4|H1EWt^CBemlTQvoiC2_F${F=0*#vEd>=bb;{*sk16O*>U#SDrpQP7X zTJ#7AZvz+CElt@2E_ZjJ_!g^xXnIYhG{7eVjf3Y3eF@0~{Oz zBL&J{_jz}BdvE`qY4-O6<}Gs7m&1M30002yNkl=*|Vcm!_36g|$?kF(ELWsg&j;9%GpFmOgwKZlHtneyHK_qwm zlLQuy?l9@21Y`lyT_%{O$@g#fpUnS6DXYr_F%&+*Z#D@DkS+77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble.png deleted file mode 100644 index e793c0445e394dd515fcc90e809c8c3754ef261a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 734 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+Mz1Y+_3+l)a~(urxe&aN%6WBbjS^@BQBXgg5H*gbIbwL)}rUxxF-fITd*ht(@h; zv~)_bybmdKI;Vst01Af3j{pDw diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple.png deleted file mode 100644 index 28f93b16f659264bc89d86272b2689bf5e0bd491..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+Mo>j^vXF7 zO4dtwFLl2<*FVAAlaJx^idDUaJPlLVU$Esr$tU8)Fry>KaqU*stzp`BrjyPvcnVK6 z?oODN5}*|jsyx$a-o4+d0ux;Y9RIzue9ph)iQWg#c^ewd%GgkF$zNJ$_lDaF fcMq*_+_slpLVn`YWFhI>py>5<^>bP0l+XkKtdGYG diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple.png deleted file mode 100644 index 3c4d2a7b88f55803a8f887d60cd3911b2d9f7a19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBDAAG{;hE;^%b*2hb1<+n z3NbJPS&Tr)z$nE4G7ZRL@M4sPvx68lplX;H7}_%#SfFa6fHVkr05M1pgl1mAh%j*h z6I`{x0%imor0saV%ts)_S>O>_%)r1c48n{Iv*t)JFfg6S42dX-@b$4u&d=3LOvz75 z)vL%Y0O?||sjvbvb5lza6)JLb@`|l0Y?Z(&tblBgu)dN4SV>8?tx|+H?jfSfFg)+ zA4CH}eP~{0i5*M}nlQSq2!uSs8e~Cq4gN)$slb2)yUP&jEMzex^&sC_1!PvF=0vz; z=BDNqgZyG>W}}Z)0$rnXeolT-a6w{nsvXcCuofgCbk$&MB5_%RBmvcEqYsK}q_~G9 zEU+jrW!Z7r=)+T~9hY78;(5S?+vMru7-Dhy?PNo)0}28xf9um9GxO=_zopr08lR diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/ingotTriple.png deleted file mode 100644 index 31d5a44bcc1e5bc4b69cc399861abb9be27bcbcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 734 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+ME54)pQb9-s}aw_s13h`BH z3_A5w#)xytktQF;c1CWeqI26D@;w^a9_~$Dr_XRw>wt<&Zo^zwsV_Gh%5yL2^DeW$ jc>912b5!%%%iFnSwa>Z~y|CDL3>3+pu6{1-oD!MFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png deleted file mode 100644 index 678c35518b754e088a9c99fc19e34ddf3e4a9e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P)J6k0^@37`uf`)4Ub{0Amb! zo`W%V3jsjab;nzfku^<2k|ZCY(>11P3IH$+;}%@k71K1G1%2N`*LAdQd%4;$4CX&6n)I*YzZQGPY xR#6lO=#W4@Whs$@JLpm%CG$Lggx(7NQ@^sJyyU*NFzx^V002ovPDHLkV1iJYp%nlC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png deleted file mode 100644 index c844854d379273e3d273b855f43181f811279817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP){W7igLI_I0Du6MJ4p{|Mq zq}_xrQlW#SgC^DLc}G7G62Cl8UgaZ7DO^;?ReSLEgY;i7E`k8Oe!UO?@Qy3hmyl6{ zKal5nNYm7`lO%z6{a_@mU;+X#0Q=RK5Or9p;Qf&ZA!rF0}G>abK#Z}&tesjAA{H1!F) z&ECumxvPm8BrR#0#z=HMuY&ihF7bXxF_`T<=FxsyE6NJszx N002ovPDHLkV1j)Cs)7Ij diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png deleted file mode 100644 index b62d361f197a5f74a8433716079606ab8cbf9a3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7u@pRHNZw3ZN7Ec$)5R21iC);+l8i=&^Kj2!^ zS~5-VpwbVsgvV?-o20F!s}JgOn3XjptmY8fu#I!c6~`ZtZl8izu%mJ!AtYiF1Dp#M41{gXO-m6o+x|VF;HZ` z)3O`}jnhI54=V3zYb-soYh5_=IZF;jiQ^y3Zg0}rRTdk5{j<$~2?3`qC#6-E+I-RH zw0JJy6l3;R^We5z0jEEYS$r?QsJp#w+COeb0UI?7=V!uS^6&V5W67VeQa?ujit*|i SmR?{GF?hQAxvX@ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 2a63953e924df3742779cb9936ff094968564eaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*D=}+V4*$fPf9G)(YAr`04PG0DD)Ig-|zuNVO zY6dzhXWwB~@Sk9DM6NL;zVnEak*jG|qS%+X#+$mvXXnn#ToK*1qdax@U9SR}(p#6` zzt)dRTYEIE_DJ53Z(q+aDD1uwedk-wt@L>hcusBN@x8pGF!nn4$-oUvj1di=XL--4 z-M{J6hXXAF?+%E~c>Xi#Z_($hat4K#hABcWA}yCpzCPQ%Qc)=+lvU}M=&N1tZp6%E z34Wr{6(Hg&5#=2)O_f2xbCNSemp8E+k^%!>7 z>Nf^)MPK=O3(P X@oBlw28%3!!NlO{>gTe~DWM4fWmlc; diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png deleted file mode 100644 index e3ab084563a14f4525c54cb36e592daa1d04502f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7;_xAbOia?>yo-U3d7N_4%R_tpt5NM4T_G@sw zqHM{usF6Ei2g9=M2NOT2#5A%rD=Qwnl%Rb~xj_s{;4HLZR7{aLSu;jsg2 zZO*R^2o*iG>BzR+Z*{TZTXMS-B{&!alFw+fJYd`Pbk+o&(>{SB59ZuvpMPN2y8P#< zkw7mzm+`&aVEC+cl1imH1H&#Vc-SVtDaejzQq~ zM)50A&YE9MCImGFaVZ{oz2&h*j=bx{x2*#A*`@?#KWg4`&HV2~2d~c0Hu97IO?j|O zPh;sn;R+$2%PC(g=XL(=&74)|^Fg>M{0Gy9f?MY2H!1uEdY{45)z4*}Q$iB}FO!d= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 896be7f08e488d80015e3d5eeb59e2980c798456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*g|JJ*wQb3{ao-U3d7N_4%Ug&q!K&0)z+VzKO zGc>A-_#12-9|=^m1ogTkDb8FZwbh{dVl`{p_A`!0OWf}k2^7rkeK+la<*O~r@7LP} zA3PIr_4LgB75^#(Tmu)pwzAK=Eq3%I@8eIg3=Ij-d^rwq#auIT`4G3MZnvnH=Klv0 z5!0T&`cv`oh&4limt!`sQkPTZJoe9b7b+^5_%bW~5|wIuxZ3hBpM{3HXVa=xk1kAe zjJ?j#pmTcBf?~dFw+s$QFl(y*+IRnsS>NLKmrZz?mrSu!VY7T5_Pw#uknOSw>+F9i z2Iq~}Z2iwB*!;Wrt^K?mMTh<$+kHK|@XQ1CEhax$zDS=ts4=bE0vH4gp00i_>zopr E0KpKIEdT%j diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png deleted file mode 100644 index b8853a770e56227e6bcbd62d08fa2c0323c3eafe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}o(ip;0vW5(5LHpr?yth{frtlWkYE7>KypKU{kt z%ENrA_Xdt#jMC-_lkeWRd4oI8al=MomT1=r4Oo2o7-x285q1YyB0Al{UXTJuNtUY}TW zPj7lXU#Q@mVvEJvFY8%e?{eZOoV`HD`|A2trvl;^J+|1+**9Sy>sS4pNxBDxOEhn& ge731?{Zhr8ReA8gL0t6~V0bZjy85}Sb4q9e01UR72LJ#7 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png deleted file mode 100644 index c086bca2bb646c3ca1a68d05f617a5b7f927ff82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*_cYY_!DFy~c2~QWt5R21OC$IH8Y9P^eU+wrq zH3OZMv+uAfNUQK|^j5g)p&~X(b5$VsW|_Uw31z2!4uA1+7CsVmq|B>)*H;<4tNWk- zyl0|ocD`+Z7~bF4XJOb>n-jzNQAoxya@xX7sok;HO*eJ3YtLlS z7HD97F-=?X+2d0k>)j7oZfDa`R1Gtl<M4-&$Mp#83FQ(0sf1C&QYOPxyZLE}nK$ n(UBuc{EX0N<2fyNez9^!?!15Fz4s+xurYYL`njxgN@xNA`f!{M diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotDouble_OVERLAY.png deleted file mode 100644 index c844854d379273e3d273b855f43181f811279817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP){W7igLI_I0Du6MJ4p{|Mq zq}_xrQlW#SgC^DLc}G7G62Cl8UgaZ7DO^;?ReSLEgY;i7E`k8Oe!UO?@Qy3hmyl6{ zKal5nNYm7`lO%z6{a_@mU;+X#0Q=RK5Or9p;Qf&ZA!rF0}G>abK#Z}&tesjAA{H1!F) z&ECumxvPm8BrR#0#z=HMuY&ihF7bXxF_`T<=FxsyE6NJszx N002ovPDHLkV1j)Cs)7Ij diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVk4J)6LFrH9=Gj0Ywj^(N7l!{JxM1({$v}}Mo-U3d7N_q{-pI?W$m5!6?EEc> zQ7TK!A&DbxfyeaJ8ESoYUAoN%Uo_{vv-l{tkICKT+>^g5%eFo{5V6`eob!Iw`$JNO zOGCFPJzjdv$~Upo@L1>h*N#C>Pt+3o)3_3h-Tj0-GzC)%8jkpsKQuY0^)~;p{vqKxDrdzV&wT%D Tym3z|(7gFdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 510ac71b232b5ae9240c2fd334373798d8087ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)6UjNp+r&2&6wj^(N7l!{JxM1({$v}}go-U3d7N_4%-pI?W$m5!6?Ch4z zup*M7Q*lP4QtY(ESwFr6=G^4ip_baE?)TvT50U2`CnWFrCq-o^um7&sV>_q*`SyjD zJ0|z^N3G7>$bC$LcmDO}BP=IlIgF*04;Xm+DNYEI>TuYv`@DuH(YL@w9Xbr_AFn(pb15e9--VkKucU$8$>8bg K=d#Wzp$Pz}SYinP diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVk4J)6gLi%>%PF7`TavfC3&Vd9T(EcfWT41;PZ!4!i_>c-@8vzLAmEm1?EEc> zQ7TKn;fTN)hlzTp4SYN7r&!CX|LYR*-zMU+$IH#Py$2btx12=CO;xEI38A@%1h#nF;sBoFcr0_>M^M zO0X_z=v=dvhkZ_Qn-a&1$xBS;HYkZmc;4pxAT#&NbxsAryYqL{#OqUEfKF%dboFyt=akR{0NDC!+W-In diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png deleted file mode 100644 index 678c35518b754e088a9c99fc19e34ddf3e4a9e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P)J6k0^@37`uf`)4Ub{0Amb! zo`W%V3jsjab;nzfku^<2k|ZCY(>11P3IH$+;}%@k71K1G1%2N`*LAdQd%4;$4CX&6n)I*YzZQGPY xR#6lO=#W4@Whs$@JLpm%CG$Lggx(7NQ@^sJyyU*NFzx^V002ovPDHLkV1iJYp%nlC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png deleted file mode 100644 index b62d361f197a5f74a8433716079606ab8cbf9a3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7u@pRHNZw3ZN7Ec$)5R21iC);+l8i=&^Kj2!^ zS~5-VpwbVsgvV?-o20F!s}JgOn3XjptmY8fu#I!c6~`ZtZl8izu%mJ!AtYiF1Dp#M41{gXO-m6o+x|VF;HZ` z)3O`}jnhI54=V3zYb-soYh5_=IZF;jiQ^y3Zg0}rRTdk5{j<$~2?3`qC#6-E+I-RH zw0JJy6l3;R^We5z0jEEYS$r?QsJp#w+COeb0UI?7=V!uS^6&V5W67VeQa?ujit*|i SmR?{GF?hQAxvX@ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png deleted file mode 100644 index e3ab084563a14f4525c54cb36e592daa1d04502f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7;_xAbOia?>yo-U3d7N_4%R_tpt5NM4T_G@sw zqHM{usF6Ei2g9=M2NOT2#5A%rD=Qwnl%Rb~xj_s{;4HLZR7{aLSu;jsg2 zZO*R^2o*iG>BzR+Z*{TZTXMS-B{&!alFw+fJYd`Pbk+o&(>{SB59ZuvpMPN2y8P#< zkw7mzm+`&aVEC+cl1imH1H&#Vc-SVtDaejzQq~ zM)50A&YE9MCImGFaVZ{oz2&h*j=bx{x2*#A*`@?#KWg4`&HV2~2d~c0Hu97IO?j|O zPh;sn;R+$2%PC(g=XL(=&74)|^Fg>M{0Gy9f?MY2H!1uEdY{45)z4*}Q$iB}FO!d= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png deleted file mode 100644 index b8853a770e56227e6bcbd62d08fa2c0323c3eafe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}o(ip;0vW5(5LHpr?yth{frtlWkYE7>KypKU{kt z%ENrA_Xdt#jMC-_lkeWRd4oI8al=MomT1=r4Oo2o7-x285q1YyB0Al{UXTJuNtUY}TW zPj7lXU#Q@mVvEJvFY8%e?{eZOoV`HD`|A2trvl;^J+|1+**9Sy>sS4pNxBDxOEhn& ge731?{Zhr8ReA8gL0t6~V0bZjy85}Sb4q9e01UR72LJ#7 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotDouble_OVERLAY.png deleted file mode 100644 index 7256ea1809c370db09924933eccf99f590e354f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkB47OU1Z_$$wfdRwj^(N7l!{JxM1({$v}~APZ!4!i_>o>S@Rt-5O8^J_KkJY z4~B`8#H8*#&CkVsF{9K~boHjU+Oj2)$|0tbHUn;9_GAJpf#C3=oEh-vczQw`Qjf@Re+(vzz- uYwj3Gv1;y}eSBg4-pXe6H!=4g@Ck9e+I2hZ<6)q)7(8A5T-G@yGywqSFdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkB47Oo%MA2<_4e;TavfC3&Vd9T(EcfWS~fsr;B5Vgyh?Ux7}zenH#^Dt zskmWoW^Q(ea-YOCGvnU;yuS>cF}&}ewqHN_FX8uuuyd3DDstv?Pw(Ec;r%2JCC2tDnm{r-UW|2=`oa diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 68dab2ddc0f407ef4a2a54a911f3cb8495d37f95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkB47O%_@a!{U4wZTavfC3&Vd9T(EcfWS~fsr;B5Vgyh?Ux7}zenH#^Dt zskmWoW^Q(ea-YOCGvnU;yuS>cF}&}ewqHN_FX8uuuyd3DDstv?Pw(Ec;r%2JCC2tDnm{r-UW|?3`Rm diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkB47O%~&6h2cL4F4((#GEk(+)5S4FLh|iF-Jrt`3~U$Po1J9+ zRNOE(GdH_KxliJnnQ?D^-d~2!7~c0!+pnMem+*T+*tyAn6*=>{r+07J@P3kq66a+d z-5lxDK-%TLr}lO2&p!80@8AER;!|W~_@!4CE2e&(dwXt>M|ad;qn;&4cNOgp=6dXK je`45D1HKa3pWj&fFdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple.png deleted file mode 100644 index 92a66d07ddde8045727a018eadae2f6d6dff3f3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+M7K5BF6*2UngCQ< B&;|ei diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple.png deleted file mode 100644 index 470f88667cfe07725fffe1758c823197662b681a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 742 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+MqlR{e60`T0J#Q!5|H0Mi-+gQu&X%Q~loCIIwc%u4_O diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/ingotTriple.png deleted file mode 100644 index bed8d3a070efedf0388b520b9342be83fdf5e7f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|T2doC(|mmy zw18|523AHP24;{FAY@>aVqgWc85q16rQz%#Mh&PMCI*J~Oa>OHnkXO*0v4nJa0`PlBg3pY5xV%QuQiw3qZOUY$~jP%-qzHM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&Bv zUzDm~re~mMpk&9TprBw=l#*r@P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG z80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-^i9 znTD__uNdkrpa=CqGWv#k2KsQbfm&@qqE`MznW;dVLFU^T+JIG}h(YbK(Fa+MMeQ@nEyvi|vao0X-#fX%%~ z`m``l;G%684qUAJa!w>_XhZXwm8ZPpq@}r?^~GxY zgFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png deleted file mode 100644 index c844854d379273e3d273b855f43181f811279817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP){W7igLI_I0Du6MJ4p{|Mq zq}_xrQlW#SgC^DLc}G7G62Cl8UgaZ7DO^;?ReSLEgY;i7E`k8Oe!UO?@Qy3hmyl6{ zKal5nNYm7`lO%z6{a_@mU;+X#0Q=RK5Or9p;Qf&ZA!rF0}G>abK#Z}&tesjAA{H1!F) z&ECumxvPm8BrR#0#z=HMuY&ihF7bXxF_`T<=FxsyE6NJszx N002ovPDHLkV1j)Cs)7Ij diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png deleted file mode 100644 index 2a63953e924df3742779cb9936ff094968564eaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*D=}+V4*$fPf9G)(YAr`04PG0DD)Ig-|zuNVO zY6dzhXWwB~@Sk9DM6NL;zVnEak*jG|qS%+X#+$mvXXnn#ToK*1qdax@U9SR}(p#6` zzt)dRTYEIE_DJ53Z(q+aDD1uwedk-wt@L>hcusBN@x8pGF!nn4$-oUvj1di=XL--4 z-M{J6hXXAF?+%E~c>Xi#Z_($hat4K#hABcWA}yCpzCPQ%Qc)=+lvU}M=&N1tZp6%E z34Wr{6(Hg&5#=2)O_f2xbCNSemp8E+k^%!>7 z>Nf^)MPK=O3(P X@oBlw28%3!!NlO{>gTe~DWM4fWmlc; diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 896be7f08e488d80015e3d5eeb59e2980c798456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*g|JJ*wQb3{ao-U3d7N_4%Ug&q!K&0)z+VzKO zGc>A-_#12-9|=^m1ogTkDb8FZwbh{dVl`{p_A`!0OWf}k2^7rkeK+la<*O~r@7LP} zA3PIr_4LgB75^#(Tmu)pwzAK=Eq3%I@8eIg3=Ij-d^rwq#auIT`4G3MZnvnH=Klv0 z5!0T&`cv`oh&4limt!`sQkPTZJoe9b7b+^5_%bW~5|wIuxZ3hBpM{3HXVa=xk1kAe zjJ?j#pmTcBf?~dFw+s$QFl(y*+IRnsS>NLKmrZz?mrSu!VY7T5_Pw#uknOSw>+F9i z2Iq~}Z2iwB*!;Wrt^K?mMTh<$+kHK|@XQ1CEhax$zDS=ts4=bE0vH4gp00i_>zopr E0KpKIEdT%j diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png deleted file mode 100644 index c086bca2bb646c3ca1a68d05f617a5b7f927ff82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}k*_cYY_!DFy~c2~QWt5R21OC$IH8Y9P^eU+wrq zH3OZMv+uAfNUQK|^j5g)p&~X(b5$VsW|_Uw31z2!4uA1+7CsVmq|B>)*H;<4tNWk- zyl0|ocD`+Z7~bF4XJOb>n-jzNQAoxya@xX7sok;HO*eJ3YtLlS z7HD97F-=?X+2d0k>)j7oZfDa`R1Gtl<M4-&$Mp#83FQ(0sf1C&QYOPxyZLE}nK$ n(UBuc{EX0N<2fyNez9^!?!15Fz4s+xurYYL`njxgN@xNA`f!{M diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png deleted file mode 100644 index 678c35518b754e088a9c99fc19e34ddf3e4a9e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P)J6k0^@37`uf`)4Ub{0Amb! zo`W%V3jsjab;nzfku^<2k|ZCY(>11P3IH$+;}%@k71K1G1%2N`*LAdQd%4;$4CX&6n)I*YzZQGPY xR#6lO=#W4@Whs$@JLpm%CG$Lggx(7NQ@^sJyyU*NFzx^V002ovPDHLkV1iJYp%nlC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png deleted file mode 100644 index b62d361f197a5f74a8433716079606ab8cbf9a3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7u@pRHNZw3ZN7Ec$)5R21iC);+l8i=&^Kj2!^ zS~5-VpwbVsgvV?-o20F!s}JgOn3XjptmY8fu#I!c6~`ZtZl8izu%mJ!AtYiF1Dp#M41{gXO-m6o+x|VF;HZ` z)3O`}jnhI54=V3zYb-soYh5_=IZF;jiQ^y3Zg0}rRTdk5{j<$~2?3`qC#6-E+I-RH zw0JJy6l3;R^We5z0jEEYS$r?QsJp#w+COeb0UI?7=V!uS^6&V5W67VeQa?ujit*|i SmR?{GF?hQAxvX@ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png deleted file mode 100644 index e3ab084563a14f4525c54cb36e592daa1d04502f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7;_xAbOia?>yo-U3d7N_4%R_tpt5NM4T_G@sw zqHM{usF6Ei2g9=M2NOT2#5A%rD=Qwnl%Rb~xj_s{;4HLZR7{aLSu;jsg2 zZO*R^2o*iG>BzR+Z*{TZTXMS-B{&!alFw+fJYd`Pbk+o&(>{SB59ZuvpMPN2y8P#< zkw7mzm+`&aVEC+cl1imH1H&#Vc-SVtDaejzQq~ zM)50A&YE9MCImGFaVZ{oz2&h*j=bx{x2*#A*`@?#KWg4`&HV2~2d~c0Hu97IO?j|O zPh;sn;R+$2%PC(g=XL(=&74)|^Fg>M{0Gy9f?MY2H!1uEdY{45)z4*}Q$iB}FO!d= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png deleted file mode 100644 index b8853a770e56227e6bcbd62d08fa2c0323c3eafe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}o(ip;0vW5(5LHpr?yth{frtlWkYE7>KypKU{kt z%ENrA_Xdt#jMC-_lkeWRd4oI8al=MomT1=r4Oo2o7-x285q1YyB0Al{UXTJuNtUY}TW zPj7lXU#Q@mVvEJvFY8%e?{eZOoV`HD`|A2trvl;^J+|1+**9Sy>sS4pNxBDxOEhn& ge731?{Zhr8ReA8gL0t6~V0bZjy85}Sb4q9e01UR72LJ#7 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png deleted file mode 100644 index 678c35518b754e088a9c99fc19e34ddf3e4a9e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P)J6k0^@37`uf`)4Ub{0Amb! zo`W%V3jsjab;nzfku^<2k|ZCY(>11P3IH$+;}%@k71K1G1%2N`*LAdQd%4;$4CX&6n)I*YzZQGPY xR#6lO=#W4@Whs$@JLpm%CG$Lggx(7NQ@^sJyyU*NFzx^V002ovPDHLkV1iJYp%nlC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png deleted file mode 100644 index b62d361f197a5f74a8433716079606ab8cbf9a3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7u@pRHNZw3ZN7Ec$)5R21iC);+l8i=&^Kj2!^ zS~5-VpwbVsgvV?-o20F!s}JgOn3XjptmY8fu#I!c6~`ZtZl8izu%mJ!AtYiF1Dp#M41{gXO-m6o+x|VF;HZ` z)3O`}jnhI54=V3zYb-soYh5_=IZF;jiQ^y3Zg0}rRTdk5{j<$~2?3`qC#6-E+I-RH zw0JJy6l3;R^We5z0jEEYS$r?QsJp#w+COeb0UI?7=V!uS^6&V5W67VeQa?ujit*|i SmR?{GF?hQAxvX@ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png deleted file mode 100644 index e3ab084563a14f4525c54cb36e592daa1d04502f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}n7;_xAbOia?>yo-U3d7N_4%R_tpt5NM4T_G@sw zqHM{usF6Ei2g9=M2NOT2#5A%rD=Qwnl%Rb~xj_s{;4HLZR7{aLSu;jsg2 zZO*R^2o*iG>BzR+Z*{TZTXMS-B{&!alFw+fJYd`Pbk+o&(>{SB59ZuvpMPN2y8P#< zkw7mzm+`&aVEC+cl1imH1H&#Vc-SVtDaejzQq~ zM)50A&YE9MCImGFaVZ{oz2&h*j=bx{x2*#A*`@?#KWg4`&HV2~2d~c0Hu97IO?j|O zPh;sn;R+$2%PC(g=XL(=&74)|^Fg>M{0Gy9f?MY2H!1uEdY{45)z4*}Q$iB}FO!d= diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png deleted file mode 100644 index b8853a770e56227e6bcbd62d08fa2c0323c3eafe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G_YAk0{w5<>&kwQM}o(ip;0vW5(5LHpr?yth{frtlWkYE7>KypKU{kt z%ENrA_Xdt#jMC-_lkeWRd4oI8al=MomT1=r4Oo2o7-x285q1YyB0Al{UXTJuNtUY}TW zPj7lXU#Q@mVvEJvFY8%e?{eZOoV`HD`|A2trvl;^J+|1+**9Sy>sS4pNxBDxOEhn& ge731?{Zhr8ReA8gL0t6~V0bZjy85}Sb4q9e01UR72LJ#7 diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png deleted file mode 100644 index d83a131004a555d47a5656fbeecf79ad3a7ccc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble.png deleted file mode 100644 index 48ef0d0918999c0104a8afbde2061a1cfc28420a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*Xiuc)mIX$2dTavfC3&Vd9T(EcfWT40jPZ!4!i_^W64|1|9^002#w7$WY zb6|10w1CbbDV>vfe{AeI4JE=8^}3Do9OfGyD?a>tAM=a%;X)Z}eM_DMA9}Ud*eb~@ zYKv0vx~+UWbqtT~crfSp{Jz!`(_3sOsWzMyvGi0}YVxpQj_&iCDJn7=OMS{1H6Qfv z`Od@c#3AG8FkeNrn58S=z@$E91*N5TIVN;GRhsK|;nFv);1(wJlQrBOcRa4I|JWuU Yz`b~r!kxdDfo^8-boFyt=akR{03g|Ar2qf` diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotDouble_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuadruple.png deleted file mode 100644 index 4a26839a7dd380fd7442f599b7e736cc97243ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+f$?=}ALL~a6mZ?HDZ9dv zS?`?G1Pv!%uS>mWx6eE&aJW`g|Mdgg&Fuc~|6bg1t!&XXs{?WKc6vpuHBIYXaY-v{ zqT=+RT`{vHoMspttJ$8cSTwo7&4{&NhLSqx5easg3IC@BS$PTZJ(FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple.png deleted file mode 100644 index 59219ca243a3099031c618b6a75fb7e8008b86c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J)+k@xob*@{3Rwj^(N7l!{JxM1({$v}}Ao-U3d7N_4%KFE1MfyZ_C6zLtU z%r9=Tva}blxfjizlJD8E=-Z`a=KiLy`~S#Q30_>f@tRO@wyICI?*YksAOGfN@V!&9 zjqy^n-JQUZctGNF&T)rNVuxhUDjZ0iHpfZf*bTwPf7_;9GF&3)cy8xrp%)BNmd{xP zE8e>@9o*yDzKu8HP*doOt&Hzopr0GFj@{Qv*} diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotQuintuple_OVERLAY.png deleted file mode 100644 index 3f0d6efcacdbbcc2d9fd04d1dff1e63021f710d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingotTriple.png deleted file mode 100644 index a2cd141bb961455a7214871b59b1f105aecf28e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGf*{OTpAtV2D9B#o z>FdgVk4J*XnxRoN_!3ZvEy>&6h2cL4F4((#GEiitr;B5V#p$(^4{{z=5MaGLMK+?D zx8h?CbCYXCv+B*>`RO-OW3N>FI3&PvZb##fFZbq4uh}a5;(NHzimiMlPl69+tu?gT zGFdgVkCB&Oimmd8og+|)Ey>&61xN$IPv_nBKuXHf#WBR77|LvJo8w#&91Twqv bO6UO%{~M+MaGjGyFG#hgtDnm{r-UW|yRspC From f326d527e313015b345e4e7aeae27bc4f9581fe5 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Thu, 16 Jan 2025 22:13:22 +0200 Subject: [PATCH 13/15] Correct tengam for magnetic upgrade in Antimatter forge (#3818) --- .../java/goodgenerator/blocks/tileEntity/AntimatterForge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java index d45aebbf8db..8558bae0e19 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java @@ -67,7 +67,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase implements ISurvivalConstructable, IOverclockDescriptionProvider { - private static final FluidStack[] magneticUpgrades = { Materials.TengamAttuned.getMolten(1L), + private static final FluidStack[] magneticUpgrades = { Materials.TengamPurified.getMolten(1L), MaterialsUEVplus.Time.getMolten(1L) }; private static final FluidStack[] gravityUpgrades = { MaterialsUEVplus.SpaceTime.getMolten(1L), MaterialsUEVplus.Space.getMolten(1L), MaterialsUEVplus.Eternity.getMolten(1L) }; From 3760928a11a4e3429cde5e7921672ab9cfafed4b Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Fri, 17 Jan 2025 03:11:49 -0300 Subject: [PATCH 14/15] Remove Old GT++ UI from some multiblocks (#3819) Co-authored-by: Martin Robertz --- .../tileentities/machines/multi/production/MTECyclotron.java | 5 ----- .../machines/multi/production/MTEElementalDuplicator.java | 5 ----- .../machines/multi/production/MTELargeRocketEngine.java | 5 ----- .../machines/multi/production/MTESolarTower.java | 5 ----- 4 files changed, 20 deletions(-) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index ac988cf6ab7..43b1ec5c112 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -341,11 +341,6 @@ public String[] getExtraInfoData() { "Stored EU: " + this.getEUVar() + " / " + maxEUStore() }; } - @Override - public boolean doesBindPlayerInventory() { - return false; - } - @Override public boolean getDefaultHasMaintenanceChecks() { return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index 28299f937be..5a6392785c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -355,9 +355,4 @@ public ArrayList getStoredInputs() { tItems.removeAll(Collections.singleton(null)); return tItems; } - - @Override - public boolean doesBindPlayerInventory() { - return false; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java index bb5a0c29640..e406325e681 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java @@ -522,9 +522,4 @@ public String getMachineType() { public int getMaxParallelRecipes() { return 1; } - - @Override - public boolean doesBindPlayerInventory() { - return false; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java index 31ec1362a07..38ed4859042 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java @@ -657,9 +657,4 @@ public String[] getExtraInfoData() { return new String[] { "Internal Heat Level: " + this.mHeatLevel, "Connected Solar Reflectors: " + this.mSolarHeaters.size() }; } - - @Override - public boolean doesBindPlayerInventory() { - return false; - } } From e1153a7ac22fdd34e90bfe615e99a17a01d7f6a5 Mon Sep 17 00:00:00 2001 From: Brady Date: Fri, 17 Jan 2025 22:29:35 -0500 Subject: [PATCH 15/15] Change recipe to output 2 sulfur dust instead of 8 small sulfur dust (#3820) Co-authored-by: Brady Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index b6bd8ba0e35..547075dc16e 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java @@ -1580,7 +1580,7 @@ private static void chemicalReactorRecipes() { .itemInputs( CI.getNumberedAdvancedCircuit(21), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 32L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Sulfur, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L)) .fluidInputs(FluidUtils.getFluidStack("sulfuricacid", 4000)) .fluidOutputs(FluidUtils.getFluidStack("sulfuricapatite", 8000)) .duration(20 * SECONDS)