Skip to content

Commit

Permalink
fix missing textures once again... (#198)
Browse files Browse the repository at this point in the history
* fix missing textures once again...

* fix PA lang, run data

---------

Co-authored-by: Screret <[email protected]>
  • Loading branch information
screret and Screret authored Jul 24, 2023
1 parent 7a8187d commit 2179a34
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public ResourceLocation getBlockTexturePath(@Nonnull MaterialIconSet materialIco
if (!iconSet.isRootIconset && Platform.isClient() && Minecraft.getInstance() != null && Minecraft.getInstance().getResourceManager() != null) { // check minecraft for null for CI environments
while (!iconSet.isRootIconset) {
ResourceLocation location = GTCEu.id(String.format("textures/block/material_sets/%s/%s.png", iconSet.name, this.name));
if (ResourceHelper.isResourceExist(location)) break;
if (ResourceHelper.isResourceExist(location) || ResourceHelper.isResourceExistRaw(location)) break;
iconSet = iconSet.parentIconset;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public enum GTToolType {
SHOVEL("shovel", "shovels", 1.5F, -3.0F, true),
AXE("axe", "axes", 6.0F, -3.2F, true),
HOE("hoe", "hoes", 0, -3.0F, true),
SAW("saw", "saws", 1, 1, GTSoundEntries.SAW_TOOL),

MINING_HAMMER("mining_hammer", "mining_hammers", TagUtil.createBlockTag("mineable/pickaxe", true), 1.5F, -3.2F, GTCEu.id("item/tools/mining_hammer"), null),

SAW("saw", "saws", 1, 1, GTSoundEntries.SAW_TOOL),
HARD_HAMMER("hammer", "hammers", 1, 1, GTSoundEntries.FORGE_HAMMER),
SOFT_MALLET("mallet", "mallets", 1, 1, GTSoundEntries.SOFT_MALLET_TOOL),
WRENCH("wrench", "wrenches", 1, 1, GTSoundEntries.WRENCH_TOOL),
Expand All @@ -44,7 +44,7 @@ public enum GTToolType {
BUTCHERY_KNIFE("butchery_knife", "butchery_knives", 1, 1),
// GRAFTER("grafter", 1, 1, GTCEu.id("item/tools/handle_hammer"), GTCEu.id("item/tools/hammer")),
PLUNGER("plunger", "plungers", 1, 1, GTSoundEntries.PLUNGER_TOOL);

public final String name;
public final TagKey<Item> itemTag;
public final TagKey<Block> harvestTag;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,25 @@
import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity;
import com.gregtechceu.gtceu.api.capability.IMiner;
import com.gregtechceu.gtceu.api.capability.PlatformEnergyCompat;
import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability;
import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.api.item.DrumMachineItem;
import com.gregtechceu.gtceu.api.machine.*;
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IRotorHolderMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.*;
import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine;
import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine;
import com.gregtechceu.gtceu.api.machine.steam.SteamBoilerMachine;
import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern;
import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo;
import com.gregtechceu.gtceu.api.pattern.Predicates;
import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate;
import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
import com.gregtechceu.gtceu.api.registry.GTRegistries;
import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
Expand All @@ -37,22 +45,10 @@
import com.gregtechceu.gtceu.common.machine.multiblock.primitive.PrimitivePumpMachine;
import com.gregtechceu.gtceu.common.machine.multiblock.steam.LargeBoilerMachine;
import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine;
import com.gregtechceu.gtceu.common.machine.steam.SteamLiquidBoilerMachine;
import com.gregtechceu.gtceu.common.machine.steam.SteamMinerMachine;
import com.gregtechceu.gtceu.common.machine.steam.SteamSolidBoilerMachine;
import com.gregtechceu.gtceu.common.machine.storage.CrateMachine;
import com.gregtechceu.gtceu.common.machine.storage.CreativeEnergyContainerMachine;
import com.gregtechceu.gtceu.common.machine.storage.DrumMachine;
import com.gregtechceu.gtceu.common.machine.storage.QuantumChestMachine;
import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine;
import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability;
import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine;
import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern;
import com.gregtechceu.gtceu.api.pattern.MultiblockShapeInfo;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.common.machine.steam.SteamLiquidBoilerMachine;
import com.gregtechceu.gtceu.common.machine.storage.*;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.gregtechceu.gtceu.data.lang.LangHandler;
import com.gregtechceu.gtceu.integration.kjs.GTRegistryObjectBuilderTypes;
Expand Down Expand Up @@ -80,9 +76,11 @@
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;

import java.util.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Supplier;
Expand All @@ -93,9 +91,10 @@
import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*;
import static com.gregtechceu.gtceu.api.registry.GTRegistries.REGISTRATE;
import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.*;
import static com.gregtechceu.gtceu.common.data.GTCreativeModeTabs.MACHINE;
import static com.gregtechceu.gtceu.common.data.GTMaterials.DrillingFluid;
import static com.gregtechceu.gtceu.utils.FormattingUtil.*;
import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName;
import static com.gregtechceu.gtceu.utils.FormattingUtil.toRomanNumeral;

/**
* @author KilaBash
Expand Down Expand Up @@ -1288,6 +1287,7 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n

public final static MultiblockMachineDefinition[] PROCESSING_ARRAY = ConfigHolder.INSTANCE.machines.doProcessingArray ? registerTieredMultis("processing_array", ProcessingArrayMachine::new,
(tier, builder) -> builder
.langValue(VNF[tier] + " Processing Array")
.rotationState(RotationState.NON_Y_AXIS)
.blockProp(p -> p.noOcclusion().isViewBlocking((state, level, pos) -> false))
.shape(Shapes.box(0.001, 0.001, 0.001, 0.999, 0.999, 0.999))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package com.gregtechceu.gtceu.data.recipe.generated;

import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial;
import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials;
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
import com.gregtechceu.gtceu.api.data.chemical.material.properties.ToolProperty;
import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.data.recipe.CustomTags;
import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.tags.ItemTags;
Expand Down Expand Up @@ -111,10 +109,15 @@ private static void processTool(TagPrefix prefix, Material material, ToolPropert

if (material.hasFlag(GENERATE_PLATE)) {

addToolRecipe(provider, material, GTToolType.MINING_HAMMER, true,
"PPf", "PPS", "PPh",
'P', plate,
'S', stick);

//addToolRecipe(provider, material, GTToolType.SPADE, false,
// "fPh", "PSP", " S ",
// 'P', plate,
// 'S', rod);
// 'S', stick);

addToolRecipe(provider, material, GTToolType.SAW, false,
"PPS", "fhS",
Expand Down Expand Up @@ -196,11 +199,6 @@ private static void processTool(TagPrefix prefix, Material material, ToolPropert
'T', new UnificationEntry(TagPrefix.screw, material),
'S', rod);
}

addToolRecipe(provider, material, GTToolType.MINING_HAMMER, true,
"PPf", "PPS", "PPh",
'P', plate,
'S', rod);
}

addToolRecipe(provider, material, GTToolType.SCREWDRIVER, true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.block.MetaMachineBlock;
import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity;
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.item.MetaMachineItem;
import com.gregtechceu.gtceu.api.recipe.OverclockingLogic;
Expand All @@ -23,7 +21,6 @@
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;

import java.util.Arrays;
import java.util.function.BiConsumer;
import java.util.function.Function;

Expand Down Expand Up @@ -104,6 +101,6 @@ private static void simple(MachineBuilder<KineticMachineDefinition> builder, int

public static MachineBuilder<KineticMachineDefinition> createAll(String name, Object... args) {
KineticMachineBuilder[] builders = tieredMachines(name, KineticMachineBuilder::simple, MachineFunctionPresets.mapTierArray(args));
return MachineFunctionPresets.builder(name, builders, KineticMachineBuilder.class, (id) -> new KineticMachineDefinition(id, false, 0), MetaMachineBlock::new, MetaMachineBlockEntity::createBlockEntity);
return MachineFunctionPresets.builder(name, builders, KineticMachineBuilder.class, (id) -> new KineticMachineDefinition(id, false, 0), KineticMachineBlock::new, KineticMachineBlockEntity::create);
}
}
5 changes: 3 additions & 2 deletions fabric/src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"block.gtceu.iv_output_hatch": "ɥɔʇɐH ʇndʇnO ΛIƖ§",
"block.gtceu.iv_packer": "ɹ§ ɹǝʞɔɐԀ ǝʇıןƎƖ§",
"block.gtceu.iv_polarizer": "ɹ§ ɹǝzıɹɐןoԀ ǝʇıןƎƖ§",
"block.gtceu.iv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ʌI",
"block.gtceu.iv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ΛIƖ§",
"block.gtceu.iv_quantum_chest": "Λ ʇsǝɥƆ ɯnʇuɐnὉ",
"block.gtceu.iv_quantum_tank": "Λ ʞuɐ⟘ ɯnʇuɐnὉ",
"block.gtceu.iv_rock_crusher": "ɹ§ ɹǝɥsnɹƆ ʞɔoᴚ ǝʇıןƎƖ§",
Expand Down Expand Up @@ -466,7 +466,7 @@
"block.gtceu.luv_output_hatch": "ɥɔʇɐH ʇndʇnO ΛnꞀp§",
"block.gtceu.luv_packer": "ɹ§II ɹǝʞɔɐԀ ǝʇıןƎp§",
"block.gtceu.luv_polarizer": "ɹ§II ɹǝzıɹɐןoԀ ǝʇıןƎp§",
"block.gtceu.luv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ʌnꞀ",
"block.gtceu.luv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ΛnꞀp§",
"block.gtceu.luv_quantum_chest": "IΛ ʇsǝɥƆ ɯnʇuɐnὉ",
"block.gtceu.luv_quantum_tank": "IΛ ʞuɐ⟘ ɯnʇuɐnὉ",
"block.gtceu.luv_rock_crusher": "ɹ§II ɹǝɥsnɹƆ ʞɔoᴚ ǝʇıןƎp§",
Expand Down Expand Up @@ -924,6 +924,7 @@
"config.gtceu.option.defaultPaintingColor": "ɹoןoƆbuıʇuıɐԀʇןnɐɟǝp",
"config.gtceu.option.disableManualCompression": "uoıssǝɹdɯoƆןɐnuɐWǝןqɐsıp",
"config.gtceu.option.doBedrockOres": "sǝɹOʞɔoɹpǝᗺop",
"config.gtceu.option.doProcessingArray": "ʎɐɹɹⱯbuıssǝɔoɹԀop",
"config.gtceu.option.doTerrainExplosion": "uoısoןdxƎuıɐɹɹǝ⟘op",
"config.gtceu.option.doesExplosionDamagesTerrain": "uıɐɹɹǝ⟘sǝbɐɯɐᗡuoısoןdxƎsǝop",
"config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
Expand Down
5 changes: 3 additions & 2 deletions fabric/src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"block.gtceu.iv_output_hatch": "§1IV Output Hatch",
"block.gtceu.iv_packer": "§1Elite Packer §r",
"block.gtceu.iv_polarizer": "§1Elite Polarizer §r",
"block.gtceu.iv_processing_array": "Iv Processing Array",
"block.gtceu.iv_processing_array": "§1IV Processing Array",
"block.gtceu.iv_quantum_chest": "Quantum Chest V",
"block.gtceu.iv_quantum_tank": "Quantum Tank V",
"block.gtceu.iv_rock_crusher": "§1Elite Rock Crusher §r",
Expand Down Expand Up @@ -466,7 +466,7 @@
"block.gtceu.luv_output_hatch": "§dLuV Output Hatch",
"block.gtceu.luv_packer": "§dElite Packer II§r",
"block.gtceu.luv_polarizer": "§dElite Polarizer II§r",
"block.gtceu.luv_processing_array": "Luv Processing Array",
"block.gtceu.luv_processing_array": "§dLuV Processing Array",
"block.gtceu.luv_quantum_chest": "Quantum Chest VI",
"block.gtceu.luv_quantum_tank": "Quantum Tank VI",
"block.gtceu.luv_rock_crusher": "§dElite Rock Crusher II§r",
Expand Down Expand Up @@ -924,6 +924,7 @@
"config.gtceu.option.defaultPaintingColor": "defaultPaintingColor",
"config.gtceu.option.disableManualCompression": "disableManualCompression",
"config.gtceu.option.doBedrockOres": "doBedrockOres",
"config.gtceu.option.doProcessingArray": "doProcessingArray",
"config.gtceu.option.doTerrainExplosion": "doTerrainExplosion",
"config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain",
"config.gtceu.option.enableCleanroom": "enableCleanroom",
Expand Down
5 changes: 3 additions & 2 deletions forge/src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"block.gtceu.iv_output_hatch": "ɥɔʇɐH ʇndʇnO ΛIƖ§",
"block.gtceu.iv_packer": "ɹ§ ɹǝʞɔɐԀ ǝʇıןƎƖ§",
"block.gtceu.iv_polarizer": "ɹ§ ɹǝzıɹɐןoԀ ǝʇıןƎƖ§",
"block.gtceu.iv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ʌI",
"block.gtceu.iv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ΛIƖ§",
"block.gtceu.iv_quantum_chest": "Λ ʇsǝɥƆ ɯnʇuɐnὉ",
"block.gtceu.iv_quantum_tank": "Λ ʞuɐ⟘ ɯnʇuɐnὉ",
"block.gtceu.iv_rock_crusher": "ɹ§ ɹǝɥsnɹƆ ʞɔoᴚ ǝʇıןƎƖ§",
Expand Down Expand Up @@ -466,7 +466,7 @@
"block.gtceu.luv_output_hatch": "ɥɔʇɐH ʇndʇnO ΛnꞀp§",
"block.gtceu.luv_packer": "ɹ§II ɹǝʞɔɐԀ ǝʇıןƎp§",
"block.gtceu.luv_polarizer": "ɹ§II ɹǝzıɹɐןoԀ ǝʇıןƎp§",
"block.gtceu.luv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ʌnꞀ",
"block.gtceu.luv_processing_array": "ʎɐɹɹⱯ buıssǝɔoɹԀ ΛnꞀp§",
"block.gtceu.luv_quantum_chest": "IΛ ʇsǝɥƆ ɯnʇuɐnὉ",
"block.gtceu.luv_quantum_tank": "IΛ ʞuɐ⟘ ɯnʇuɐnὉ",
"block.gtceu.luv_rock_crusher": "ɹ§II ɹǝɥsnɹƆ ʞɔoᴚ ǝʇıןƎp§",
Expand Down Expand Up @@ -924,6 +924,7 @@
"config.gtceu.option.defaultPaintingColor": "ɹoןoƆbuıʇuıɐԀʇןnɐɟǝp",
"config.gtceu.option.disableManualCompression": "uoıssǝɹdɯoƆןɐnuɐWǝןqɐsıp",
"config.gtceu.option.doBedrockOres": "sǝɹOʞɔoɹpǝᗺop",
"config.gtceu.option.doProcessingArray": "ʎɐɹɹⱯbuıssǝɔoɹԀop",
"config.gtceu.option.doTerrainExplosion": "uoısoןdxƎuıɐɹɹǝ⟘op",
"config.gtceu.option.doesExplosionDamagesTerrain": "uıɐɹɹǝ⟘sǝbɐɯɐᗡuoısoןdxƎsǝop",
"config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
Expand Down
5 changes: 3 additions & 2 deletions forge/src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"block.gtceu.iv_output_hatch": "§1IV Output Hatch",
"block.gtceu.iv_packer": "§1Elite Packer §r",
"block.gtceu.iv_polarizer": "§1Elite Polarizer §r",
"block.gtceu.iv_processing_array": "Iv Processing Array",
"block.gtceu.iv_processing_array": "§1IV Processing Array",
"block.gtceu.iv_quantum_chest": "Quantum Chest V",
"block.gtceu.iv_quantum_tank": "Quantum Tank V",
"block.gtceu.iv_rock_crusher": "§1Elite Rock Crusher §r",
Expand Down Expand Up @@ -466,7 +466,7 @@
"block.gtceu.luv_output_hatch": "§dLuV Output Hatch",
"block.gtceu.luv_packer": "§dElite Packer II§r",
"block.gtceu.luv_polarizer": "§dElite Polarizer II§r",
"block.gtceu.luv_processing_array": "Luv Processing Array",
"block.gtceu.luv_processing_array": "§dLuV Processing Array",
"block.gtceu.luv_quantum_chest": "Quantum Chest VI",
"block.gtceu.luv_quantum_tank": "Quantum Tank VI",
"block.gtceu.luv_rock_crusher": "§dElite Rock Crusher II§r",
Expand Down Expand Up @@ -924,6 +924,7 @@
"config.gtceu.option.defaultPaintingColor": "defaultPaintingColor",
"config.gtceu.option.disableManualCompression": "disableManualCompression",
"config.gtceu.option.doBedrockOres": "doBedrockOres",
"config.gtceu.option.doProcessingArray": "doProcessingArray",
"config.gtceu.option.doTerrainExplosion": "doTerrainExplosion",
"config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain",
"config.gtceu.option.enableCleanroom": "enableCleanroom",
Expand Down

0 comments on commit 2179a34

Please sign in to comment.