From c7637d327212221019f60450bc46bf71c73a0378 Mon Sep 17 00:00:00 2001 From: Irgendwer01 <67506320+Irgendwer01@users.noreply.github.com> Date: Sun, 23 Jul 2023 17:50:06 +0200 Subject: [PATCH] Yeet sand drops --- .../integration/exnihilo/ExNihiloModule.java | 9 +---- .../exnihilo/recipes/ExNihiloRecipes.java | 6 +-- .../exnihilo/recipes/SieveDrops.java | 37 ------------------ .../diamond/ore_sandy_chunk.json | 7 ---- .../material_sets/dull/ore_sandy_chunk.json | 7 ---- .../emerald/ore_sandy_chunk.json | 7 ---- .../material_sets/fine/ore_sandy_chunk.json | 7 ---- .../material_sets/flint/ore_sandy_chunk.json | 7 ---- .../gem_horizontal/ore_sandy_chunk.json | 7 ---- .../gem_vertical/ore_sandy_chunk.json | 7 ---- .../material_sets/lapis/ore_sandy_chunk.json | 7 ---- .../lignite/ore_sandy_chunk.json | 7 ---- .../metallic/ore_sandy_chunk.json | 7 ---- .../netherstar/ore_sandy_chunk.json | 7 ---- .../material_sets/opal/ore_sandy_chunk.json | 7 ---- .../material_sets/quartz/ore_sandy_chunk.json | 7 ---- .../material_sets/rough/ore_sandy_chunk.json | 7 ---- .../material_sets/ruby/ore_sandy_chunk.json | 7 ---- .../material_sets/sand/ore_sandy_chunk.json | 7 ---- .../material_sets/shiny/ore_sandy_chunk.json | 7 ---- .../diamond/ore_sandy_chunk_overlay.png | Bin 387 -> 0 bytes .../dull/ore_sandy_chunk_overlay.png | Bin 478 -> 0 bytes .../emerald/ore_sandy_chunk_overlay.png | Bin 456 -> 0 bytes .../fine/ore_sandy_chunk_overlay.png | Bin 230 -> 0 bytes .../flint/ore_sandy_chunk_overlay.png | Bin 550 -> 0 bytes .../ore_sandy_chunk_overlay.png | Bin 372 -> 0 bytes .../gem_vertical/ore_sandy_chunk_overlay.png | Bin 409 -> 0 bytes .../lapis/ore_sandy_chunk_overlay.png | Bin 405 -> 0 bytes .../lignite/ore_sandy_chunk_overlay.png | Bin 406 -> 0 bytes .../metallic/ore_sandy_chunk_overlay.png | Bin 475 -> 0 bytes .../netherstar/ore_sandy_chunk_overlay.png | Bin 478 -> 0 bytes .../quartz/ore_sandy_chunk_overlay.png | Bin 472 -> 0 bytes .../rough/ore_sandy_chunk_overlay.png | Bin 536 -> 0 bytes .../ruby/ore_sandy_chunk_overlay.png | Bin 462 -> 0 bytes .../shiny/ore_sandy_chunk_overlay.png | Bin 516 -> 0 bytes 35 files changed, 4 insertions(+), 167 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/diamond/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/dull/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/emerald/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/fine/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/flint/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/lapis/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/lignite/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/metallic/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/netherstar/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/opal/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/quartz/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/rough/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/ruby/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/sand/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/shiny/ore_sandy_chunk.json delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/diamond/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/dull/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/emerald/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/fine/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/flint/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/gem_horizontal/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/gem_vertical/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/lapis/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/lignite/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/metallic/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/netherstar/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/quartz/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/rough/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/ruby/ore_sandy_chunk_overlay.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/material_sets/shiny/ore_sandy_chunk_overlay.png diff --git a/src/main/java/gregtech/integration/exnihilo/ExNihiloModule.java b/src/main/java/gregtech/integration/exnihilo/ExNihiloModule.java index d6266ef5451..eea268e61d3 100644 --- a/src/main/java/gregtech/integration/exnihilo/ExNihiloModule.java +++ b/src/main/java/gregtech/integration/exnihilo/ExNihiloModule.java @@ -72,14 +72,11 @@ public class ExNihiloModule extends IntegrationSubmodule { public static OrePrefix oreChunk; public static OrePrefix oreEnderChunk; public static OrePrefix oreNetherChunk; - public static OrePrefix oreSandyChunk; // Icon Types - public static MaterialIconType oreChunkIcon; public static MaterialIconType oreEnderChunkIcon; public static MaterialIconType oreNetherChunkIcon; - public static MaterialIconType oreSandyChunkIcon; @Nonnull @Override @@ -113,19 +110,17 @@ public static void registerMaterials(MaterialEvent event) { oreChunkIcon = new MaterialIconType("oreChunk"); oreEnderChunkIcon = new MaterialIconType("oreEnderChunk"); oreNetherChunkIcon = new MaterialIconType("oreNetherChunk"); - oreSandyChunkIcon = new MaterialIconType("oreSandyChunk"); + oreChunk = new OrePrefix("oreChunk", -1, null, oreChunkIcon, ENABLE_UNIFICATION, hasOreProperty); oreEnderChunk = new OrePrefix("oreEnderChunk", -1, null, oreEnderChunkIcon, ENABLE_UNIFICATION, hasOreProperty); oreNetherChunk = new OrePrefix("oreNetherChunk", -1, null, oreNetherChunkIcon, ENABLE_UNIFICATION, hasOreProperty); - oreSandyChunk = new OrePrefix("oreSandyChunk", -1, null, oreSandyChunkIcon, ENABLE_UNIFICATION, hasOreProperty); oreChunk.setAlternativeOreName(OrePrefix.ore.name()); oreEnderChunk.setAlternativeOreName(OrePrefix.oreEndstone.name()); oreNetherChunk.setAlternativeOreName(OrePrefix.oreNetherrack.name()); - oreSandyChunk.setAlternativeOreName(OrePrefix.ore.name()); - MetaItems.addOrePrefix(oreChunk, oreEnderChunk, oreNetherChunk, oreSandyChunk); + MetaItems.addOrePrefix(oreChunk, oreEnderChunk, oreNetherChunk); } private void registerMetaTileEntities() { diff --git a/src/main/java/gregtech/integration/exnihilo/recipes/ExNihiloRecipes.java b/src/main/java/gregtech/integration/exnihilo/recipes/ExNihiloRecipes.java index ffaf9b4eb94..9d6559c49cd 100644 --- a/src/main/java/gregtech/integration/exnihilo/recipes/ExNihiloRecipes.java +++ b/src/main/java/gregtech/integration/exnihilo/recipes/ExNihiloRecipes.java @@ -33,7 +33,6 @@ public static void registerHandlers() { ExNihiloModule.oreChunk.addProcessingHandler(PropertyKey.ORE, ExNihiloRecipes::processChunk); ExNihiloModule.oreEnderChunk.addProcessingHandler(PropertyKey.ORE, ExNihiloRecipes::processChunk); ExNihiloModule.oreNetherChunk.addProcessingHandler(PropertyKey.ORE, ExNihiloRecipes::processChunk); - ExNihiloModule.oreSandyChunk.addProcessingHandler(PropertyKey.ORE, ExNihiloRecipes::processChunk); } private static void processChunk(OrePrefix orePrefix, Material material, OreProperty oreProperty) { @@ -42,7 +41,6 @@ private static void processChunk(OrePrefix orePrefix, Material material, OreProp if (oreProperty.getDirectSmeltResult() != null) { smeltingMaterial = oreProperty.getDirectSmeltResult(); } - if (smeltingMaterial.hasProperty(PropertyKey.INGOT)) { smeltStack = OreDictUnifier.get(OrePrefix.ingot, smeltingMaterial); } else if (smeltingMaterial.hasProperty(PropertyKey.GEM)) { @@ -60,7 +58,7 @@ public static void registerGTRecipes() { ModHandler.addShapedRecipe("steam_sieve_steel", STEAM_SIEVE_STEEL.getStackForm(), "BPB", "WMW", "BBB", 'B', new UnificationEntry(OrePrefix.pipeSmallFluid, Materials.WroughtIron), 'M', STEAM_SIEVE_BRONZE.getStackForm(), 'W', new UnificationEntry(OrePrefix.plate, Materials.WroughtIron), 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel)); } - // Has to be done in init phase because of ExNi registering outside of the Registry event + // Has to be done in init phase because of ExNi registering outside the Registry event public static void registerExNihiloRecipes() { // Mirror Ex Nihilo Sifter recipes to Sifter RecipeMap for (SieveRecipe recipe : ExNihiloRegistryManager.SIEVE_REGISTRY.getRecipeList()) { @@ -74,7 +72,7 @@ public static void registerExNihiloRecipes() { if ((int) (siftable.getChance() * (float) Recipe.getMaxChancedValue()) >= Recipe.getMaxChancedValue()) { builder.outputs(siftable.getDrop().getItemStack()); } else { - builder.chancedOutput(siftable.getDrop().getItemStack(), (int) (siftable.getChance() * (float) Recipe.getMaxChancedValue()), 500); + builder.chancedOutput(siftable.getDrop().getItemStack(), (int) (siftable.getChance() * (float) Recipe.getMaxChancedValue()), 200); } } builder.buildAndRegister(); diff --git a/src/main/java/gregtech/integration/exnihilo/recipes/SieveDrops.java b/src/main/java/gregtech/integration/exnihilo/recipes/SieveDrops.java index c5457c3c2a8..b26deece216 100644 --- a/src/main/java/gregtech/integration/exnihilo/recipes/SieveDrops.java +++ b/src/main/java/gregtech/integration/exnihilo/recipes/SieveDrops.java @@ -5,24 +5,16 @@ import exnihilocreatio.registries.types.Siftable; import exnihilocreatio.util.ItemInfo; import gregtech.api.unification.material.Material; -import gregtech.api.unification.ore.OrePrefix; import gregtech.common.blocks.MetaBlocks; import gregtech.integration.exnihilo.ExNihiloConfig; import gregtech.integration.exnihilo.ExNihiloModule; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.NonNullList; -import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class SieveDrops { - private static Map> SIEVE_DROPS_MAP = new HashMap<>(); public static void registerRecipes() { NonNullList siftable = NonNullList.create(); if (ExNihiloConfig.overrideAllSiftDrops) { @@ -47,35 +39,6 @@ public static void registerRecipes() { } } - // TODO Move away from valueOf for GTCEu - private enum SieveDropType implements IStringSerializable { - SAND("sand", ExNihiloModule.oreSandyChunk), - GRAVEL("gravel", ExNihiloModule.oreChunk), - NETHERRACK("nether", ExNihiloModule.oreNetherChunk), - END("end", ExNihiloModule.oreEnderChunk), - GRANITE("crushedGranite", ExNihiloModule.oreChunk), - DIORITE("crushedDiorite", ExNihiloModule.oreChunk), - ANDESITE("crushedAndesite", ExNihiloModule.oreChunk); - - private final String name; - private final OrePrefix prefix; - - SieveDropType(String name, OrePrefix prefix) { - this.name = name; - this.prefix = prefix; - } - - @Override - @Nonnull - public String getName() { - return name; - } - - public OrePrefix getPrefix() { - return prefix; - } - } - private static class SieveDrop { public Material material; public float chance; diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/diamond/ore_sandy_chunk.json deleted file mode 100644 index 05418d79e80..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/diamond/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/diamond/ore_chunk", - "layer1": "gregtech:items/material_sets/diamond/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/ore_sandy_chunk.json deleted file mode 100644 index 73b4cf176b7..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/dull/ore_chunk", - "layer1": "gregtech:items/material_sets/dull/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/emerald/ore_sandy_chunk.json deleted file mode 100644 index 0659afc889d..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/emerald/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/emerald/ore_chunk", - "layer1": "gregtech:items/material_sets/emerald/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/fine/ore_sandy_chunk.json deleted file mode 100644 index 02ba03385a7..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/fine/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/fine/ore_chunk", - "layer1": "gregtech:items/material_sets/fine/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/flint/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/flint/ore_sandy_chunk.json deleted file mode 100644 index 0b421db87db..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/flint/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/flint/ore_chunk", - "layer1": "gregtech:items/material_sets/flint/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/ore_sandy_chunk.json deleted file mode 100644 index 2a7af56815c..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_horizontal/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/gem_horizontal/ore_chunk", - "layer1": "gregtech:items/material_sets/gem_horizontal/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/ore_sandy_chunk.json deleted file mode 100644 index f9c3670e8b2..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/gem_vertical/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/gem_vertical/ore_chunk", - "layer1": "gregtech:items/material_sets/gem_vertical/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/lapis/ore_sandy_chunk.json deleted file mode 100644 index 9f092fb5703..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/lapis/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/lapis/ore_chunk", - "layer1": "gregtech:items/material_sets/lapis/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/lignite/ore_sandy_chunk.json deleted file mode 100644 index 3577c21f81b..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/lignite/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/lignite/ore_chunk", - "layer1": "gregtech:items/material_sets/lignite/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ore_sandy_chunk.json deleted file mode 100644 index 1a2647bca1c..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/metallic/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/metallic/ore_chunk", - "layer1": "gregtech:items/material_sets/metallic/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/ore_sandy_chunk.json deleted file mode 100644 index fbf73531960..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/netherstar/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/netherstar/ore_chunk", - "layer1": "gregtech:items/material_sets/netherstar/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/opal/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/opal/ore_sandy_chunk.json deleted file mode 100644 index 1813a21e649..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/opal/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/ruby/ore_chunk", - "layer1": "gregtech:items/material_sets/ruby/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/quartz/ore_sandy_chunk.json deleted file mode 100644 index e7e16a62c34..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/quartz/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/quartz/ore_chunk", - "layer1": "gregtech:items/material_sets/quartz/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/rough/ore_sandy_chunk.json deleted file mode 100644 index e0afe4d8a4d..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/rough/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/rough/ore_chunk", - "layer1": "gregtech:items/material_sets/rough/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/ruby/ore_sandy_chunk.json deleted file mode 100644 index 1813a21e649..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/ruby/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/ruby/ore_chunk", - "layer1": "gregtech:items/material_sets/ruby/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/sand/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/sand/ore_sandy_chunk.json deleted file mode 100644 index 02ba03385a7..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/sand/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/fine/ore_chunk", - "layer1": "gregtech:items/material_sets/fine/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ore_sandy_chunk.json b/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ore_sandy_chunk.json deleted file mode 100644 index d80f6d99da1..00000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/shiny/ore_sandy_chunk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/shiny/ore_chunk", - "layer1": "gregtech:items/material_sets/shiny/ore_sandy_chunk_overlay" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/diamond/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/diamond/ore_sandy_chunk_overlay.png deleted file mode 100644 index 73b886d578cd1d5223942b47e2e5c48ba03f0b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmV-}0et?6P)Nkl6QOcHy!;L3dt4yo9@+pk2Cf?b=15tB69SLTQSDYM>J1 zj0=;YO;R^5d@wNczxV$Ce=`IB9irG=U7T+v0@v2%x+qQzaCvHyG6t%Z~w zEUSr9sopy{5&AYY=lchv3gCN=_B~j>zM0ys5u!L@G#F}ta5BaB z9DL6aKaGx_&Xxd-!`bh5kR|IfWFlAJO%TP2xV@XuZZ!(XjL>d13iYkuSh>U~PQ*Bz h=`x;2_uYXDmYN=3Jb#jPFIm0Qdiv}orGKH{-@2)^ zjwDHh51-qT1yabF70<1S){#^iH&kWwDvi2xo>4x4=hgslyay!VP>PnVR#(i-m*xOG zw}xphVQ*e%)cweU<*;d8eWuyNrG|`4vUP<1-#Uew6ZJPQrTC24HXy0Lb7VP{p#1VO;|t zYVYQIaNHXLaO>V(bU5Ltd!hi6u+MRGo7IXn^J&WBZ-ALW{@eGIiUkEoJU)~D-Z!;& z`wm)1SQ}d@26I9B^0kA#yo3&8F%07myXH1YB7A!N3ah-B3!vi3sVtOC)~;By#+Dxl zpw_FlSmi}_T8A^nSy5K)@4eKj8g&Q1)5q`h=?z9Hxp{vf6_}mY;dK9VLAr4L2JGsj Uh!7w|LjV8(07*qoM6N<$f=1omuK)l5 diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/emerald/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/emerald/ore_sandy_chunk_overlay.png deleted file mode 100644 index 8615ce4de2b22c74b71ec7a0dfb66ccf7d0d2304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmV;(0XP1MP)TBT7)Br1M^VmtI26_Lnxg!M6) z#Wk}#Gxr_^Gco%i5>9f9n|q%p?>RZZAB#FYtgkMh5h{-Fwk4>vRsNkIhF6M9;4lCH zY;W$jm9z+AczJCRT6(ytQ~>~2cTYI2RLO5d*w{Tt{u@8RMqdU1$Z;jzI&U;NI>_%{ zor{I}_JTO}7fj)`LjX7kL(ca1FaXR=jo{s@b6Wub;xHiPN{XBsTlpO4XU1r5cAP9B z005RHQb4nSCOUP6L+Y+?1cf`{Z!-$mTn+KPa*6? zCgJ4#61|!3q>WCCgz1T4D6Lr-2Cna4$TW%1DpmAmx~bzL0YGW14BHYoJig#4Vl)DU yY<~}*RjSksw@naNu`r)3OilV2$_=!@|56`(Le?sPYJzG20000;gEV&>~iL^%Zl2Z{-*k$>(aRD`~Bn|+A^t}Wjs@? z(&ibQS-oTG%s76gs~@U1Z*I(#i4(mzyYXB$m~2&{X0`w`IL44$rjF6*2UngE65S%?4t diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/flint/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/flint/ore_sandy_chunk_overlay.png deleted file mode 100644 index a427fa6e36e2f0b3d574aefe337e149628cc55cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmV+>0@?kEP)e&55+JS8s4>;Sn9!Jx0y^nz7$r(dVKPbw{tN~a9gWd})Tz%2*_--| zVK8bMm4>9WHd3^_7G8n&-FqCQFRia}GVz{i+#;n~0Dzk}#@ROO4uft^JqBsr z;N;>gl(f*^+h%3%5!(!I+jy7#$oJ-M;nnIo^I^-)AgvonJh%gCn^2Yo)oelSAAnAH zApAaz4EeF98_+buw{6pHpb28dha}Agb6Wxce$@6k7#N_F9uHTlCL-Y>L?fek{U*;i z{sPVlwqg)@nS5RXKx|8dA|p^z@@Anzm!o6YDDGhE`)+@TiWP+Lfi#VaU(0;dIB=j< zswRIbR4^I8h>cPe;o$(e3}&V$=;@+#Q8I$ zGk&^n2;~pl12Z--*%h9^c$>+bJNKM>&s_Kq;l146T&oRv*$rVc?Q2{Ra(n+e9PG5~VsYRq#6WBiL zZofS+&jO)!%C=W#adVj=1!K;q+Kq>u*)ODCNDuK3jsj9pXXq5Vz?J#8Cm86B0Jo=5ThAg(M1y#RmI6BVKYjBt(H2 zWeZiEvZsPhBvD|N?ZRrf5x+g*{RQ81xR!BPGj_JAs@=A(+>mJi`&^1*C&Hy6IY@eLgX3aSe0>d!}yNZ}jM$*1&V_FVMI)Ur? zA{^vW0mG;XK*X|H31GK-lnNQ)dVX-bB=o&-22$5lro%DK+Xr6l4xPs*bWIhm=SwA> zz_gsz8JLzsBpK&O+h=<#Du7@!U3U~pf0oYDX01oz#lAkpj@f|u)4fJ&vn(wd0li(1HdriOz4^b+&{OK?~RP$Z+AA65?#|+ zoS)(F`1HHyD{}B5_!A48YZ533`Fzy|UH-W~0M&?oMzD`Bd;kCd07*qoM6N<$g5wah A-2eap diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/metallic/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/metallic/ore_sandy_chunk_overlay.png deleted file mode 100644 index ad174c30c20a1339fa7c0d2d2cf4fc37f46f2556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 475 zcmV<10VMv3P)ZfO5Tn zl~s#*BZt@cqRj0F==#zvNGzae*s5iT_FVWa~jO+Sr>>toNza$8U0;r^xp!)Ii zO|ob*VWc1&^7ZW-(ksi R{lfqN002ovPDHLkV1god+-?8> diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/netherstar/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/netherstar/ore_sandy_chunk_overlay.png deleted file mode 100644 index d6fc83ee84fca6745f2f9c7acc070a18222cb61f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)_uYXDmYN=3Jb#jPFIm0Qdiv}orGKH{-@2)^ zjwDHh51-qT1yabF70<1S){#^iH&kWwDvi2xo>4x4=hgslyay!VP>PnVR#(i-m*xOG zw}xphVQ*e%)cweU<*;d8eWuyNrG|`4vUP<1-#Uew6ZJPQrTC24HXy0Lb7VP{p#1VO;|t zYVYQIaNHXLaO>V(bU5Ltd!hi6u+MRGo7IXn^J&WBZ-ALW{@eGIiUkEoJU)~D-Z!;& z`wm)1SQ}d@26I9B^0kA#yo3&8F%07myXH1YB7A!N3ah-B3!vi3sVtOC)~;By#+Dxl zpw_FlSmi}_T8A^nSy5K)@4eKj8g&Q1)5q`h=?z9Hxp{vf6_}mY;dK9VLAr4L2JGsj Uh!7w|LjV8(07*qoM6N<$f=1omuK)l5 diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/quartz/ore_sandy_chunk_overlay.png b/src/main/resources/assets/gregtech/textures/items/material_sets/quartz/ore_sandy_chunk_overlay.png deleted file mode 100644 index 1720b7129b1d10170c2e3861f8db2078c61d0b8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)NklDvnurwfOC}JaNz$(<0F0`N^2o}L7=mT_7=qq$nXqWDM0`0=B3rmG= zYDB3fY9m*34BRwnlAAV(nwvXa)O(wlcGqPG4$PS||2IE}f&Zc0B)$F$fQ(seX^2kE z@%`W%_j^o|d~vom+zs0OU$2&F^ghfII#!?}*egdCkIdJS=j4w7*L@&5j-4%u z*bb4g2zEWs*}lfiSzeRRP5gsH_-@?8uIEALr0_XKXyi8Ckzp>&TI_6zYC2CmdD=3? zb5J`zqE<}M>ATDD^sFjc6|6)8$EhhZp)quhU@YdjYXdAiU-~uWY=?`g=KfH>`m|@T zy8MpbSXjlTCUBf8helR5w^MMn0^S}xei#OjH!l|%2#2t&D(|CpLvz+t`(BHE9<9)A$K|v#(-XCu6Mu O0000i_)Xr_afq zM=qI$+~2vbJkKYJg!doY;s>D$=TV|A6;Lt_sXJ9X&zH5@H5HAAQd>kcTgL)PNG5IU zx>HpEmHGps=~%Lst=3mf0PftVqHEc7z@N@ynugd{uc%4?1G-gVrR3mEW&qe`A<-~% z_H%8!LaXEA_QxP1npswvOkRb7&#JRU-Kp}bc_^s>K%KZh6~K5pLxMSnuiuLQ{Xix^ z8uH8c)ht->@X;-~bV#qU$NHKDK;5ZgV0JT}R z#VQtPwvHvXc4C4U(*8C`tg5zMq0=2or#n=G(S(ubpD!VtM}+f#hofs*b!uS%B<-j! a6u$wnFx-{AH-kO^0000a%3cgkkX|@98uyMA9-;AuqCQ@2n?CtoX~jhkN4NHOVcnkX?8s)_e|YK1b`y z7OR+-te*Vev$*GK4FeZpj z01VnbfC4n{9GRQR=(q3JER_mF%%}wcMAAa=Tpv@YL5O|t>TF?Fe80!Qn290k-?Rl# z?f)Z)w`bNM-z}Z~y=R07*qoM6N<$ Ef) z4AWtsLgg{QO30FfjGY7!Z!ltgqoi@CAcOV^nY~-sc8W@=D1Sqi0Pm`2S}7GZTiTVt zHxh{?h}n5i#clVgH(bj5g}IYCAk6;c=@BD;!f#_3{5n4S<+)6DysO?zyV~-E&s}cJdhjWp)B{Kq?W}N~x%TY~>tUr^h-Sb^zp}-BWKE zaQD$e09u#*5VE`jXZL}6o?-jmeL7!%=*XV{NYskZ`1pDL&iH`H9nq*`y{q?3#%Q|b+udc!5my}juWk6Jnk#$x&=CT#t#U^OMnnEv#poifm{{*_xb}swa94_RAEp60000