diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dae121ca4..837b0f68cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,5 +3,19 @@ Version: 1.0.15 * Bump ldlib version for better compass +* add initial compass content +* inject models for items and blocks +* add manual IO mode on covers +* add temperature tooltip for small steam boilers +* return covers to inventory on crowbar use, instead of dropping them +* allow singleblock generators to face up +* allow tools to use their last durability point * fix lag with pattern checking * fix the Machine mode selector +* fix several missing recipes +* fix small steam boilers not producing steam +* fix wrong temperatures in the UI +* fix item pipes stopping transfer after their transfer rate per second has been reached once +* fix capability IO directions +* fix laser pipes not connecting to hatches +* fix diodes being counted as energy input in cleanrooms \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index dfc4186c7c..46ea895897 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -31,6 +31,15 @@ configurations { // snapshotModImplementation { // resolutionStrategy.cacheChangingModulesFor(0, "seconds") // } + apiElements { + outgoing { + capability("net.fabricmc.fabric-api:fabric-api-${this.libs.versions.minecraft.get()}:${this.fabric.versions.fabricApi.get()}") + capability("com.lowdragmc.ldlib:ldlib-common-${this.libs.versions.minecraft.get()}:${this.fabric.versions.ldlib.get()}") + capability("com.tterrag.registrate_fabric:Registrate:${this.fabric.versions.registrate.get()}") + capability("dev.toma.configuration:configuration-fabric-${this.libs.versions.minecraft.get()}:${this.fabric.versions.configuration.get()}") + capability("io.github.llamalad7:mixinextras-common:${this.fabric.versions.mixinextras.get()}") + } + } } //configurations.all { @@ -81,6 +90,9 @@ dependencies { // KJS modCompileOnly fabric.kubejs + // Mixin Extras + implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${fabric.versions.mixinextras.get()}")) + // Configuration modCompileOnly fabric.configuration } diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/GTValues.java b/common/src/main/java/com/gregtechceu/gtceu/api/GTValues.java index 8f4977f4ec..1802c0bcbd 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/GTValues.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/GTValues.java @@ -58,12 +58,22 @@ public class GTValues { */ public static final long[] V = new long[]{8, 32, 128, 512, 2048, 8192, 32768, 131072, 524288, 2097152, 8388608, 33554432, 134217728, 536870912, Integer.MAX_VALUE}; + /** + * The Voltage Tiers divided by 2. + */ + public static final int[] VH = {4, 16, 64, 256, 1024, 4096, 16384, 65536, 262144, 1048576, 4194304, 16777216, 67108864, 268435456, 1073741824}; + /** * The Voltage Tiers adjusted for cable loss. Use this for recipe EU/t to avoid full-amp recipes */ public static final int[] VA = new int[]{7, 30, 120, 480, 1920, 7680, 30720, 122880, 491520, 1966080, 7864320, 31457280, 125829120, 503316480, 2013265920}; + /** + * The Voltage Tiers adjusted for cable loss, divided by 2. + */ + public static final int[] VHA = {7, 16, 60, 240, 960, 3840, 15360, 61440, 245760, 983040, 3932160, 15728640, 62914560, 251658240, 1006632960}; + public static final int ULV = 0; public static final int LV = 1; public static final int MV = 2; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java b/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java index c43c608d81..36705dd861 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/block/MaterialBlock.java @@ -34,38 +34,33 @@ */ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public class MaterialBlock extends AppearanceBlock implements IBlockRendererProvider { +public class MaterialBlock extends AppearanceBlock { public final TagPrefix tagPrefix; public final Material material; - public final IRenderer renderer; - public MaterialBlock(Properties properties, TagPrefix tagPrefix, Material material) { - super(properties); - this.material = material; - this.tagPrefix = tagPrefix; - this.renderer = Platform.isClient() ? MaterialBlockRenderer.getOrCreate(tagPrefix.materialIconType(), material.getMaterialIconSet()) : null; - } - - public MaterialBlock(Properties properties, TagPrefix tagPrefix, Material material, IRenderer renderer) { + public MaterialBlock(Properties properties, TagPrefix tagPrefix, Material material, boolean registerModel) { super(properties); this.material = material; this.tagPrefix = tagPrefix; - this.renderer = renderer; + if (registerModel && Platform.isClient()) { + MaterialBlockRenderer.create(this, tagPrefix.materialIconType(), material.getMaterialIconSet()); + } } - @Nullable - @Override - @Environment(EnvType.CLIENT) - public IRenderer getRenderer(BlockState state) { - return renderer; + public MaterialBlock(Properties properties, TagPrefix tagPrefix, Material material) { + this(properties, tagPrefix, material, true); } @Environment(EnvType.CLIENT) public static BlockColor tintedColor() { return (state, reader, pos, tintIndex) -> { if (state.getBlock() instanceof MaterialBlock block) { - return block.material.getMaterialRGB(); + if (tintIndex == 1 && block.material.getMaterialSecondaryRGB() != -1) { + return block.material.getMaterialSecondaryRGB(); + } else { + return block.material.getMaterialRGB(); + } } return -1; }; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java b/common/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java index 3cd0c92991..510a66e0f2 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java @@ -193,7 +193,7 @@ public List getDrops(BlockState pState, LootContext.Builder pBuilder) if (tileEntity instanceof IMachineBlockEntity holder) { var machine = holder.getMetaMachine(); for (Direction direction : Direction.values()) { - machine.getCoverContainer().removeCover(direction); + machine.getCoverContainer().removeCover(direction, null); } if (machine instanceof IMachineModifyDrops machineModifyDrops && entity instanceof Player) { machineModifyDrops.onDrops(drops, (Player) entity); diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java b/common/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java index d54482da19..bf6b019810 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java @@ -35,8 +35,10 @@ import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; -import net.minecraft.world.phys.shapes.*; -import org.apache.commons.lang3.ArrayUtils; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.EntityCollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -238,7 +240,7 @@ public List getDrops(BlockState state, LootContext.Builder builder) { BlockEntity tileEntity = context.getParamOrNull(LootContextParams.BLOCK_ENTITY); if (tileEntity instanceof IPipeNode pipeTile) { for (Direction direction : Direction.values()) { - pipeTile.getCoverContainer().removeCover(direction); + pipeTile.getCoverContainer().removeCover(direction, null); } } return super.getDrops(state, builder); diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java b/common/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java new file mode 100644 index 0000000000..bf1cd690d0 --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/block/RendererMaterialBlock.java @@ -0,0 +1,26 @@ +package com.gregtechceu.gtceu.api.block; + +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider; +import com.lowdragmc.lowdraglib.client.renderer.IRenderer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +public class RendererMaterialBlock extends MaterialBlock implements IBlockRendererProvider { + public final IRenderer renderer; + + public RendererMaterialBlock(Properties properties, TagPrefix tagPrefix, Material material, @Nullable IRenderer renderer) { + super(properties, tagPrefix, material, false); + this.renderer = renderer; + } + + @Nullable + @Override + @Environment(EnvType.CLIENT) + public IRenderer getRenderer(BlockState state) { + return renderer; + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java b/common/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java index 031e5ba217..a0ba774229 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java @@ -1,20 +1,20 @@ package com.gregtechceu.gtceu.api.blockentity; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.block.BlockProperties; import com.gregtechceu.gtceu.api.block.MaterialPipeBlock; +import com.gregtechceu.gtceu.api.capability.ICoverable; +import com.gregtechceu.gtceu.api.capability.IToolable; import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.pipenet.IPipeNode; -import com.gregtechceu.gtceu.api.pipenet.PipeCoverContainer; -import com.gregtechceu.gtceu.api.block.BlockProperties; -import com.gregtechceu.gtceu.api.capability.ICoverable; -import com.gregtechceu.gtceu.api.capability.IToolable; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.IToolGridHighLight; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.pipenet.IAttachData; +import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.pipenet.IPipeType; +import com.gregtechceu.gtceu.api.pipenet.PipeCoverContainer; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.syncdata.EnhancedFieldManagedStorage; import com.gregtechceu.gtceu.api.syncdata.IEnhancedManaged; @@ -286,7 +286,7 @@ public InteractionResult onToolClick(@NotNull GTToolType toolType, ItemStack ite } else if (toolType == GTToolType.CROWBAR) { if (coverBehavior != null) { if (!isRemote()) { - getCoverContainer().removeCover(gridSide); + getCoverContainer().removeCover(gridSide, playerIn); } return InteractionResult.CONSUME; } diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java b/common/src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java index 5726d0d7a4..924f3cac42 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java @@ -11,6 +11,8 @@ import com.lowdragmc.lowdraglib.LDLib; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.widget.Widget; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.utils.RayTraceHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -61,10 +63,14 @@ public interface ICoverable extends ITickSubscription, IAppearance, IFancyConfig boolean shouldRenderBackSide(); + // TODO replace getItemTransferCap and getFluidTransferCap with a cross-platform capability implementation + IItemTransfer getItemTransferCap(@Nullable Direction side, boolean useCoverCapability); + IFluidTransfer getFluidTransferCap(@Nullable Direction side, boolean useCoverCapability); + /** * Its an internal method, you should never call it yourself. *
- * Use {@link ICoverable#removeCover(boolean, Direction)} and {@link ICoverable#placeCoverOnSide(Direction, ItemStack, CoverDefinition, ServerPlayer)} instead + * Use {@link ICoverable#removeCover(boolean, Direction, Player)} and {@link ICoverable#placeCoverOnSide(Direction, ItemStack, CoverDefinition, ServerPlayer)} instead * @param coverBehavior * @param side */ @@ -79,7 +85,7 @@ default boolean placeCoverOnSide(Direction side, ItemStack itemStack, CoverDefin return false; } if (getCoverAtSide(side) != null) { - removeCover(side); + removeCover(side, player); } coverBehavior.onAttached(itemStack, player); coverBehavior.onLoad(); @@ -92,7 +98,7 @@ default boolean placeCoverOnSide(Direction side, ItemStack itemStack, CoverDefin return true; } - default boolean removeCover(boolean dropItself, Direction side) { + default boolean removeCover(boolean dropItself, Direction side, @Nullable Player player) { CoverBehavior coverBehavior = getCoverAtSide(side); if (coverBehavior == null) { return false; @@ -104,7 +110,11 @@ default boolean removeCover(boolean dropItself, Direction side) { coverBehavior.onRemoved(); setCoverAtSide(null, side); for (ItemStack dropStack : drops) { + if (player != null && player.getInventory().add(dropStack)) + continue; + Block.popResource(getLevel(), getPos(), dropStack); + } notifyBlockUpdate(); markDirty(); @@ -112,8 +122,8 @@ default boolean removeCover(boolean dropItself, Direction side) { return true; } - default boolean removeCover(Direction side) { - return removeCover(true, side); + default boolean removeCover(Direction side, @Nullable Player player) { + return removeCover(true, side, player); } default List getCovers() { diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java b/common/src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java index 1f7ae51d98..59784e83a3 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java @@ -9,6 +9,8 @@ import com.gregtechceu.gtceu.api.syncdata.IEnhancedManaged; import com.gregtechceu.gtceu.client.renderer.cover.ICoverRenderer; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; @@ -199,4 +201,17 @@ public BlockState getAppearance(BlockState sourceState, BlockPos sourcePos) { return null; } + ////////////////////////////////////// + //******* Capabilities *******// + ////////////////////////////////////// + + // TODO possibly refactor this in the future, using some sort of cross-platform capability-like system + + public IItemTransfer getItemTransferCap(Direction side, IItemTransfer defaultValue) { + return defaultValue; + } + + public IFluidTransfer getFluidTransferCap(Direction side, IFluidTransfer defaultValue) { + return defaultValue; + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java b/common/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java index 8bc6b787bc..83c4acb482 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java @@ -82,6 +82,10 @@ public F getFilter() { return this.filter; } + public boolean test(T resource) { + return getFilter().test(resource); + } + public FilterHandler onFilterLoaded(Consumer onFilterLoaded) { this.onFilterLoaded = onFilterLoaded; return this; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java index e6a5d5f084..e09e88eba1 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java @@ -282,10 +282,18 @@ public int getMaterialARGB() { return materialInfo.color | 0xff000000; } + public int getMaterialSecondaryARGB() { + return materialInfo.secondaryColor | 0xff000000; + } + public int getMaterialRGB() { return materialInfo.color; } + public int getMaterialSecondaryRGB() { + return materialInfo.secondaryColor; + } + public boolean hasFluidColor() { return materialInfo.hasFluidColor; } @@ -755,6 +763,18 @@ public Builder color(int color, boolean hasFluidColor) { return this; } + /** + * Set the secondary color of this Material.
+ * Defaults to 0xFFFFFF unless {@link Builder#colorAverage()} was called, where + * it will be a weighted average of the components of the Material. + * + * @param color The RGB-formatted Color. + */ + public Builder secondaryColor(int color) { + this.materialInfo.secondaryColor = color; + return this; + } + public Builder colorAverage() { this.averageRGB = true; return this; @@ -1036,6 +1056,14 @@ private static class MaterialInfo { */ private int color = -1; + /** + * The secondary color of this Material. + * If this is default, then it's not used. + *

+ * Default: 0xFFFFFF if no Components, otherwise it will be the average of Components. + */ + private int secondaryColor = -1; + /** * The color of this Material. *

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java index 6402f36f83..6178e58df5 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialIconType.java @@ -103,7 +103,10 @@ public record MaterialIconType(String name) { public static final MaterialIconType essence = new MaterialIconType("essence"); private static final Table ITEM_MODEL_CACHE = HashBasedTable.create(); + private static final Table ITEM_TEXTURE_CACHE = HashBasedTable.create(); + private static final Table BLOCK_MODEL_CACHE = HashBasedTable.create(); private static final Table BLOCK_TEXTURE_CACHE = HashBasedTable.create(); + private static final Table BLOCK_TEXTURE_CACHE_SECONDARY = HashBasedTable.create(); public MaterialIconType(String name) { this.name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); @@ -121,20 +124,62 @@ public static MaterialIconType getByName(String name) { return ICON_TYPES.get(name); } - @Nullable // Safe: only null on registration on fabric, and no "required" textures are resolved at that point. + @Nullable public ResourceLocation getBlockTexturePath(@Nonnull MaterialIconSet materialIconSet, boolean doReadCache) { + return getBlockTexturePath(materialIconSet, null, doReadCache); + } + + @Nullable // Safe: only null on registration on fabric, and no "required" textures are resolved at that point. + public ResourceLocation getBlockTexturePath(@Nonnull MaterialIconSet materialIconSet, String suffix, boolean doReadCache) { if (doReadCache) { - if (BLOCK_TEXTURE_CACHE.contains(this, materialIconSet)) { - return BLOCK_TEXTURE_CACHE.get(this, materialIconSet); + if (suffix == null || suffix.isBlank()) { + if (BLOCK_TEXTURE_CACHE.contains(this, materialIconSet)) return BLOCK_TEXTURE_CACHE.get(this, materialIconSet); + } else { + if (BLOCK_TEXTURE_CACHE_SECONDARY.contains(this, materialIconSet)) return BLOCK_TEXTURE_CACHE_SECONDARY.get(this, materialIconSet); } } + suffix = suffix == null || suffix.isBlank() ? "" : "_" + suffix; + MaterialIconSet iconSet = materialIconSet; //noinspection ConstantConditions if (!Platform.isClient() || Minecraft.getInstance() == null || Minecraft.getInstance().getResourceManager() == null) return null; // check minecraft for null for CI environments if (!iconSet.isRootIconset) { while (!iconSet.isRootIconset) { - ResourceLocation location = GTCEu.id(String.format("textures/block/material_sets/%s/%s.png", iconSet.name, this.name)); + ResourceLocation location = GTCEu.id(String.format("textures/block/material_sets/%s/%s%s.png", iconSet.name, this.name, suffix)); + if (ResourceHelper.isResourceExist(location) || ResourceHelper.isResourceExistRaw(location)) + break; + iconSet = iconSet.parentIconset; + } + } + + ResourceLocation location = GTCEu.id(String.format("textures/block/material_sets/%s/%s%s.png", iconSet.name, this.name, suffix)); + if (!suffix.isEmpty() && !ResourceHelper.isResourceExist(location) && !ResourceHelper.isResourceExistRaw(location)) { + return null; + } + location = GTCEu.id(String.format("block/material_sets/%s/%s%s", iconSet.name, this.name, suffix)); + if (suffix.isEmpty()) { + BLOCK_TEXTURE_CACHE.put(this, materialIconSet, location); + } else { + BLOCK_TEXTURE_CACHE_SECONDARY.put(this, materialIconSet, location); + } + + return location; + } + + @Nonnull + public ResourceLocation getBlockModelPath(@Nonnull MaterialIconSet materialIconSet, boolean doReadCache) { + if (doReadCache) { + if (BLOCK_MODEL_CACHE.contains(this, materialIconSet)) { + return BLOCK_MODEL_CACHE.get(this, materialIconSet); + } + } + + MaterialIconSet iconSet = materialIconSet; + //noinspection ConstantConditions + 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("models/block/material_sets/%s/%s.json", iconSet.name, this.name)); if (ResourceHelper.isResourceExist(location) || ResourceHelper.isResourceExistRaw(location)) break; iconSet = iconSet.parentIconset; @@ -142,7 +187,7 @@ public ResourceLocation getBlockTexturePath(@Nonnull MaterialIconSet materialIco } ResourceLocation location = GTCEu.id(String.format("block/material_sets/%s/%s", iconSet.name, this.name)); - BLOCK_TEXTURE_CACHE.put(this, materialIconSet, location); + ITEM_MODEL_CACHE.put(this, materialIconSet, location); return location; } @@ -160,7 +205,8 @@ public ResourceLocation getItemModelPath(@Nonnull MaterialIconSet materialIconSe 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("models/item/material_sets/%s/%s.json", iconSet.name, this.name)); - if (ResourceHelper.isResourceExist(location)) break; + if (ResourceHelper.isResourceExist(location) || ResourceHelper.isResourceExistRaw(location)) + break; iconSet = iconSet.parentIconset; } } @@ -171,6 +217,31 @@ public ResourceLocation getItemModelPath(@Nonnull MaterialIconSet materialIconSe return location; } + @Nonnull + public ResourceLocation getItemTexturePath(@Nonnull MaterialIconSet materialIconSet, boolean doReadCache) { + if (doReadCache) { + if (ITEM_TEXTURE_CACHE.contains(this, materialIconSet)) { + return ITEM_TEXTURE_CACHE.get(this, materialIconSet); + } + } + + MaterialIconSet iconSet = materialIconSet; + //noinspection ConstantConditions + 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/item/material_sets/%s/%s.png", iconSet.name, this.name)); + if (ResourceHelper.isResourceExist(location) || ResourceHelper.isResourceExistRaw(location)) + break; + iconSet = iconSet.parentIconset; + } + } + + ResourceLocation location = GTCEu.id(String.format("item/material_sets/%s/%s", iconSet.name, this.name)); + ITEM_TEXTURE_CACHE.put(this, materialIconSet, location); + + return location; + } + @Override public String toString() { return this.name; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java b/common/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java index 28b0c8a68b..1954b6c2eb 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagPrefix.java @@ -691,6 +691,7 @@ public static TagPrefix get(String name) { .unificationEnabled(true); // Prefix to determine which kind of Rock this is. + // Also has a base tag path of only the material, for things like obsidian etc. public static final TagPrefix rock = new TagPrefix("rock") .defaultTagPath(FORGE, "%s") .defaultTagPath(FABRIC, "%s") diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverContainerConfigurator.java b/common/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverContainerConfigurator.java index a672313a59..92faf10a80 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverContainerConfigurator.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/gui/widget/CoverContainerConfigurator.java @@ -25,9 +25,7 @@ import net.minecraft.core.Direction; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.phys.Vec2; import javax.annotation.Nullable; import java.util.List; @@ -105,7 +103,7 @@ private void coverRemoved() { if (getGui().entityPlayer instanceof ServerPlayer serverPlayer && side != null) { var item = transfer.getStackInSlot(0); if (coverable.getCoverAtSide(side) != null) { - coverable.removeCover(false, side); + coverable.removeCover(false, side, serverPlayer); } if (!item.isEmpty() && coverable.getCoverAtSide(side) == null) { if (item.getItem() instanceof ComponentItem componentItem) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/GTToolItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/GTToolItem.java index bb57899239..ce13d4d20b 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/GTToolItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/GTToolItem.java @@ -7,8 +7,7 @@ import com.gregtechceu.gtceu.api.item.tool.TreeFellingHelper; import com.gregtechceu.gtceu.client.renderer.item.ToolItemRenderer; import com.gregtechceu.gtceu.data.recipe.CustomTags; -import com.lowdragmc.lowdraglib.client.renderer.IItemRendererProvider; -import com.lowdragmc.lowdraglib.client.renderer.IRenderer; +import com.lowdragmc.lowdraglib.Platform; import dev.architectury.injectables.annotations.ExpectPlatform; import lombok.Getter; import net.fabricmc.api.EnvType; @@ -27,7 +26,6 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import org.jetbrains.annotations.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -38,8 +36,7 @@ */ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public class GTToolItem extends DiggerItem implements IItemRendererProvider, IItemUseFirst { - public static boolean isReqairingRecipe = false; +public class GTToolItem extends DiggerItem implements IItemUseFirst { @Getter protected final GTToolType toolType; @@ -52,7 +49,9 @@ public static GTToolItem create(GTToolType toolType, MaterialToolTier tier, Prop protected GTToolItem(GTToolType toolType, MaterialToolTier tier, Properties properties) { super(toolType.attackDamageModifier, toolType.attackSpeedModifier, tier, toolType.harvestTag, properties); this.toolType = toolType; - ToolItemRenderer.getOrCreate(toolType); + if (Platform.isClient()) { + ToolItemRenderer.create(this, toolType); + } } @Override @@ -86,12 +85,6 @@ public static ItemColor tintColor() { }; } - @Nullable - @Override - public IRenderer getRenderer(ItemStack stack) { - return ToolItemRenderer.getOrCreate(toolType); - } - @Override public InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext context) { var toolable = GTCapabilityHelper.getToolable(context.getLevel(), context.getClickedPos(), context.getClickedFace()); diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java index c427e84512..7e5f853459 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java @@ -25,7 +25,7 @@ public LaserPipeBlock getBlock() { public static ItemColor tintColor() { return (itemStack, index) -> { if (itemStack.getItem() instanceof LaserPipeBlockItem materialBlockItem) { - return materialBlockItem.getBlock().tinted(materialBlockItem.getBlock().defaultBlockState(), null, null, index); + return LaserPipeBlock.tintedColor().getColor(materialBlockItem.getBlock().defaultBlockState(), null, null, index); } return -1; }; diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java index cb244ac5b8..a75b05c5f8 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/MaterialBlockItem.java @@ -4,6 +4,7 @@ import com.gregtechceu.gtceu.api.block.MaterialBlock; import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider; import com.lowdragmc.lowdraglib.client.renderer.IItemRendererProvider; import com.lowdragmc.lowdraglib.client.renderer.IRenderer; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -46,7 +47,11 @@ public MaterialBlock getBlock() { public static ItemColor tintColor() { return (itemStack, index) -> { if (itemStack.getItem() instanceof MaterialBlockItem materialBlockItem) { - return materialBlockItem.getBlock().material.getMaterialARGB(); + if (index == 1 && materialBlockItem.getBlock().material.getMaterialSecondaryRGB() != -1) { + return materialBlockItem.getBlock().material.getMaterialSecondaryARGB(); + } else { + return materialBlockItem.getBlock().material.getMaterialARGB(); + } } return -1; }; @@ -56,7 +61,10 @@ public static ItemColor tintColor() { @Override @Environment(EnvType.CLIENT) public IRenderer getRenderer(ItemStack stack) { - return getBlock().getRenderer(getBlock().defaultBlockState()); + if (getBlock() instanceof IBlockRendererProvider provider) { + return provider.getRenderer(getBlock().defaultBlockState()); + } + return null; } @Override diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java index cb4061c81a..707bba5673 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.api.item; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty; import com.gregtechceu.gtceu.api.data.damagesource.DamageSources; import com.gregtechceu.gtceu.client.renderer.item.TagPrefixItemRenderer; @@ -35,7 +36,7 @@ */ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class TagPrefixItem extends Item implements IItemRendererProvider { +public class TagPrefixItem extends Item { public final TagPrefix tagPrefix; public final Material material; @@ -43,7 +44,9 @@ protected TagPrefixItem(Properties properties, TagPrefix tagPrefix, Material mat super(properties); this.tagPrefix = tagPrefix; this.material = material; - TagPrefixItemRenderer.getOrCreate(tagPrefix.materialIconType(), material.getMaterialIconSet()); + if (Platform.isClient()) { + TagPrefixItemRenderer.create(this, tagPrefix.materialIconType(), material.getMaterialIconSet()); + } } @ExpectPlatform @@ -125,10 +128,4 @@ public int getItemBurnTime() { } // TODO BEACON PAYMENT - - @Nullable - @Override - public IRenderer getRenderer(ItemStack stack) { - return TagPrefixItemRenderer.getOrCreate(tagPrefix.materialIconType(), material.getMaterialIconSet()); - } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java b/common/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java index 0d344a1ce5..584bdbceab 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java @@ -49,7 +49,7 @@ public static boolean is(ItemStack stack, GTToolType toolType) { } public static boolean canUse(ItemStack stack) { - return stack.getDamageValue() < stack.getMaxDamage(); + return stack.getDamageValue() <= stack.getMaxDamage(); } public static void damageItem(@Nonnull ItemStack stack, RandomSource random, @Nullable ServerPlayer user) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/MachineCoverContainer.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/MachineCoverContainer.java index 32f7b2be34..0603b2a237 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/machine/MachineCoverContainer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/machine/MachineCoverContainer.java @@ -8,6 +8,8 @@ import com.gregtechceu.gtceu.api.syncdata.EnhancedFieldManagedStorage; import com.gregtechceu.gtceu.api.syncdata.IEnhancedManaged; import com.gregtechceu.gtceu.api.syncdata.UpdateListener; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.annotation.ReadOnlyManaged; @@ -172,6 +174,16 @@ public void setCoverAtSide(@Nullable CoverBehavior coverBehavior, Direction side } } + @Override + public IItemTransfer getItemTransferCap(@Nullable Direction side, boolean useCoverCapability) { + return machine.getItemTransferCap(side, useCoverCapability); + } + + @Override + public IFluidTransfer getFluidTransferCap(@Nullable Direction side, boolean useCoverCapability) { + return machine.getFluidTransferCap(side, useCoverCapability); + } + @SuppressWarnings("unused") private boolean onCoverDirty(CoverBehavior coverBehavior) { if (coverBehavior != null) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java index 46f0c14a20..607319247f 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java @@ -29,8 +29,6 @@ import com.lowdragmc.lowdraglib.LDLib; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; -import com.lowdragmc.lowdraglib.misc.FluidTransferList; -import com.lowdragmc.lowdraglib.misc.ItemTransferList; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; import com.lowdragmc.lowdraglib.side.item.IItemTransfer; @@ -315,7 +313,7 @@ public final InteractionResult onToolClick(@NotNull GTToolType toolType, ItemSta } else if (toolType == GTToolType.CROWBAR) { if (coverBehavior != null) { if (!isRemote()) { - getCoverContainer().removeCover(gridSide); + getCoverContainer().removeCover(gridSide, playerIn); } return InteractionResult.CONSUME; } @@ -563,29 +561,47 @@ protected Predicate getFluidCapFilter(@Nullable Direction side) { } @Nullable - public ItemTransferList getItemTransferCap(@Nullable Direction side) { - var list = getTraits().stream().filter(IItemTransfer.class::isInstance).filter(t -> t.hasCapability(side)).map(IItemTransfer.class::cast).toList(); - if (!list.isEmpty()) { - var io = IO.BOTH; - if (side != null && this instanceof IAutoOutputItem autoOutput && autoOutput.getOutputFacingItems() == side && !autoOutput.isAllowInputFromOutputSideItems()) { - io = IO.OUT; - } - return new IOItemTransferList(list, io, getItemCapFilter(side)); + public IItemTransfer getItemTransferCap(@Nullable Direction side, boolean useCoverCapability) { + var list = getTraits().stream() + .filter(IItemTransfer.class::isInstance) + .filter(t -> t.hasCapability(side)) + .map(IItemTransfer.class::cast) + .toList(); + + if (list.isEmpty()) return null; + + var io = IO.BOTH; + if (side != null && this instanceof IAutoOutputItem autoOutput && autoOutput.getOutputFacingItems() == side && !autoOutput.isAllowInputFromOutputSideItems()) { + io = IO.OUT; } - return null; + + IOItemTransferList transferList = new IOItemTransferList(list, io, getItemCapFilter(side)); + if (!useCoverCapability || side == null) return transferList; + + CoverBehavior cover = getCoverContainer().getCoverAtSide(side); + return cover != null ? cover.getItemTransferCap(side, transferList) : transferList; } @Nullable - public FluidTransferList getFluidTransferCap(@Nullable Direction side) { - var list = getTraits().stream().filter(IFluidTransfer.class::isInstance).filter(t -> t.hasCapability(side)).map(IFluidTransfer.class::cast).toList(); - if (!list.isEmpty()) { - var io = IO.BOTH; - if (side != null && this instanceof IAutoOutputFluid autoOutput && autoOutput.getOutputFacingFluids() == side && !autoOutput.isAllowInputFromOutputSideFluids()) { - io = IO.OUT; - } - return new IOFluidTransferList(list, io, getFluidCapFilter(side)); + public IFluidTransfer getFluidTransferCap(@Nullable Direction side, boolean useCoverCapability) { + var list = getTraits().stream() + .filter(IFluidTransfer.class::isInstance) + .filter(t -> t.hasCapability(side)) + .map(IFluidTransfer.class::cast) + .toList(); + + if (list.isEmpty()) return null; + + var io = IO.BOTH; + if (side != null && this instanceof IAutoOutputFluid autoOutput && autoOutput.getOutputFacingFluids() == side && !autoOutput.isAllowInputFromOutputSideFluids()) { + io = IO.OUT; } - return null; + + IOFluidTransferList transferList = new IOFluidTransferList(list, io, getFluidCapFilter(side)); + if (!useCoverCapability || side == null) return transferList; + + CoverBehavior cover = getCoverContainer().getCoverAtSide(side); + return cover != null ? cover.getFluidTransferCap(side, transferList) : transferList; } ////////////////////////////////////// diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java index 2b43221444..5ac8817be6 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java @@ -22,10 +22,12 @@ import com.lowdragmc.lowdraglib.side.fluid.FluidHelper; import com.lowdragmc.lowdraglib.side.fluid.FluidTransferHelper; import com.lowdragmc.lowdraglib.syncdata.ISubscription; +import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; import lombok.Getter; import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.client.resources.language.I18n; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; @@ -59,7 +61,7 @@ public abstract class SteamBoilerMachine extends SteamWorkableMachine implements @Persisted public final NotifiableFluidTank waterTank; - @Persisted + @Persisted @DescSynced private int currentTemperature; @Persisted private int timeBeforeCoolingDown; @@ -165,10 +167,10 @@ protected void updateSteamSubscription() { protected void updateCurrentTemperature() { if (recipeLogic.isWorking()) { if (getOffsetTimer() % 12 == 0) { - if (currentTemperature < getMaxTemperate()) + if (currentTemperature < getMaxTemperature()) if (isHighPressure) { currentTemperature++; - } else if (getOffsetTimer() % 24 == 0){ + } else if (getOffsetTimer() % 24 == 0) { currentTemperature++; } } @@ -180,9 +182,9 @@ protected void updateCurrentTemperature() { } else --timeBeforeCoolingDown; if (getOffsetTimer() % 10 == 0) { - if (currentTemperature >= 100 ) { - long fillAmount = (long) (getBaseSteamOutput() * (currentTemperature / (getMaxTemperate() * 1.0)) / 2); - boolean hasDrainedWater = !waterTank.drain(FluidHelper.getBucket() / 1000, false).isEmpty(); + if (currentTemperature >= 100) { + long fillAmount = (long) (getBaseSteamOutput() * (currentTemperature / (getMaxTemperature() * 1.0)) / 2); + boolean hasDrainedWater = !waterTank.drainInternal(FluidHelper.getBucket() / 1000, false).isEmpty(); var filledSteam = 0L; if (hasDrainedWater) { filledSteam = steamTank.fillInternal(GTMaterials.Steam.getFluid(fillAmount * FluidHelper.getBucket() / 1000), false); @@ -225,12 +227,12 @@ protected int getCoolDownRate() { return 1; } - public int getMaxTemperate() { + public int getMaxTemperature() { return isHighPressure ? 1000 : 500; } private double getTemperaturePercent() { - return currentTemperature / (getMaxTemperate() * 1.0); + return currentTemperature / (getMaxTemperature() * 1.0); } protected abstract long getBaseSteamOutput(); @@ -248,7 +250,7 @@ public static GTRecipe recipeModifier(MetaMachine machine, @Nonnull GTRecipe rec @Override public void onWorking() { - if (currentTemperature < getMaxTemperate()) { + if (currentTemperature < getMaxTemperature()) { currentTemperature = Math.max(1, currentTemperature); updateSteamSubscription(); } @@ -279,8 +281,9 @@ public ModularUI createUI(Player entityPlayer) { .background(GuiTextures.BACKGROUND_STEAM.get(isHighPressure)) .widget(new LabelWidget(6, 6, getBlockState().getBlock().getDescriptionId())) .widget(new ProgressWidget(this::getTemperaturePercent, 96, 26, 10, 54) - .setProgressTexture(GuiTextures.PROGRESS_BAR_BOILER_EMPTY.get(isHighPressure), - GuiTextures.PROGRESS_BAR_BOILER_HEAT).setFillDirection(ProgressTexture.FillDirection.DOWN_TO_UP)) + .setProgressTexture(GuiTextures.PROGRESS_BAR_BOILER_EMPTY.get(isHighPressure), GuiTextures.PROGRESS_BAR_BOILER_HEAT) + .setFillDirection(ProgressTexture.FillDirection.DOWN_TO_UP) + .setDynamicHoverTips(pct -> I18n.get("gtceu.multiblock.large_boiler.temperature", (int) (currentTemperature + 274.15), (int) (getMaxTemperature() + 274.15)))) .widget(new TankWidget(waterTank.storages[0], 83, 26, 10, 54, false, true) .setShowAmount(false) .setFillDirection(ProgressTexture.FillDirection.DOWN_TO_UP) diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/FluidTankProxyTrait.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/FluidTankProxyTrait.java index f3c18b08be..6ca0771ac7 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/FluidTankProxyTrait.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/FluidTankProxyTrait.java @@ -116,7 +116,7 @@ public FluidStack drainInternal(FluidStack resource, boolean simulate) { @NotNull @Override public FluidStack drain(long maxDrain, boolean simulate, boolean notifyChanges) { - if (proxy != null && canCapInput()) { + if (proxy != null && canCapOutput()) { return proxy.drain(maxDrain, simulate, notifyChanges); } return FluidStack.empty(); @@ -125,7 +125,7 @@ public FluidStack drain(long maxDrain, boolean simulate, boolean notifyChanges) @NotNull @Override public FluidStack drain(FluidStack resource, boolean simulate, boolean notifyChanges) { - if (proxy != null && canCapInput()) { + if (proxy != null && canCapOutput()) { return proxy.drain(resource, simulate, notifyChanges); } return FluidStack.empty(); diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java index d23f89225d..fcdd0804a9 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java @@ -15,7 +15,6 @@ import lombok.Getter; import lombok.Setter; import net.minecraft.core.Direction; -import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -335,7 +334,7 @@ public FluidStack drainInternal(FluidStack resource, boolean simulate) { @NotNull @Override public FluidStack drain(long maxDrain, boolean simulate) { - if (canCapInput()) { + if (canCapOutput()) { return drainInternal(maxDrain, simulate); } return FluidStack.empty(); diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/misc/RateCounter.java b/common/src/main/java/com/gregtechceu/gtceu/api/misc/RateCounter.java new file mode 100644 index 0000000000..910377071f --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/misc/RateCounter.java @@ -0,0 +1,65 @@ +package com.gregtechceu.gtceu.api.misc; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Arrays; +import java.util.function.LongSupplier; + + +/** + * Limits a rate/throughput across a certain amount of time, without needing an active tick subscription + */ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class RateCounter { + private final LongSupplier timeSupplier; + + private final long[] usedAmounts; + private final long[] updateTimes; + + private final int countingTimeframe; + + public RateCounter(LongSupplier timeSupplier, int countingTimeframe) { + this.timeSupplier = timeSupplier; + this.countingTimeframe = countingTimeframe; + + this.usedAmounts = new long[countingTimeframe]; + this.updateTimes = new long[countingTimeframe]; + } + + public long getUsedSum() { + long excludeUntilTime = timeSupplier.getAsLong() - countingTimeframe; + long sum = 0L; + + for (int i = 0; i < countingTimeframe; i++) { + if (updateTimes[i] <= excludeUntilTime) continue; + sum += usedAmounts[i]; + } + + return sum; + } + + public void addUsed(long amount) { + long currentTime = timeSupplier.getAsLong(); + int idx = (int) (currentTime % countingTimeframe); + + if (updateTimes[idx] != currentTime) + usedAmounts[idx] = 0L; + + usedAmounts[idx] += amount; + updateTimes[idx] = currentTime; + } + + public void clear() { + Arrays.fill(usedAmounts, 0L); + } + + public RateCounter copy() { + var copied = new RateCounter(this.timeSupplier, this.countingTimeframe); + System.arraycopy(this.usedAmounts, 0, copied.usedAmounts, 0, usedAmounts.length); + System.arraycopy(this.updateTimes, 0, copied.updateTimes, 0, updateTimes.length); + + return copied; + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/pipenet/PipeCoverContainer.java b/common/src/main/java/com/gregtechceu/gtceu/api/pipenet/PipeCoverContainer.java index bbe0c9855b..2497373a9e 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/api/pipenet/PipeCoverContainer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/api/pipenet/PipeCoverContainer.java @@ -9,6 +9,12 @@ import com.gregtechceu.gtceu.api.syncdata.EnhancedFieldManagedStorage; import com.gregtechceu.gtceu.api.syncdata.IEnhancedManaged; import com.gregtechceu.gtceu.api.syncdata.UpdateListener; +import com.gregtechceu.gtceu.api.transfer.fluid.NoOpFluidTransfer; +import com.gregtechceu.gtceu.api.transfer.item.NoOpItemTransfer; +import com.gregtechceu.gtceu.common.blockentity.FluidPipeBlockEntity; +import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced; import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted; import com.lowdragmc.lowdraglib.syncdata.annotation.ReadOnlyManaged; @@ -143,6 +149,24 @@ public void unsubscribe(@Nullable TickableSubscription current) { pipeTile.unsubscribe(current); } + @Override + public IItemTransfer getItemTransferCap(@Nullable Direction side, boolean useCoverCapability) { + if (pipeTile instanceof ItemPipeBlockEntity itemPipe) { + return itemPipe.getHandler(side, useCoverCapability); + } else { + return NoOpItemTransfer.INSTANCE; + } + } + + @Override + public IFluidTransfer getFluidTransferCap(@Nullable Direction side, boolean useCoverCapability) { + if (pipeTile instanceof FluidPipeBlockEntity fluidPipe) { + return fluidPipe.getHandler(side, useCoverCapability); + } else { + return NoOpFluidTransfer.INSTANCE; + } + } + @Override public CoverBehavior getCoverAtSide(Direction side) { return switch (side) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidTransferDelegate.java b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidTransferDelegate.java new file mode 100644 index 0000000000..9cf1813e76 --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/FluidTransferDelegate.java @@ -0,0 +1,99 @@ +package com.gregtechceu.gtceu.api.transfer.fluid; + +import com.lowdragmc.lowdraglib.side.fluid.FluidStack; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import net.minecraft.MethodsReturnNonnullByDefault; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; + + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public abstract class FluidTransferDelegate implements IFluidTransfer { + protected IFluidTransfer delegate; + + public FluidTransferDelegate(IFluidTransfer delegate) { + this.delegate = delegate; + } + + protected void setDelegate(IFluidTransfer delegate) { + this.delegate = delegate; + } + + + ////////////////////////////////////// + //****** OVERRIDE THESE ******// + ////////////////////////////////////// + + + @Override + public int getTanks() { + return delegate.getTanks(); + } + + @Override + @Nonnull + public FluidStack getFluidInTank(int tank) { + return delegate.getFluidInTank(tank); + } + + @Override + @ApiStatus.Internal + public void setFluidInTank(int tank, @NotNull FluidStack fluidStack) { + delegate.setFluidInTank(tank, fluidStack); + } + + @Override + public long getTankCapacity(int tank) { + return delegate.getTankCapacity(tank); + } + + @Override + public boolean isFluidValid(int tank, @NotNull FluidStack stack) { + return delegate.isFluidValid(tank, stack); + } + + @Override + @ApiStatus.Internal + public long fill(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + return delegate.fill(tank, resource, simulate, notifyChanges); + } + + @Override + public boolean supportsFill(int tank) { + return delegate.supportsFill(tank); + } + + @Override + @ApiStatus.Internal + @Nonnull + public FluidStack drain(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + return delegate.drain(tank, resource, simulate, notifyChanges); + } + + @Override + public boolean supportsDrain(int tank) { + return delegate.supportsDrain(tank); + } + + @Override + @ApiStatus.Internal + @Nonnull + public Object createSnapshot() { + return delegate.createSnapshot(); + } + + @Override + @ApiStatus.Internal + public void restoreFromSnapshot(Object snapshot) { + delegate.restoreFromSnapshot(snapshot); + } + + @Override + public void onContentsChanged() { + delegate.onContentsChanged(); + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/NoOpFluidTransfer.java b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/NoOpFluidTransfer.java new file mode 100644 index 0000000000..6102f0f06b --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/fluid/NoOpFluidTransfer.java @@ -0,0 +1,75 @@ +package com.gregtechceu.gtceu.api.transfer.fluid; + +import com.lowdragmc.lowdraglib.side.fluid.FluidStack; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; +import net.minecraft.MethodsReturnNonnullByDefault; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; + + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class NoOpFluidTransfer implements IFluidTransfer { + public static final NoOpFluidTransfer INSTANCE = new NoOpFluidTransfer(); + + private NoOpFluidTransfer() { + } + + @Override + public int getTanks() { + return 0; + } + + @NotNull + @Override + public FluidStack getFluidInTank(int tank) { + return FluidStack.empty(); + } + + @Override + public void setFluidInTank(int tank, @NotNull FluidStack fluidStack) { + } + + @Override + public long getTankCapacity(int tank) { + return 0; + } + + @Override + public boolean isFluidValid(int tank, @NotNull FluidStack stack) { + return false; + } + + @Override + public long fill(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + return 0; + } + + @Override + public boolean supportsFill(int tank) { + return false; + } + + @NotNull + @Override + public FluidStack drain(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + return FluidStack.empty(); + } + + @Override + public boolean supportsDrain(int tank) { + return false; + } + + @NotNull + @Override + public Object createSnapshot() { + return new Object(); + } + + @Override + public void restoreFromSnapshot(Object snapshot) { + + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/ItemTransferDelegate.java b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/ItemTransferDelegate.java new file mode 100644 index 0000000000..1cdd098680 --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/ItemTransferDelegate.java @@ -0,0 +1,82 @@ +package com.gregtechceu.gtceu.api.transfer.item; + +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; + + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public abstract class ItemTransferDelegate implements IItemTransfer { + protected IItemTransfer delegate; + + public ItemTransferDelegate(IItemTransfer delegate) { + this.delegate = delegate; + } + + protected void setDelegate(IItemTransfer delegate) { + this.delegate = delegate; + } + + + ////////////////////////////////////// + //****** OVERRIDE THESE ******// + ////////////////////////////////////// + + @Override + public int getSlots() { + return delegate.getSlots(); + } + + @Override + @Nonnull + public ItemStack getStackInSlot(int slot) { + return delegate.getStackInSlot(slot); + } + + @Override + @Nonnull + public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate, boolean notifyChanges) { + return delegate.insertItem(slot, stack, simulate, notifyChanges); + } + + @Override + @Nonnull + public ItemStack extractItem(int slot, int amount, boolean simulate, boolean notifyChanges) { + return delegate.extractItem(slot, amount, simulate, notifyChanges); + } + + @Override + public int getSlotLimit(int slot) { + return delegate.getSlotLimit(slot); + } + + @Override + public boolean isItemValid(int slot, @NotNull ItemStack stack) { + return delegate.isItemValid(slot, stack); + } + + @Override + @ApiStatus.Internal + @Nonnull + public Object createSnapshot() { + return delegate.createSnapshot(); + } + + @Override + @ApiStatus.Internal + public void restoreFromSnapshot(Object snapshot) { + delegate.restoreFromSnapshot(snapshot); + } + + + @Override + public void onContentsChanged() { + delegate.onContentsChanged(); + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/NoOpItemTransfer.java b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/NoOpItemTransfer.java new file mode 100644 index 0000000000..b53d4a48ab --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/api/transfer/item/NoOpItemTransfer.java @@ -0,0 +1,62 @@ +package com.gregtechceu.gtceu.api.transfer.item; + +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; + + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class NoOpItemTransfer implements IItemTransfer { + public static final NoOpItemTransfer INSTANCE = new NoOpItemTransfer(); + + private NoOpItemTransfer() { + } + + @Override + public int getSlots() { + return 0; + } + + @NotNull + @Override + public ItemStack getStackInSlot(int slot) { + return ItemStack.EMPTY; + } + + @NotNull + @Override + public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate, boolean notifyChanges) { + return ItemStack.EMPTY; + } + + @NotNull + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate, boolean notifyChanges) { + return ItemStack.EMPTY; + } + + @Override + public int getSlotLimit(int slot) { + return 0; + } + + @Override + public boolean isItemValid(int slot, @NotNull ItemStack stack) { + return false; + } + + @NotNull + @Override + public Object createSnapshot() { + return new Object(); + } + + @Override + public void restoreFromSnapshot(Object snapshot) { + + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/model/PipeModel.java b/common/src/main/java/com/gregtechceu/gtceu/client/model/PipeModel.java index c6ad3af887..f6df7bfb81 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/model/PipeModel.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/model/PipeModel.java @@ -38,15 +38,19 @@ public class PipeModel { public final Map sideCubes; public Supplier sideTexture, endTexture; + @Nullable + public Supplier<@Nullable ResourceLocation> secondarySideTexture, secondaryEndTexture; @Setter public ResourceLocation sideOverlayTexture, endOverlayTexture; @Environment(EnvType.CLIENT) - TextureAtlasSprite sideSprite, endSprite, sideOverlaySprite, endOverlaySprite; + TextureAtlasSprite sideSprite, endSprite, secondarySideSprite, secondaryEndSprite, sideOverlaySprite, endOverlaySprite; - public PipeModel(float thickness, Supplier sideTexture, Supplier endTexture) { + public PipeModel(float thickness, Supplier sideTexture, Supplier endTexture, @Nullable Supplier<@Nullable ResourceLocation> secondarySideTexture, @Nullable Supplier<@Nullable ResourceLocation> secondaryEndTexture) { this.sideTexture = sideTexture; this.endTexture = endTexture; + this.secondarySideTexture = secondarySideTexture; + this.secondaryEndTexture = secondaryEndTexture; this.thickness = thickness; double min = (1d - thickness) / 2; double max = min + thickness; @@ -87,6 +91,12 @@ public List bakeQuads(@Nullable Direction side, int connections) { if (endSprite == null) { endSprite = ModelFactory.getBlockSprite(endTexture.get()); } + if (secondarySideTexture != null && secondarySideTexture.get() != null && secondarySideSprite == null) { + secondarySideSprite = ModelFactory.getBlockSprite(secondarySideTexture.get()); + } + if (secondaryEndTexture != null && secondaryEndTexture.get() != null && secondaryEndSprite == null) { + secondaryEndSprite = ModelFactory.getBlockSprite(secondaryEndTexture.get()); + } if (sideOverlayTexture != null && sideOverlaySprite == null) { sideOverlaySprite = ModelFactory.getBlockSprite(sideOverlayTexture); } @@ -96,19 +106,27 @@ public List bakeQuads(@Nullable Direction side, int connections) { if (side != null) { if (thickness == 1) { // full block - return List.of(FaceQuad.builder(side, sideSprite).cube(coreCube).cubeUV().tintIndex(0).bake()); + List quads = new ArrayList<>(); + quads.add(FaceQuad.builder(side, sideSprite).cube(coreCube).cubeUV().tintIndex(0).bake()); + if (secondarySideSprite != null) { + quads.add(FaceQuad.builder(side, secondarySideSprite).cube(coreCube).cubeUV().tintIndex(0).bake()); + } + return quads; } if (isConnected(connections, side)) { // side connected List quads = new ArrayList<>(); quads.add(FaceQuad.builder(side, endSprite).cube(sideCubes.get(side).inflate(-0.001)).cubeUV().tintIndex(1).bake()); + if (secondaryEndSprite != null) { + quads.add(FaceQuad.builder(side, secondaryEndSprite).cube(sideCubes.get(side)).cubeUV().tintIndex(1).bake()); + } if (endOverlaySprite != null) { - quads.add(FaceQuad.builder(side, endOverlaySprite).cube(sideCubes.get(side).inflate(-0.000)).cubeUV().tintIndex(0).bake()); + quads.add(FaceQuad.builder(side, endOverlaySprite).cube(sideCubes.get(side)).cubeUV().tintIndex(0).bake()); } if (sideOverlaySprite != null) { for (Direction face : Direction.values()) { if (face != side && face != side.getOpposite()) { - quads.add(FaceQuad.builder(face, sideOverlaySprite).cube(sideCubes.get(side).inflate(-0.000)).cubeUV().tintIndex(2).bake()); + quads.add(FaceQuad.builder(face, sideOverlaySprite).cube(sideCubes.get(side)).cubeUV().tintIndex(2).bake()); } } } @@ -124,15 +142,18 @@ public List bakeQuads(@Nullable Direction side, int connections) { for (Direction face : Direction.values()) { if (!isConnected(connections, face)) { quads.add(FaceQuad.builder(face, sideSprite).cube(coreCube).cubeUV().tintIndex(0).bake()); + if (secondarySideSprite != null) { + quads.add(FaceQuad.builder(face, secondarySideSprite).cube(coreCube).cubeUV().tintIndex(0).bake()); + } } // render each connected side for (Direction facing : Direction.values()) { if (facing.getAxis() != face.getAxis()) { if (isConnected(connections, facing)) { quads.add(FaceQuad.builder(face, sideSprite).cube(sideCubes.get(facing)).cubeUV().tintIndex(0).bake()); - //if (endOverlaySprite != null) { - // quads.add(FaceQuad.builder(face, endOverlaySprite).cube(sideCubes.get(facing).inflate(0.01)).cubeUV().tintIndex(0).bake()); - //} + if (secondarySideSprite != null) { + quads.add(FaceQuad.builder(face, secondarySideSprite).cube(sideCubes.get(facing)).cubeUV().tintIndex(0).bake()); + } if (sideOverlaySprite != null) { quads.add(FaceQuad.builder(face, sideOverlaySprite).cube(sideCubes.get(facing).inflate(0.001)).cubeUV().tintIndex(2).bake()); } diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java index 9b670b735c..0e5320e7cc 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/MaterialBlockRenderer.java @@ -1,39 +1,102 @@ package com.gregtechceu.gtceu.client.renderer.block; -import com.google.common.collect.Table; -import com.google.common.collect.Tables; -import com.gregtechceu.gtceu.GTCEu; +import com.google.common.collect.ImmutableList; +import com.gregtechceu.gtceu.api.block.MaterialBlock; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.utils.GradientUtil; +import com.mojang.blaze3d.platform.NativeImage; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.metadata.animation.AnimationFrame; +import net.minecraft.client.resources.metadata.animation.AnimationMetadataSection; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.models.BlockModelGenerators; +import net.minecraft.data.models.model.*; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.resources.Resource; +import net.minecraft.world.level.block.Block; -import java.util.HashMap; -import java.util.Map; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; /** * @author KilaBash * @date 2023/2/27 * @implNote MaterialBlockRenderer */ -public class MaterialBlockRenderer extends TextureOverrideRenderer { - private static final Table MODELS = Tables.newCustomTable(new HashMap<>(), HashMap::new); +public class MaterialBlockRenderer { + public static final String LAYER_2_SUFFIX = "_layer2"; + private static final Set MODELS = new HashSet<>(); - public static MaterialBlockRenderer getOrCreate(MaterialIconType type, MaterialIconSet iconSet) { - if (!MODELS.contains(type, iconSet)) { - MODELS.put(type, iconSet, new MaterialBlockRenderer(type, iconSet)); + public static void create(Block block, MaterialIconType type, MaterialIconSet iconSet) { + MODELS.add(new MaterialBlockRenderer(block, type, iconSet)); + } + + public static void reinitModels() { + for (MaterialBlockRenderer model : MODELS) { + ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(model.block); + ResourceLocation modelId = blockId.withPrefix("block/"); + GTDynamicResourcePack.addBlockModel(modelId, new DelegatedModel(model.type.getBlockModelPath(model.iconSet, true))); + GTDynamicResourcePack.addBlockState(blockId, BlockModelGenerators.createSimpleBlock(model.block, modelId)); + // ModelTemplates.CUBE_ALL.create(model.block, + // cubeTwoLayer(model.type.getBlockTexturePath(model.iconSet, true), model.type.getBlockTexturePath(model.iconSet, true).withSuffix(LAYER_2_SUFFIX)), + // GTDynamicResourcePack::addBlockModel))); + GTDynamicResourcePack.addItemModel(BuiltInRegistries.ITEM.getKey(model.block.asItem()), new DelegatedModel(ModelLocationUtils.getModelLocation(model.block))); } - return MODELS.get(type, iconSet); } - protected MaterialBlockRenderer(MaterialIconType type, MaterialIconSet iconSet) { - super(GTCEu.id("block/tinted_cube_all"), () -> Map.of("all", type.getBlockTexturePath(iconSet, true))); + public static void initTextures() { + for (MaterialBlockRenderer model : MODELS) { + ResourceLocation blockId = BuiltInRegistries.BLOCK.getKey(model.block); + + Resource file1 = Minecraft.getInstance().getResourceManager().getResource(GTDynamicResourcePack.getTextureLocation(null, model.type.getBlockTexturePath(model.iconSet, true)/*.withSuffix("_layer1")*/)).orElse(null); + if (file1 == null) continue; + try(InputStream stream1 = file1.open()) { + if (!(model.block instanceof MaterialBlock materialBlock)) continue; + int materialRGBA = GradientUtil.argbToRgba(materialBlock.material.getMaterialARGB()); + + NativeImage image1 = NativeImage.read(stream1); + try (NativeImage result = new NativeImage(image1.getWidth(), image1.getHeight(), true)) { + for (int x = 0; x < image1.getWidth(); ++x) { + for (int y = 0; y < image1.getHeight(); ++y) { + int color = image1.getPixelRGBA(x, y); + result.setPixelRGBA(x, y, GradientUtil.multiplyBlendRGBA(color, materialRGBA)); + } + } + if (materialBlock.material.getMaterialSecondaryRGB() != -1) { + int materialSecondaryRGBA = GradientUtil.argbToRgba(materialBlock.material.getMaterialSecondaryARGB()); + Resource file2 = Minecraft.getInstance().getResourceManager().getResource(GTDynamicResourcePack.getTextureLocation(null, model.type.getBlockTexturePath(model.iconSet, true).withSuffix(LAYER_2_SUFFIX))).orElse(null); + if (file2 != null) { + try(InputStream stream2 = file2.open()) { + NativeImage image2 = NativeImage.read(stream2); + for (int x = 0; x < image1.getWidth(); ++x) { + for (int y = 0; y < image1.getHeight(); ++y) { + int color = image2.getPixelRGBA(x, y); + result.blendPixel(x, y, GradientUtil.multiplyBlendRGBA(color, materialSecondaryRGBA)); + } + } + } + } + } + + GTDynamicResourcePack.addBlockTexture(blockId, result.asByteArray()); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } } - @Override - @Environment(EnvType.CLIENT) - public boolean useAO() { - return true; + private final Block block; + private final MaterialIconType type; + private final MaterialIconSet iconSet; + + protected MaterialBlockRenderer(Block block, MaterialIconType type, MaterialIconSet iconSet) { + this.block = block; + this.type = type; + this.iconSet = iconSet; } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java index f07d90f131..78c935eddb 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/block/OreBlockRenderer.java @@ -11,6 +11,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.BlockRenderDispatcher; @@ -23,6 +24,8 @@ import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; +import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; @@ -38,15 +41,17 @@ * @date 2023/2/27 * @implNote OreBlockRenderer */ +@MethodsReturnNonnullByDefault public class OreBlockRenderer extends BlockStateRenderer { private final Supplier stone; - private Supplier overlaySupplier; - private ResourceLocation overlay; + private final Supplier overlaySupplier; + private final Supplier<@Nullable ResourceLocation> secondaryOverlaySupplier; private final boolean emissive; - public OreBlockRenderer(Supplier stone, Supplier overlaySupplier, boolean emissive) { + public OreBlockRenderer(Supplier stone, Supplier overlaySupplier, Supplier<@Nullable ResourceLocation> secondaryOverlaySupplier, boolean emissive) { this.stone = Suppliers.memoize(stone::get); this.overlaySupplier = overlaySupplier; + this.secondaryOverlaySupplier = secondaryOverlaySupplier; this.emissive = emissive; if (LDLib.isClient()) { registerEvent(); @@ -70,7 +75,8 @@ public void renderItem(ItemStack stack, ItemTransforms.TransformType transformTy public List getQuads(@Nullable BlockState state, @Nullable Direction direction, RandomSource random) { List quads = new LinkedList<>(); if (direction != null) { - quads.add(FaceQuad.bakeFace(direction, ModelFactory.getBlockSprite(overlay), BlockModelRotation.X0_Y0, 1, emissive ? 15 : 0, true, !emissive)); + quads.add(FaceQuad.bakeFace(direction, ModelFactory.getBlockSprite(overlaySupplier.get()), BlockModelRotation.X0_Y0, 0, emissive ? 15 : 0, true, !emissive)); + if (secondaryOverlaySupplier.get() != null) quads.add(FaceQuad.bakeFace(direction, ModelFactory.getBlockSprite(secondaryOverlaySupplier.get()), BlockModelRotation.X0_Y0, 1, emissive ? 15 : 0, true, !emissive)); } return quads; } @@ -83,7 +89,8 @@ public List getQuads(@Nullable BlockState state, @Nullable Direction public List renderModel(BlockAndTintGetter level, BlockPos pos, BlockState state, Direction side, RandomSource rand) { List quads = new LinkedList<>(super.renderModel(level, pos, state, side, rand)); if (side != null) { - quads.add(FaceQuad.bakeFace(side, ModelFactory.getBlockSprite(overlay), BlockModelRotation.X0_Y0, 1, emissive ? 15 : 0, true, !emissive)); + quads.add(FaceQuad.bakeFace(side, ModelFactory.getBlockSprite(overlaySupplier.get()), BlockModelRotation.X0_Y0, 0, emissive ? 15 : 0, true, !emissive)); + if (secondaryOverlaySupplier.get() != null) quads.add(FaceQuad.bakeFace(side, ModelFactory.getBlockSprite(secondaryOverlaySupplier.get()), BlockModelRotation.X0_Y0, 1, emissive ? 15 : 0, true, !emissive)); } return quads; } @@ -92,11 +99,9 @@ public List renderModel(BlockAndTintGetter level, BlockPos pos, Block @Environment(EnvType.CLIENT) public void onPrepareTextureAtlas(ResourceLocation atlasName, Consumer register) { super.onPrepareTextureAtlas(atlasName, register); - if (atlasName.equals(TextureAtlas.LOCATION_BLOCKS)) { - if (overlaySupplier != null) { - overlay = overlaySupplier.get(); - } - register.accept(overlay); + if (atlasName.equals(InventoryMenu.BLOCK_ATLAS)) { + register.accept(overlaySupplier.get()); + if (secondaryOverlaySupplier.get() != null) register.accept(secondaryOverlaySupplier.get()); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java index 9a8c5ce6ae..2f9db1b31e 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/TagPrefixItemRenderer.java @@ -4,92 +4,93 @@ import com.google.common.collect.Tables; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; -import com.lowdragmc.lowdraglib.client.model.ModelFactory; -import com.lowdragmc.lowdraglib.client.renderer.impl.IModelRenderer; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.renderer.block.model.BlockModel; -import net.minecraft.client.resources.model.*; -import net.minecraft.core.Direction; +import com.gregtechceu.gtceu.api.item.TagPrefixItem; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; +import com.gregtechceu.gtceu.utils.GradientUtil; +import com.mojang.blaze3d.platform.NativeImage; +import net.minecraft.client.Minecraft; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.models.model.DelegatedModel; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.resources.Resource; +import net.minecraft.world.item.Item; -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.function.Consumer; -import java.util.function.Supplier; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; + +import static com.gregtechceu.gtceu.client.renderer.block.MaterialBlockRenderer.LAYER_2_SUFFIX; /** - * @author KilaBash - * @date 2023/2/16 + * @author Screret + * @date 2023/11/10 * @implNote TagPrefixItemRenderer */ -public class TagPrefixItemRenderer extends IModelRenderer { - private static final Table MODELS = Tables.newCustomTable(new HashMap<>(), HashMap::new); - - @Nullable - private ResourceLocation modelLocation; - @Nullable - private Supplier modelLocationSupplier; +public class TagPrefixItemRenderer { + private static final Set MODELS = new HashSet<>(); - private TagPrefixItemRenderer(MaterialIconType type, MaterialIconSet iconSet) { - super(null); - this.modelLocationSupplier = () -> type.getItemModelPath(iconSet, true); + public static void create(Item item, MaterialIconType type, MaterialIconSet iconSet) { + MODELS.add(new TagPrefixItemRenderer(item, type, iconSet)); } - public static TagPrefixItemRenderer getOrCreate(MaterialIconType type, MaterialIconSet iconSet) { - if (!MODELS.contains(type, iconSet)) { - MODELS.put(type, iconSet, new TagPrefixItemRenderer(type, iconSet)); + public static void reinitModels() { + for (TagPrefixItemRenderer model : MODELS) { + ResourceLocation itemId = BuiltInRegistries.ITEM.getKey(model.item); + GTDynamicResourcePack.addItemModel(itemId, new DelegatedModel(model.type.getItemModelPath(model.iconSet, true))); + //ModelTemplates.FLAT_ITEM.create(GTDynamicResourcePack.getItemModelLocation(itemId), TextureMapping.layer0(itemId.withPrefix("item/")), GTDynamicResourcePack::addItemModel); } - return MODELS.get(type, iconSet); } - @Environment(EnvType.CLIENT) - @Override - protected UnbakedModel getModel() { - return ModelFactory.getUnBakedModel(modelLocation); - } + public static void initTextures() { + for (TagPrefixItemRenderer model : MODELS) { + ResourceLocation itemId = BuiltInRegistries.ITEM.getKey(model.item); - @Environment(EnvType.CLIENT) - @Nullable - @Override - protected BakedModel getItemBakedModel() { - if (itemModel == null) { - var model = getModel(); - if (model instanceof BlockModel blockModel && blockModel.getRootModel() == ModelBakery.GENERATION_MARKER) { - // fabric doesn't help us to fix vanilla bakery, so we have to do it ourselves - model = ModelFactory.ITEM_MODEL_GENERATOR.generateBlockModel(Material::sprite, blockModel); - } - itemModel = model.bake( - ModelFactory.getModeBakery(), - Material::sprite, - BlockModelRotation.X0_Y0, - modelLocation); - } - return itemModel; - } + Resource file1 = Minecraft.getInstance().getResourceManager().getResource(GTDynamicResourcePack.getTextureLocation(null, model.type.getItemTexturePath(model.iconSet, true)/*.withSuffix("_layer1")*/)).orElse(null); + if (file1 == null) continue; + try(InputStream stream1 = file1.open()) { + if (!(model.item instanceof TagPrefixItem prefixItem)) continue; + int materialRGBA = GradientUtil.argbToRgba(prefixItem.material.getMaterialARGB()); + int materialSecondaryRGBA = GradientUtil.argbToRgba(prefixItem.material.getMaterialSecondaryARGB()); - @Environment(EnvType.CLIENT) - @Override - public BakedModel getRotatedModel(Direction frontFacing) { - return blockModels.computeIfAbsent(frontFacing, facing -> getModel().bake( - ModelFactory.getModeBakery(), - Material::sprite, - ModelFactory.getRotation(facing), - modelLocation)); - } + NativeImage image1 = NativeImage.read(stream1); + try (NativeImage result = new NativeImage(image1.getWidth(), image1.getHeight(), true)) { + for (int x = 0; x < image1.getWidth(); ++x) { + for (int y = 0; y < image1.getHeight(); ++y) { + int color = image1.getPixelRGBA(x, y); + result.setPixelRGBA(x, y, GradientUtil.multiplyBlendRGBA(color, materialRGBA)); + } + } + if (prefixItem.material.getMaterialSecondaryRGB() != -1) { + Resource file2 = Minecraft.getInstance().getResourceManager().getResource(GTDynamicResourcePack.getTextureLocation(null, model.type.getItemTexturePath(model.iconSet, true).withSuffix(LAYER_2_SUFFIX))).orElse(null); + if (file2 != null) { + try(InputStream stream2 = file2.open()) { + NativeImage image2 = NativeImage.read(stream2); + for (int x = 0; x < image1.getWidth(); ++x) { + for (int y = 0; y < image1.getHeight(); ++y) { + int color = image2.getPixelRGBA(x, y); + result.blendPixel(x, y, GradientUtil.multiplyBlendRGBA(color, materialSecondaryRGBA)); + } + } + } + } + } - @Override - @Environment(EnvType.CLIENT) - public void onAdditionalModel(Consumer registry) { - if (modelLocationSupplier != null) { - modelLocation = modelLocationSupplier.get(); + GTDynamicResourcePack.addItemTexture(itemId, result.asByteArray()); + } + } catch (IOException e) { + throw new RuntimeException(e); + } } - registry.accept(modelLocation); } - @Override - @Environment(EnvType.CLIENT) - public boolean isGui3d() { - return false; + private final Item item; + private final MaterialIconType type; + private final MaterialIconSet iconSet; + + private TagPrefixItemRenderer(Item item, MaterialIconType type, MaterialIconSet iconSet) { + this.item = item; + this.type = type; + this.iconSet = iconSet; } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java index cf73c3b08d..86220c9694 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/item/ToolItemRenderer.java @@ -1,35 +1,39 @@ package com.gregtechceu.gtceu.client.renderer.item; import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.lowdragmc.lowdraglib.client.renderer.impl.IModelRenderer; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.models.model.DelegatedModel; +import net.minecraft.world.item.Item; -import java.util.EnumMap; -import java.util.Map; +import java.util.HashSet; +import java.util.Set; /** * @author KilaBash * @date 2023/2/16 * @implNote TagPrefixItemRenderer */ -public class ToolItemRenderer extends IModelRenderer { - private static final Map MODELS = new EnumMap<>(GTToolType.class); +public class ToolItemRenderer { + private static final Set MODELS = new HashSet<>(); - protected ToolItemRenderer(GTToolType toolType) { - super(toolType.modelLocation); + public static void reinitModels() { + for (ToolItemRenderer model : MODELS) { + GTDynamicResourcePack.addItemModel(BuiltInRegistries.ITEM.getKey(model.item), new DelegatedModel(model.toolType.modelLocation)); + } } - public static ToolItemRenderer getOrCreate(GTToolType toolType) { - if (!MODELS.containsKey(toolType)) { - MODELS.put(toolType, new ToolItemRenderer(toolType)); - } - return MODELS.get(toolType); + private final Item item; + private final GTToolType toolType; + + protected ToolItemRenderer(Item item, GTToolType toolType) { + this.item = item; + this.toolType = toolType; } - @Override - @Environment(EnvType.CLIENT) - public boolean isGui3d() { - return false; + public static void create(Item item, GTToolType toolType) { + MODELS.add(new ToolItemRenderer(item, toolType)); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumChestRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumChestRenderer.java index 94022e18eb..ba046885d4 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumChestRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumChestRenderer.java @@ -52,7 +52,8 @@ public void renderItem(ItemStack stack, ItemTransforms.TransformType transformTy ItemStack itemStack = ItemStack.of(stack.getOrCreateTagElement("stored")); int storedAmount = stack.getOrCreateTag().getInt("storedAmount"); float tick = Minecraft.getInstance().level.getGameTime() + Minecraft.getInstance().getFrameTime(); - renderChest(poseStack, buffer, Direction.NORTH, itemStack, storedAmount, tick); + // Don't need to handle locked items here since they don't get saved to the item + renderChest(poseStack, buffer, Direction.NORTH, itemStack, storedAmount, tick, ItemStack.EMPTY); poseStack.popPose(); } @@ -66,39 +67,40 @@ public void render(BlockEntity blockEntity, float partialTicks, PoseStack poseSt var level = machine.getLevel(); var frontFacing = machine.getFrontFacing(); float tick = level.getGameTime() + partialTicks; - renderChest(poseStack, buffer, frontFacing, machine.getStored(), machine.getStoredAmount(), tick); + renderChest(poseStack, buffer, frontFacing, machine.getStored(), machine.getStoredAmount(), tick, machine.getLockedItem().getStackInSlot(0)); } } @Environment(EnvType.CLIENT) - public void renderChest(PoseStack poseStack, MultiBufferSource buffer, Direction frontFacing, ItemStack itemStack, int storedAmount, float tick) { - if (!itemStack.isEmpty()) { - var itemRenderer = Minecraft.getInstance().getItemRenderer(); - poseStack.pushPose(); - BakedModel bakedmodel = itemRenderer.getModel(itemStack, Minecraft.getInstance().level, null, Item.getId(itemStack.getItem()) + itemStack.getDamageValue()); - poseStack.translate(0.5D, 0.5d, 0.5D); - poseStack.mulPose(Vector3f.YP.rotation(tick * Mth.TWO_PI / 80)); - poseStack.scale(0.6f, 0.6f, 0.6f); - itemRenderer.render(itemStack, ItemTransforms.TransformType.FIXED, false, poseStack, buffer, 0xf000f0, OverlayTexture.NO_OVERLAY, bakedmodel); - poseStack.popPose(); + public void renderChest(PoseStack poseStack, MultiBufferSource buffer, Direction frontFacing, ItemStack stored, int storedAmount, float tick, ItemStack locked) { + ItemStack itemStack = !stored.isEmpty() ? stored : locked; + if (itemStack.isEmpty()) return; + var itemRenderer = Minecraft.getInstance().getItemRenderer(); + poseStack.pushPose(); + BakedModel bakedmodel = itemRenderer.getModel(itemStack, Minecraft.getInstance().level, null, Item.getId(itemStack.getItem()) + itemStack.getDamageValue()); + poseStack.translate(0.5D, 0.5d, 0.5D); + poseStack.mulPose(Vector3f.YP.rotation(tick * Mth.TWO_PI / 80)); + poseStack.scale(0.6f, 0.6f, 0.6f); + itemRenderer.render(itemStack, ItemTransforms.TransformType.FIXED, false, poseStack, buffer, 0xf000f0, OverlayTexture.NO_OVERLAY, bakedmodel); + poseStack.popPose(); - poseStack.pushPose(); - RenderSystem.disableDepthTest(); - poseStack.translate(frontFacing.getStepX() * -1 / 16f, frontFacing.getStepY() * -1 / 16f, frontFacing.getStepZ() * -1 / 16f); - RenderUtils.moveToFace(poseStack, 0, 0, 0, frontFacing); - if (frontFacing.getAxis() == Direction.Axis.Y) { - RenderUtils.rotateToFace(poseStack, frontFacing, frontFacing == Direction.UP ? Direction.SOUTH : Direction.NORTH); - } else { - RenderUtils.rotateToFace(poseStack, frontFacing, null); - } - var amount = TextFormattingUtil.formatLongToCompactString(storedAmount, 4); - poseStack.scale(1f / 64, 1f / 64, 0); - poseStack.translate(-32, -32, 0); - new TextTexture(amount).draw(poseStack, 0, 0, 0, 24, 64, 28); - RenderSystem.enableDepthTest(); - poseStack.popPose(); + + poseStack.pushPose(); + RenderSystem.disableDepthTest(); + poseStack.translate(frontFacing.getStepX() * -1 / 16f, frontFacing.getStepY() * -1 / 16f, frontFacing.getStepZ() * -1 / 16f); + RenderUtils.moveToFace(poseStack, 0, 0, 0, frontFacing); + if (frontFacing.getAxis() == Direction.Axis.Y) { + RenderUtils.rotateToFace(poseStack, frontFacing, frontFacing == Direction.UP ? Direction.SOUTH : Direction.NORTH); + } else { + RenderUtils.rotateToFace(poseStack, frontFacing, null); } + var amount = stored.isEmpty() ? "*" : TextFormattingUtil.formatLongToCompactString(storedAmount, 4); + poseStack.scale(1f / 64, 1f / 64, 0); + poseStack.translate(-32, -32, 0); + new TextTexture(amount).draw(poseStack, 0, 0, 0, 24, 64, 28); + RenderSystem.enableDepthTest(); + poseStack.popPose(); } @Environment(EnvType.CLIENT) diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumTankRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumTankRenderer.java index 8d715b4df2..75d92f109c 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumTankRenderer.java +++ b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/QuantumTankRenderer.java @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.resources.model.BakedModel; @@ -51,7 +50,8 @@ public void renderItem(ItemStack stack, ItemTransforms.TransformType transformTy poseStack.translate(-0.5D, -0.5D, -0.5D); FluidStack tank = FluidStack.loadFromTag(stack.getOrCreateTagElement("stored")); - renderTank(poseStack, buffer, Direction.NORTH, tank); + // Don't need to handle locked fluids here since they don't get saved to the item + renderTank(poseStack, buffer, Direction.NORTH, tank, FluidStack.empty()); poseStack.popPose(); } @@ -62,38 +62,39 @@ public void renderItem(ItemStack stack, ItemTransforms.TransformType transformTy @Environment(EnvType.CLIENT) public void render(BlockEntity blockEntity, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay) { if (blockEntity instanceof IMachineBlockEntity machineBlockEntity && machineBlockEntity.getMetaMachine() instanceof QuantumTankMachine machine) { - renderTank(poseStack, buffer, machine.getFrontFacing(), machine.getStored()); + renderTank(poseStack, buffer, machine.getFrontFacing(), machine.getStored(), machine.getLockedFluid().getFluid()); } } @Environment(EnvType.CLIENT) - public void renderTank(PoseStack poseStack, MultiBufferSource buffer, Direction frontFacing, FluidStack stored) { - if (!stored.isEmpty()) { - var fluidTexture = FluidHelper.getStillTexture(stored); - if (fluidTexture == null) { - fluidTexture = Minecraft.getInstance().getTextureAtlas(TextureAtlas.LOCATION_BLOCKS).apply(MissingTextureAtlasSprite.getLocation()); - } - poseStack.pushPose(); - VertexConsumer builder = buffer.getBuffer(Sheets.translucentCullBlockSheet()); - RenderBufferUtils.renderCubeFace(poseStack, builder, 2.5f / 16, 2.5f / 16, 2.5f / 16, 13.5f / 16, 13.5f / 16, 13.5f / 16, FluidHelper.getColor(stored) | 0xff000000, 0xf000f0, fluidTexture); - poseStack.popPose(); + public void renderTank(PoseStack poseStack, MultiBufferSource buffer, Direction frontFacing, FluidStack stored, FluidStack locked) { + FluidStack fluid = !stored.isEmpty() ? stored : locked; + if (fluid.isEmpty()) return; - poseStack.pushPose(); - RenderSystem.disableDepthTest(); - poseStack.translate(frontFacing.getStepX() * -1 / 16f, frontFacing.getStepY() * -1 / 16f, frontFacing.getStepZ() * -1 / 16f); - RenderUtils.moveToFace(poseStack, 0, 0, 0, frontFacing); - if (frontFacing.getAxis() == Direction.Axis.Y) { - RenderUtils.rotateToFace(poseStack, frontFacing, frontFacing == Direction.UP ? Direction.SOUTH : Direction.NORTH); - } else { - RenderUtils.rotateToFace(poseStack, frontFacing, null); - } - var amount = TextFormattingUtil.formatLongToCompactString(stored.getAmount() / (FluidHelper.getBucket() / 1000), 4); - poseStack.scale(1f / 64, 1f / 64, 0); - poseStack.translate(-32, -32, 0); - new TextTexture(amount).draw(poseStack, 0, 0, 0, 24, 64, 28); - RenderSystem.enableDepthTest(); - poseStack.popPose(); + var fluidTexture = FluidHelper.getStillTexture(fluid); + if (fluidTexture == null) { + fluidTexture = Minecraft.getInstance().getTextureAtlas(TextureAtlas.LOCATION_BLOCKS).apply(MissingTextureAtlasSprite.getLocation()); + } + poseStack.pushPose(); + VertexConsumer builder = buffer.getBuffer(Sheets.translucentCullBlockSheet()); + RenderBufferUtils.renderCubeFace(poseStack, builder, 2.5f / 16, 2.5f / 16, 2.5f / 16, 13.5f / 16, 13.5f / 16, 13.5f / 16, FluidHelper.getColor(fluid) | 0xff000000, 0xf000f0, fluidTexture); + poseStack.popPose(); + + poseStack.pushPose(); + RenderSystem.disableDepthTest(); + poseStack.translate(frontFacing.getStepX() * -1 / 16f, frontFacing.getStepY() * -1 / 16f, frontFacing.getStepZ() * -1 / 16f); + RenderUtils.moveToFace(poseStack, 0, 0, 0, frontFacing); + if (frontFacing.getAxis() == Direction.Axis.Y) { + RenderUtils.rotateToFace(poseStack, frontFacing, frontFacing == Direction.UP ? Direction.SOUTH : Direction.NORTH); + } else { + RenderUtils.rotateToFace(poseStack, frontFacing, null); } + var amount = stored.isEmpty() ? "*" : TextFormattingUtil.formatLongToCompactString(fluid.getAmount() / (FluidHelper.getBucket() / 1000), 4); + poseStack.scale(1f / 64, 1f / 64, 0); + poseStack.translate(-32, -32, 0); + new TextTexture(amount).draw(poseStack, 0, 0, 0, 24, 64, 28); + RenderSystem.enableDepthTest(); + poseStack.popPose(); } @Environment(EnvType.CLIENT) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java b/common/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java index b08a21921c..4326a35a93 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java @@ -31,34 +31,25 @@ @MethodsReturnNonnullByDefault public class LaserPipeBlock extends PipeBlock { - public final DyeColor color; public final PipeBlockRenderer renderer; public final PipeModel model; - public LaserPipeBlock(Properties properties, DyeColor color) { - super(properties, LaserPipeType.NORMAL); - this.color = color; - this.model = new PipeModel(LaserPipeType.NORMAL.getThickness(), () -> GTCEu.id("block/pipe/pipe_laser_side"), () -> GTCEu.id("block/pipe/pipe_laser_in")); + public LaserPipeBlock(Properties properties, LaserPipeType type) { + super(properties, type); + this.model = new PipeModel(LaserPipeType.NORMAL.getThickness(), () -> GTCEu.id("block/pipe/pipe_laser_side"), () -> GTCEu.id("block/pipe/pipe_laser_in"), null, null); this.renderer = new PipeBlockRenderer(this.model); } @Environment(EnvType.CLIENT) public static BlockColor tintedColor() { return (blockState, level, blockPos, index) -> { - if (blockState.getBlock() instanceof LaserPipeBlock block) { - if (blockPos != null && level != null && level.getBlockEntity(blockPos) instanceof PipeBlockEntity pipe && pipe.isPainted()) { - return pipe.getRealColor(); - } - return block.tinted(blockState, level, blockPos, index); + if (blockPos != null && level != null && level.getBlockEntity(blockPos) instanceof PipeBlockEntity pipe && pipe.isPainted()) { + return pipe.getRealColor(); } return -1; }; } - public int tinted(BlockState blockState, @Nullable BlockAndTintGetter blockAndTintGetter, @Nullable BlockPos blockPos, int index) { - return color.getTextColor(); - } - @Override public LevelLaserPipeNet getWorldPipeNet(ServerLevel world) { return LevelLaserPipeNet.getOrCreate(world); diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java b/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java index dd04142129..f7aef70d53 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java @@ -1,11 +1,13 @@ package com.gregtechceu.gtceu.common.blockentity; -import com.gregtechceu.gtceu.common.block.FluidPipeBlock; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.cover.CoverBehavior; +import com.gregtechceu.gtceu.common.block.FluidPipeBlock; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeData; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeNet; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeType; import com.lowdragmc.lowdraglib.side.fluid.FluidTransferHelper; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; @@ -42,6 +44,11 @@ public static void onBlockEntityRegister(BlockEntityType c throw new AssertionError(); } + @ExpectPlatform + public static IFluidTransfer getNetHandler(FluidPipeBlockEntity pipe, @Nullable Direction side) { + throw new AssertionError(); + } + @Override public boolean canAttachTo(Direction side) { if (level != null) { @@ -66,4 +73,12 @@ public FluidPipeNet getFluidPipeNet() { } return this.currentFluidPipeNet.get(); } + + public IFluidTransfer getHandler(@Nullable Direction side, boolean useCoverCapability) { + IFluidTransfer handler = getNetHandler(this, side); + if (!useCoverCapability || side == null) return handler; + + CoverBehavior cover = getCoverContainer().getCoverAtSide(side); + return cover != null ? cover.getFluidTransferCap(side, handler) : handler; + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java b/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java index 9f359460b8..51e073b0af 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java @@ -1,13 +1,14 @@ package com.gregtechceu.gtceu.common.blockentity; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.machine.TickableSubscription; +import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.common.block.ItemPipeBlock; import com.gregtechceu.gtceu.common.pipelike.item.ItemNetHandler; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeData; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeNet; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeType; import com.gregtechceu.gtceu.utils.FacingPos; +import com.lowdragmc.lowdraglib.side.item.IItemTransfer; import com.lowdragmc.lowdraglib.side.item.ItemTransferHelper; import dev.architectury.injectables.annotations.ExpectPlatform; import lombok.Getter; @@ -33,15 +34,8 @@ public class ItemPipeBlockEntity extends PipeBlockEntity type, BlockPos pos, BlockState blockState) { super(type, pos, blockState); - this.serverTick = subscribeServerTick(this::update); } @ExpectPlatform @@ -100,17 +94,15 @@ public ItemPipeNet getItemPipeNet() { return this.currentItemPipeNet.get(); } - public void update() { - if (++timer % 20 == 0) { - transferredItems = 0; - } + public void resetTransferred() { + transferred.clear(); } - public void transferItems(int amount) { - transferredItems += amount; - } + public IItemTransfer getHandler(@Nullable Direction side, boolean useCoverCapability) { + ItemNetHandler handler = getHandlers().getOrDefault(side, getDefaultHandler()); + if (!useCoverCapability || side == null) return handler; - public void resetTransferred() { - transferred.clear(); + CoverBehavior cover = getCoverContainer().getCoverAtSide(side); + return cover != null ? cover.getItemTransferCap(side, handler) : handler; } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java index 09827f85a3..fcc1348d64 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java @@ -15,9 +15,10 @@ import com.gregtechceu.gtceu.api.gui.widget.IntInputWidget; import com.gregtechceu.gtceu.api.machine.ConditionalSubscriptionHandler; import com.gregtechceu.gtceu.api.syncdata.RequireRerender; +import com.gregtechceu.gtceu.api.transfer.item.ItemTransferDelegate; import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; import com.gregtechceu.gtceu.common.cover.data.DistributionMode; -import com.gregtechceu.gtceu.common.cover.data.ManualImportExportMode; +import com.gregtechceu.gtceu.common.cover.data.ManualIOMode; import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; @@ -45,6 +46,7 @@ import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -66,7 +68,7 @@ public class ConveyorCover extends CoverBehavior implements IUICover, IControlla @Persisted @DescSynced @Getter protected DistributionMode distributionMode; @Persisted @DescSynced @Getter - protected ManualImportExportMode manualImportExportMode = ManualImportExportMode.DISABLED; + protected ManualIOMode manualIOMode = ManualIOMode.DISABLED; @Persisted @Getter protected boolean isWorkingEnabled = true; protected int itemsLeftToTransferLastSecond; @@ -97,7 +99,7 @@ protected boolean isSubscriptionActive() { } protected @Nullable IItemTransfer getOwnItemTransfer() { - return ItemTransferHelper.getItemTransfer(coverHolder.getLevel(), coverHolder.getPos(), attachedSide); + return coverHolder.getItemTransferCap(attachedSide, false); } protected @Nullable IItemTransfer getAdjacentItemTransfer() { @@ -135,8 +137,8 @@ public void setDistributionMode(DistributionMode distributionMode) { coverHolder.markDirty(); } - protected void setManualImportExportMode(ManualImportExportMode manualImportExportMode) { - this.manualImportExportMode = manualImportExportMode; + protected void setManualIOMode(ManualIOMode manualIOMode) { + this.manualIOMode = manualIOMode; coverHolder.markDirty(); } @@ -391,7 +393,7 @@ protected static class GroupItemInfo { ////////////////////////////////////// @Override public Widget createUIWidget() { - final var group = new WidgetGroup(0, 0, 176, 135); + final var group = new WidgetGroup(0, 0, 176, 137); group.addWidget(new LabelWidget(10, 5, LocalizationUtils.format(getUITitle(), GTValues.VN[tier]))); group.addWidget(new IntInputWidget(10, 20, 156, 20, () -> this.transferRate, this::setTransferRate) @@ -410,26 +412,29 @@ public Widget createUIWidget() { .setPressed(io == IO.IN) .setHoverTooltips(LocalizationUtils.format("cover.conveyor.mode", LocalizationUtils.format(io.tooltip))); group.addWidget(ioModeSwitch); - group.addWidget(new EnumSelectorWidget<>(7, 166, 116, 20, - ManualImportExportMode.VALUES, ManualImportExportMode.DISABLED, - this::setManualImportExportMode) - .setHoverTooltips("cover.universal.manual_import_export.mode.description")); - if (coverHolder.getLevel().getBlockEntity(coverHolder.getPos()) instanceof ItemPipeBlockEntity || - coverHolder.getLevel().getBlockEntity(coverHolder.getPos().relative(attachedSide)) instanceof ItemPipeBlockEntity) { - group.addWidget(new EnumSelectorWidget<>(149, 166, 20, 20, - DistributionMode.VALUES, DistributionMode.INSERT_FIRST, - this::setDistributionMode)); + if (shouldDisplayDistributionMode()) { + group.addWidget(new EnumSelectorWidget<>(146, 67, 20, 20, + DistributionMode.VALUES, distributionMode, this::setDistributionMode)); } - group.addWidget(filterHandler.createFilterSlotUI(148, 107)); - group.addWidget(filterHandler.createFilterConfigUI(10, 70, 156, 60)); + group.addWidget(new EnumSelectorWidget<>(146, 107, 20, 20, + ManualIOMode.VALUES, manualIOMode, this::setManualIOMode) + .setHoverTooltips("cover.universal.manual_import_export.mode.description")); + + group.addWidget(filterHandler.createFilterSlotUI(125, 108)); + group.addWidget(filterHandler.createFilterConfigUI(10, 72, 156, 60)); buildAdditionalUI(group); return group; } + private boolean shouldDisplayDistributionMode() { + return coverHolder.getLevel().getBlockEntity(coverHolder.getPos()) instanceof ItemPipeBlockEntity || + coverHolder.getLevel().getBlockEntity(coverHolder.getPos().relative(attachedSide)) instanceof ItemPipeBlockEntity; + } + @NotNull protected String getUITitle() { return "cover.conveyor.title"; @@ -442,4 +447,50 @@ protected void buildAdditionalUI(WidgetGroup group) { protected void configureFilter() { // Do nothing in the base implementation. This is intended to be overridden by subclasses. } + + + ///////////////////////////////////// + //*** CAPABILITY OVERRIDE ***// + ///////////////////////////////////// + + private final Map itemTransferWrappers = new EnumMap<>(Direction.class); + + @Override + public IItemTransfer getItemTransferCap(Direction side, IItemTransfer defaultValue) { + return itemTransferWrappers.computeIfAbsent(side, s -> new CoverableItemTransferWrapper(defaultValue)); + } + + private class CoverableItemTransferWrapper extends ItemTransferDelegate { + public CoverableItemTransferWrapper(IItemTransfer delegate) { + super(delegate); + } + + @NotNull + @Override + public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate, boolean notifyChanges) { + if (io == IO.OUT && manualIOMode == ManualIOMode.DISABLED) { + return stack; + } + if (manualIOMode == ManualIOMode.FILTERED && !filterHandler.test(stack)) { + return stack; + } + return super.insertItem(slot, stack, simulate, notifyChanges); + } + + @NotNull + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate, boolean notifyChanges) { + if (io == IO.IN && manualIOMode == ManualIOMode.DISABLED) { + return ItemStack.EMPTY; + } + if (manualIOMode == ManualIOMode.FILTERED) { + ItemStack result = super.extractItem(slot, amount, true, notifyChanges); + if (result.isEmpty() || !filterHandler.test(result)) { + return ItemStack.EMPTY; + } + return simulate ? result : super.extractItem(slot, amount, false, notifyChanges); + } + return super.extractItem(slot, amount, simulate, notifyChanges); + } + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java index ac37c8feaa..46c7fb80cf 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java @@ -15,7 +15,9 @@ import com.gregtechceu.gtceu.api.gui.widget.NumberInputWidget; import com.gregtechceu.gtceu.api.machine.ConditionalSubscriptionHandler; import com.gregtechceu.gtceu.api.syncdata.RequireRerender; +import com.gregtechceu.gtceu.api.transfer.fluid.FluidTransferDelegate; import com.gregtechceu.gtceu.common.cover.data.BucketMode; +import com.gregtechceu.gtceu.common.cover.data.ManualIOMode; import com.gregtechceu.gtceu.utils.FluidStackHashStrategy; import com.lowdragmc.lowdraglib.gui.widget.LabelWidget; import com.lowdragmc.lowdraglib.gui.widget.Widget; @@ -34,7 +36,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; -import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import org.jetbrains.annotations.NotNull; @@ -42,6 +43,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.Arrays; +import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -66,6 +68,8 @@ public class PumpCover extends CoverBehavior implements IUICover, IControllable protected IO io = IO.OUT; @Persisted @DescSynced @Getter protected BucketMode bucketMode = BucketMode.MILLI_BUCKET; + @Persisted @DescSynced @Getter + protected ManualIOMode manualIOMode = ManualIOMode.DISABLED; @Persisted @Getter protected boolean isWorkingEnabled = true; @@ -102,7 +106,7 @@ protected boolean isSubscriptionActive() { } protected @Nullable IFluidTransfer getOwnFluidTransfer() { - return FluidTransferHelper.getFluidTransfer(coverHolder.getLevel(), coverHolder.getPos(), attachedSide); + return coverHolder.getFluidTransferCap(attachedSide, false); } protected @Nullable IFluidTransfer getAdjacentFluidTransfer() { @@ -191,6 +195,11 @@ public void setBucketMode(BucketMode bucketMode) { } } + protected void setManualIOMode(ManualIOMode manualIOMode) { + this.manualIOMode = manualIOMode; + coverHolder.markDirty(); + } + protected void update() { long timer = coverHolder.getOffsetTimer(); if (timer % 5 != 0) @@ -271,7 +280,7 @@ private static boolean canTransfer(IFluidTransfer fluidTransfer, TransferDirecti @Override public Widget createUIWidget() { - final var group = new WidgetGroup(0, 0, 176, 135); + final var group = new WidgetGroup(0, 0, 176, 137); group.addWidget(new LabelWidget(10, 5, LocalizationUtils.format(getUITitle(), GTValues.VN[tier]))); transferRateWidget = new LongInputWidget(10, 20, 134, 20, @@ -287,8 +296,12 @@ public Widget createUIWidget() { group.addWidget(new EnumSelectorWidget<>(10, 45, 20, 20, List.of(IO.IN, IO.OUT), io, this::setIo)); - group.addWidget(filterHandler.createFilterSlotUI(148, 107)); - group.addWidget(filterHandler.createFilterConfigUI(10, 70, 156, 60)); + group.addWidget(new EnumSelectorWidget<>(146, 107, 20, 20, + ManualIOMode.VALUES, manualIOMode, this::setManualIOMode) + .setHoverTooltips("cover.universal.manual_import_export.mode.description")); + + group.addWidget(filterHandler.createFilterSlotUI(125, 108)); + group.addWidget(filterHandler.createFilterConfigUI(10, 72, 156, 60)); buildAdditionalUI(group); @@ -321,4 +334,45 @@ protected void buildAdditionalUI(WidgetGroup group) { protected void configureFilter() { // Do nothing in the base implementation. This is intended to be overridden by subclasses. } + + + ///////////////////////////////////// + //*** CAPABILITY OVERRIDE ***// + ///////////////////////////////////// + + private final Map fluidTransferWrappers = new EnumMap<>(Direction.class); + + @Override + public IFluidTransfer getFluidTransferCap(Direction side, IFluidTransfer defaultValue) { + return fluidTransferWrappers.computeIfAbsent(side, s -> new CoverableFluidTransferWrapper(defaultValue)); + } + + private class CoverableFluidTransferWrapper extends FluidTransferDelegate { + + public CoverableFluidTransferWrapper(IFluidTransfer delegate) { + super(delegate); + } + + @Override + public long fill(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + if (io == IO.OUT && manualIOMode == ManualIOMode.DISABLED) { + return 0; + } + if (!filterHandler.test(resource) && manualIOMode == ManualIOMode.FILTERED) { + return 0; + } + return super.fill(tank, resource, simulate, notifyChanges); + } + + @Override + public FluidStack drain(int tank, FluidStack resource, boolean simulate, boolean notifyChanges) { + if (io == IO.IN && manualIOMode == ManualIOMode.DISABLED) { + return FluidStack.empty(); + } + if (manualIOMode == ManualIOMode.FILTERED && !filterHandler.test(resource)) { + return FluidStack.empty(); + } + return super.drain(tank, resource, simulate, notifyChanges); + } + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/DistributionMode.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/DistributionMode.java index d5f0beaf3f..dfeab2d0d9 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/DistributionMode.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/DistributionMode.java @@ -1,13 +1,13 @@ package com.gregtechceu.gtceu.common.cover.data; -import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; +import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; public enum DistributionMode implements EnumSelectorWidget.SelectableEnum { - ROUND_ROBIN_GLOBAL("cover.conveyor.distribution.round_robin_enhanced"), - ROUND_ROBIN_PRIO("cover.conveyor.distribution.round_robin"), - INSERT_FIRST("cover.conveyor.distribution.first_insert"); + ROUND_ROBIN_GLOBAL("round_robin_global"), + ROUND_ROBIN_PRIO("round_robin_prio"), + INSERT_FIRST("insert_first"); public static final DistributionMode[] VALUES = values(); private static final float OFFSET = 1.0f / VALUES.length; @@ -20,11 +20,11 @@ public enum DistributionMode implements EnumSelectorWidget.SelectableEnum { @Override public String getTooltip() { - return localeName; + return "cover.conveyor.distribution." + localeName; } @Override public IGuiTexture getIcon() { - return GuiTextures.DISTRIBUTION_MODE.getSubTexture(0, this.ordinal() * OFFSET, 1, OFFSET); + return new ResourceTexture("gtceu:textures/gui/icon/distribution_mode/" + localeName + ".png"); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualIOMode.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualIOMode.java new file mode 100644 index 0000000000..672648c21a --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualIOMode.java @@ -0,0 +1,29 @@ +package com.gregtechceu.gtceu.common.cover.data; + +import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget; +import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; +import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; + +public enum ManualIOMode implements EnumSelectorWidget.SelectableEnum { + DISABLED("disabled"), + FILTERED("filtered"), + UNFILTERED("unfiltered"); + + public static final ManualIOMode[] VALUES = values(); + + public final String localeName; + + ManualIOMode(String localeName) { + this.localeName = localeName; + } + + @Override + public String getTooltip() { + return "cover.universal.manual_import_export.mode." + localeName; + } + + @Override + public IGuiTexture getIcon() { + return new ResourceTexture("gtceu:textures/gui/icon/manual_io_mode/" + localeName + ".png"); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualImportExportMode.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualImportExportMode.java deleted file mode 100644 index 91f65cccd2..0000000000 --- a/common/src/main/java/com/gregtechceu/gtceu/common/cover/data/ManualImportExportMode.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gregtechceu.gtceu.common.cover.data; - -import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget; -import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; -import com.lowdragmc.lowdraglib.gui.texture.TextTexture; - -public enum ManualImportExportMode implements EnumSelectorWidget.SelectableEnum { - DISABLED("cover.universal.manual_import_export.mode.disabled"), - FILTERED("cover.universal.manual_import_export.mode.filtered"), - UNFILTERED("cover.universal.manual_import_export.mode.unfiltered"); - - public static final ManualImportExportMode[] VALUES = values(); - - public final String localeName; - - ManualImportExportMode(String localeName) { - this.localeName = localeName; - } - - @Override - public String getTooltip() { - return localeName; - } - - @Override - public IGuiTexture getIcon() { - return new TextTexture(localeName); - } -} \ No newline at end of file diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java b/common/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java index 863f800c65..166f824e7a 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/FluidVoidingCover.java @@ -60,7 +60,7 @@ void voidAny(IFluidTransfer fluidTransfer) { final Map fluidAmounts = enumerateDistinctFluids(fluidTransfer, TransferDirection.EXTRACT); for (FluidStack fluidStack : fluidAmounts.keySet()) { - if (!filterHandler.getFilter().test(fluidStack)) + if (!filterHandler.test(fluidStack)) continue; var toDrain = fluidStack.copy(); diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index d3be2af4e6..4dc1b47cb7 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -31,6 +31,7 @@ import com.gregtechceu.gtceu.common.pipelike.fluidpipe.longdistance.LDFluidPipeType; import com.gregtechceu.gtceu.common.pipelike.item.ItemPipeType; import com.gregtechceu.gtceu.common.pipelike.item.longdistance.LDItemPipeType; +import com.gregtechceu.gtceu.common.pipelike.laser.LaserPipeType; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.lowdragmc.lowdraglib.Platform; @@ -110,7 +111,7 @@ public static void generateMaterialBlocks() { var entry = REGISTRATE.block("%s_block".formatted(material.getName()), properties -> new MaterialBlock(properties.noLootTable(), TagPrefix.block, material)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(unificationBlock(TagPrefix.block, material)) - .addLayer(() -> RenderType::solid) + .addLayer(() -> RenderType::translucent) .setData(ProviderType.BLOCKSTATE, NonNullBiConsumer.noop()) .setData(ProviderType.LANG, NonNullBiConsumer.noop()) .setData(ProviderType.LOOT, NonNullBiConsumer.noop()) @@ -130,7 +131,7 @@ public static void generateMaterialBlocks() { .initialProperties(() -> Blocks.IRON_BLOCK) .properties(properties -> properties.noOcclusion().noLootTable()) .transform(unificationBlock(TagPrefix.frameGt, material)) - .addLayer(() -> RenderType::cutoutMipped) + .addLayer(() -> RenderType::translucent) .blockstate(NonNullBiConsumer.noop()) .setData(ProviderType.LANG, NonNullBiConsumer.noop()) .setData(ProviderType.LOOT, NonNullBiConsumer.noop()) @@ -150,7 +151,7 @@ public static void generateMaterialBlocks() { var entry = REGISTRATE.block("raw_%s_block".formatted(material.getName()), properties -> new MaterialBlock(properties.noLootTable(), TagPrefix.rawOreBlock, material)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(unificationBlock(TagPrefix.rawOreBlock, material)) - .addLayer(() -> RenderType::solid) + .addLayer(() -> RenderType::translucent) .setData(ProviderType.BLOCKSTATE, NonNullBiConsumer.noop()) .setData(ProviderType.LANG, NonNullBiConsumer.noop()) .setData(ProviderType.LOOT, NonNullBiConsumer.noop()) @@ -172,8 +173,9 @@ public static void generateMaterialBlocks() { final TagPrefix.OreType oreType = ore.getValue(); var entry = REGISTRATE.block("%s%s_ore".formatted(oreTag != TagPrefix.ore ? FormattingUtil.toLowerCaseUnder(oreTag.name) + "_" : "", material.getName()), oreType.material(), - properties -> new MaterialBlock(properties, oreTag, material, Platform.isClient() ? new OreBlockRenderer(oreType.stoneType(), - () -> Objects.requireNonNull(oreTag.materialIconType()).getBlockTexturePath(material.getMaterialIconSet(), true), + properties -> new RendererMaterialBlock(properties, oreTag, material, Platform.isClient() ? new OreBlockRenderer(oreType.stoneType(), + Suppliers.memoize(() -> Objects.requireNonNull(oreTag.materialIconType()).getBlockTexturePath(material.getMaterialIconSet(), true)), + Suppliers.memoize(() -> Objects.requireNonNull(oreTag.materialIconType()).getBlockTexturePath(material.getMaterialIconSet(), "layer2", true)), oreProperty.isEmissive()) : null)) .initialProperties(() -> { if (oreType.stoneType().get().isAir()) { // if the block is not registered (yet), fallback to stone @@ -220,7 +222,7 @@ public static void generateCableBlocks() { ImmutableTable.Builder> builder = ImmutableTable.builder(); for (Insulation insulation : Insulation.values()) { for (Material material : GTRegistries.MATERIALS) { - if (material.hasProperty(PropertyKey.WIRE) && !insulation.tagPrefix.isIgnored(material)) { + if (material.hasProperty(PropertyKey.WIRE) && !insulation.tagPrefix.isIgnored(material) && !(insulation.isCable && material.getProperty(PropertyKey.WIRE).isSuperconductor())) { var entry = REGISTRATE.block("%s_%s".formatted(material.getName(), insulation.name), p -> new CableBlock(p, insulation, material)) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.dynamicShape().noOcclusion().noLootTable()) @@ -313,14 +315,14 @@ public static void generatePipeBlocks() { ////////////////////////////////////// //***** General Pipes ******// ////////////////////////////////////// - public static final BlockEntry[] LASER_PIPES = new BlockEntry[DyeColor.values().length]; + public static final BlockEntry[] LASER_PIPES = new BlockEntry[LaserPipeType.values().length]; public static void generateLaserPipeBlocks() { REGISTRATE.creativeModeTab(() -> GTCreativeModeTabs.MATERIAL_PIPE); - for (int i = 0; i < DyeColor.values().length; ++i) { - var color = DyeColor.values()[i]; - LASER_PIPES[i] = REGISTRATE.block("%s_laser_pipe".formatted(color.getSerializedName()), p -> new LaserPipeBlock(p, color)) + for (int i = 0; i < LaserPipeType.values().length; ++i) { + var type = LaserPipeType.values()[i]; + LASER_PIPES[i] = REGISTRATE.block("%s_laser_pipe".formatted(type.getSerializedName()), (p) -> new LaserPipeBlock(p, type)) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.dynamicShape().noOcclusion().noLootTable()) .blockstate(NonNullBiConsumer.noop()) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java index d1c4e3722d..39a4e3a7c7 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java @@ -1547,7 +1547,7 @@ public static MachineDefinition[] registerSimpleGenerator(String name, return registerTieredMachines(name, (holder, tier) -> new SimpleGeneratorMachine(holder, tier, tankScalingFunction), (tier, builder) -> builder .langValue("%s %s Generator %s".formatted(VLVH[tier], toEnglishName(name), VLVT[tier])) .editableUI(SimpleGeneratorMachine.EDITABLE_UI_CREATOR.apply(GTCEu.id(name), recipeType)) - .rotationState(RotationState.NON_Y_AXIS) + .rotationState(RotationState.ALL) .recipeType(recipeType) .recipeModifier(SimpleGeneratorMachine::recipeModifier, true) .renderer(() -> new SimpleGeneratorMachineRenderer(tier, GTCEu.id("block/generators/" + name))) @@ -1648,7 +1648,7 @@ public static MultiblockMachineDefinition registerLargeBoiler(String name, Suppl .recoveryItems(() -> new ItemLike[]{GTItems.MATERIAL_ITEMS.get(TagPrefix.dustTiny, GTMaterials.Ash).get()}) .renderer(() -> new LargeBoilerRenderer(texture, firebox, GTCEu.id("block/multiblock/generator/large_%s_boiler".formatted(name)))) .tooltips( - Component.translatable("gtceu.multiblock.large_boiler.max_temperature", (int)(maxTemperature * 274.15), maxTemperature), + Component.translatable("gtceu.multiblock.large_boiler.max_temperature", (int)(maxTemperature + 274.15), maxTemperature), Component.translatable("gtceu.multiblock.large_boiler.heat_time_tooltip", maxTemperature / heatSpeed / 20), Component.translatable("gtceu.multiblock.large_boiler.explosion_tooltip").withStyle(ChatFormatting.DARK_RED)) .compassSections(GTCompassSections.STEAM) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index e54e7c29de..f5a8c3b232 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -799,6 +799,8 @@ private static boolean isMaterialStackFluidOnly(@Nonnull MaterialStack ms) { public static Material RhodiumPlatedPalladium; public static Material Butyraldehyde; public static Material PolyvinylButyral; + public static Material Biphenyl; + public static Material PolychlorinatedBiphenyl; /** * Not possible to determine exact Components @@ -930,6 +932,7 @@ private static boolean isMaterialStackFluidOnly(@Nonnull MaterialStack ms) { public static Material NaquadriaWaste; public static Material Lapotron; public static Material UUMatter; + public static Material PCBCoolant; /** * Second Degree Compounds diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java index 357df92a75..0a2eb26bc1 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java @@ -21,7 +21,7 @@ public class ElementMaterials { public static void register() { Actinium = new Material.Builder("actinium") - .color(0xC3D1FF).iconSet(METALLIC) + .color(0xC3D1FF).secondaryColor(0x353d41).iconSet(METALLIC) .element(GTElements.Ac) .buildAndRegister(); @@ -29,7 +29,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(933)) .ore() - .color(0x80C8F0) + .color(0xb6e5ff).secondaryColor(0x7ca29b) .appendFlags(EXT2_METAL, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE) .element(GTElements.Al) .toolStats(ToolProperty.Builder.of(6.0F, 7.5F, 768, 2) @@ -52,7 +52,7 @@ public static void register() { Antimony = new Material.Builder("antimony") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(904)) - .color(0xDCDCF0).iconSet(SHINY) + .color(0xDCDCF0).secondaryColor(0xa2a2bc).iconSet(SHINY) .flags(MORTAR_GRINDABLE) .element(GTElements.Sb) .buildAndRegister(); @@ -68,18 +68,18 @@ public static void register() { .fluid(FluidStorageKeys.GAS, new FluidBuilder() .state(FluidState.GAS) .temperature(887)) - .color(0x676756) + .color(0x9c9c8d).secondaryColor(0x676756) .element(GTElements.As) .buildAndRegister(); Astatine = new Material.Builder("astatine") - .color(0x241A24) + .color(0xffd52e).secondaryColor(0x17212b) .element(GTElements.At) .buildAndRegister(); Barium = new Material.Builder("barium") .dust() - .color(0x83824C).iconSet(METALLIC) + .color(0xede192).secondaryColor(0x5d9b8d).iconSet(METALLIC) .element(GTElements.Ba) .buildAndRegister(); @@ -92,7 +92,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1560)) .ore() - .color(0x64B464).iconSet(METALLIC) + .color(0x98d677).secondaryColor(0x254d40).iconSet(METALLIC) .appendFlags(STD_METAL) .element(GTElements.Be) .buildAndRegister(); @@ -100,35 +100,35 @@ public static void register() { Bismuth = new Material.Builder("bismuth") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(545)) - .color(0x64A0A0).iconSet(METALLIC) + .color(0x89dbdb).secondaryColor(0x845c6a).iconSet(METALLIC) .element(GTElements.Bi) .buildAndRegister(); Bohrium = new Material.Builder("bohrium") - .color(0xDC57FF).iconSet(SHINY) + .color(0x4c3e50).secondaryColor(0xDC57FF).iconSet(SHINY) .element(GTElements.Bh) .buildAndRegister(); Boron = new Material.Builder("boron") .dust() - .color(0xD2FAD2) + .color(0xDC57FF) .element(GTElements.B) .buildAndRegister(); Bromine = new Material.Builder("bromine") - .color(0x500A0A).iconSet(SHINY) + .color(0x912200).secondaryColor(0x080101).iconSet(SHINY) .element(GTElements.Br) .buildAndRegister(); Caesium = new Material.Builder("caesium") .dust() - .color(0x80620B).iconSet(METALLIC) + .color(0xe9e5d2).secondaryColor(0xaa9864).iconSet(METALLIC) .element(GTElements.Cs) .buildAndRegister(); Calcium = new Material.Builder("calcium") .dust() - .color(0xFFF5DE).iconSet(METALLIC) + .color(0xFFF5DE).secondaryColor(0xa4a4a4).iconSet(METALLIC) .element(GTElements.Ca) .buildAndRegister(); @@ -146,14 +146,14 @@ public static void register() { Cadmium = new Material.Builder("cadmium") .dust() - .color(0x32323C).iconSet(SHINY) + .color(0x636377).secondaryColor(0x412738).iconSet(SHINY) .element(GTElements.Cd) .buildAndRegister(); Cerium = new Material.Builder("cerium") .dust() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1068)) - .color(0x87917D).iconSet(METALLIC) + .color(0xd3d7c3).secondaryColor(0x87917D).iconSet(METALLIC) .element(GTElements.Ce) .buildAndRegister(); @@ -165,7 +165,7 @@ public static void register() { Chromium = new Material.Builder("chromium") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2180)) - .color(0xEAC4D8).iconSet(SHINY) + .color(0xf3e0ea).secondaryColor(0x441f2e).iconSet(SHINY) .appendFlags(EXT_METAL, GENERATE_ROTOR) .element(GTElements.Cr) .rotorStats(12.0f, 3.0f, 512) @@ -177,7 +177,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1768)) .ore() // leave for TiCon ore processing - .color(0x5050FA).iconSet(METALLIC) + .color(0xf1e2d1).secondaryColor(0x1d1dd6).iconSet(METALLIC) .appendFlags(EXT_METAL) .element(GTElements.Co) .cableProperties(GTValues.V[LV], 2, 2) @@ -193,7 +193,7 @@ public static void register() { .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1358)) .ore() - .color(0xFF6400).iconSet(SHINY) + .color(0xe77c56).secondaryColor(0xe4673e).iconSet(SHINY) .appendFlags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE) .element(GTElements.Cu) .cableProperties(GTValues.V[2], 1, 2) @@ -218,11 +218,12 @@ public static void register() { .buildAndRegister(); Dubnium = new Material.Builder("dubnium") - .color(0xD3FDFF).iconSet(SHINY) + .color(0xc7ddde).secondaryColor(0x00f3ff).iconSet(SHINY) .element(GTElements.Db) .buildAndRegister(); Dysprosium = new Material.Builder("dysprosium") + .color(0x6a664b).secondaryColor(0x423307) .iconSet(METALLIC) .element(GTElements.Dy) .buildAndRegister(); @@ -233,6 +234,7 @@ public static void register() { .buildAndRegister(); Erbium = new Material.Builder("erbium") + .color(0xeccbdb).secondaryColor(0x5d625a) .iconSet(METALLIC) .element(GTElements.Er) .buildAndRegister(); @@ -240,7 +242,7 @@ public static void register() { Europium = new Material.Builder("europium") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1099)) - .color(0x20FFFF).iconSet(METALLIC) + .color(0x988b33).secondaryColor(0x032a52).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_LONG_ROD, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_FOIL, GENERATE_FRAME) .element(GTElements.Eu) .cableProperties(GTValues.V[GTValues.UHV], 2, 32) @@ -249,11 +251,12 @@ public static void register() { .buildAndRegister(); Fermium = new Material.Builder("fermium") - .color(0x984ACF).iconSet(METALLIC) + .color(0xc99fe7).secondaryColor(0x3e0022).iconSet(METALLIC) .element(GTElements.Fm) .buildAndRegister(); Flerovium = new Material.Builder("flerovium") + .color(0x393d43).secondaryColor(0xd2ff00) .iconSet(SHINY) .element(GTElements.Fl) .buildAndRegister(); @@ -264,25 +267,25 @@ public static void register() { .buildAndRegister(); Francium = new Material.Builder("francium") - .color(0xAAAAAA).iconSet(SHINY) + .color(0xAAAAAA).secondaryColor(0x0000ff).iconSet(SHINY) .element(GTElements.Fr) .buildAndRegister(); Gadolinium = new Material.Builder("gadolinium") - .color(0xDDDDFF).iconSet(METALLIC) + .color(0x828a7a).secondaryColor(0x363420).iconSet(METALLIC) .element(GTElements.Gd) .buildAndRegister(); Gallium = new Material.Builder("gallium") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(303)) - .color(0xDCDCFF).iconSet(SHINY) + .color(0xdadbf3).secondaryColor(0x787955).iconSet(SHINY) .appendFlags(STD_METAL, GENERATE_FOIL) .element(GTElements.Ga) .buildAndRegister(); Germanium = new Material.Builder("germanium") - .color(0x434343).iconSet(SHINY) + .color(0xe1e1e1).secondaryColor(0x6a6248).iconSet(SHINY) .element(GTElements.Ge) .buildAndRegister(); @@ -290,7 +293,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1337)) .ore() - .color(0xFFE650).iconSet(SHINY) + .color(0xfdf55f).secondaryColor(0xf25833).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE, GENERATE_FOIL) .element(GTElements.Au) .cableProperties(GTValues.V[3], 3, 2) @@ -298,7 +301,7 @@ public static void register() { .buildAndRegister(); Hafnium = new Material.Builder("hafnium") - .color(0x99999A).iconSet(SHINY) + .color(0x99999A).secondaryColor(0x2b4a3a).iconSet(SHINY) .element(GTElements.Hf) .buildAndRegister(); @@ -308,6 +311,7 @@ public static void register() { .buildAndRegister(); Holmium = new Material.Builder("holmium") + .color(0x5c706d).secondaryColor(0x1d2b2d) .iconSet(METALLIC) .element(GTElements.Ho) .buildAndRegister(); @@ -340,19 +344,19 @@ public static void register() { Indium = new Material.Builder("indium") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(430)) - .color(0x400080).iconSet(SHINY) + .color(0xd0c8d9).secondaryColor(0x400080).iconSet(SHINY) .element(GTElements.In) .buildAndRegister(); Iodine = new Material.Builder("iodine") - .color(0x2C344F).iconSet(SHINY) + .color(0x67686d).secondaryColor(0x773000).iconSet(SHINY) .element(GTElements.I) .buildAndRegister(); Iridium = new Material.Builder("iridium") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2719)) - .color(0xA1E4E4).iconSet(METALLIC) + .color(0xfdfce9).secondaryColor(0x3d011b).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR) .element(GTElements.Ir) .rotorStats(7.0f, 3.0f, 2560) @@ -365,7 +369,7 @@ public static void register() { .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1811)) .plasma() .ore() - .color(0xC8C8C8).iconSet(METALLIC) + .color(0xeeeeee).secondaryColor(0x979797).iconSet(METALLIC) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, GENERATE_SPRING_SMALL, GENERATE_SPRING, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, BLAST_FURNACE_CALCITE_TRIPLE) .element(GTElements.Fe) .toolStats(ToolProperty.Builder.of(2.0F, 2.0F, 256, 2) @@ -385,11 +389,12 @@ public static void register() { Lanthanum = new Material.Builder("lanthanum") .dust() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1193)) - .color(0x5D7575).iconSet(METALLIC) + .color(0xe8e0c2).secondaryColor(0x5D7575).iconSet(METALLIC) .element(GTElements.La) .buildAndRegister(); Lawrencium = new Material.Builder("lawrencium") + .color(0x5D7575) .iconSet(METALLIC) .element(GTElements.Lr) .buildAndRegister(); @@ -414,21 +419,21 @@ public static void register() { .buildAndRegister(); Livermorium = new Material.Builder("livermorium") - .color(0xAAAAAA).iconSet(SHINY) + .color(0x939393).secondaryColor(0xff8b8b).iconSet(SHINY) .element(GTElements.Lv) .buildAndRegister(); Lutetium = new Material.Builder("lutetium") .dust() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1925)) - .color(0x00AAFF).iconSet(METALLIC) + .color(0xff8b8b).secondaryColor(0x231809).iconSet(METALLIC) .element(GTElements.Lu) .buildAndRegister(); Magnesium = new Material.Builder("magnesium") .dust() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(923)) - .color(0xFFC8C8).iconSet(METALLIC) + .color(0xffd6d6).secondaryColor(0x594d19).iconSet(METALLIC) .element(GTElements.Mg) .buildAndRegister(); @@ -447,7 +452,7 @@ public static void register() { .buildAndRegister(); Meitnerium = new Material.Builder("meitnerium") - .color(0x2246BE).iconSet(SHINY) + .color(0x454854).secondaryColor(0x6e90ff).iconSet(SHINY) .element(GTElements.Mt) .buildAndRegister(); @@ -461,20 +466,20 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2896)) .ore() - .color(0xB4B4DC).iconSet(SHINY) + .color(0xc1c1ce).secondaryColor(0x404068).iconSet(SHINY) .element(GTElements.Mo) .flags(GENERATE_FOIL, GENERATE_BOLT_SCREW) .rotorStats(7.0f, 2.0f, 512) .buildAndRegister(); Moscovium = new Material.Builder("moscovium") - .color(0x7854AD).iconSet(SHINY) + .color(0x2a1b40).secondaryColor(0xbd91ff).iconSet(SHINY) .element(GTElements.Mc) .buildAndRegister(); Neodymium = new Material.Builder("neodymium") .ingot().fluid().ore() - .color(0x646464).iconSet(METALLIC) + .color(0x9a8b94).secondaryColor(0x2c2c2c).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW) .element(GTElements.Nd) .rotorStats(7.0f, 2.0f, 512) @@ -497,7 +502,7 @@ public static void register() { .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1728)) .plasma() .ore() - .color(0xC8C8FA).iconSet(METALLIC) + .color(0xccdff5).secondaryColor(0x59563a).iconSet(METALLIC) .appendFlags(STD_METAL, MORTAR_GRINDABLE) .element(GTElements.Ni) .cableProperties(GTValues.V[LV], 3, 3) @@ -505,13 +510,13 @@ public static void register() { .buildAndRegister(); Nihonium = new Material.Builder("nihonium") - .color(0x08269E).iconSet(SHINY) + .color(0x323957).secondaryColor(0xa68bff).iconSet(SHINY) .element(GTElements.Nh) .buildAndRegister(); Niobium = new Material.Builder("niobium") .ingot().fluid() - .color(0xBEB4C8).iconSet(METALLIC) + .color(0xe9eacb).secondaryColor(0x2f4c35).iconSet(METALLIC) .element(GTElements.Nb) .blastTemp(2750, GasTier.MID, GTValues.VA[GTValues.HV], 900) .buildAndRegister(); @@ -523,6 +528,7 @@ public static void register() { .buildAndRegister(); Nobelium = new Material.Builder("nobelium") + .color(0x3e4758).secondaryColor(0x43deff) .iconSet(SHINY) .element(GTElements.No) .buildAndRegister(); @@ -535,7 +541,7 @@ public static void register() { Osmium = new Material.Builder("osmium") .ingot(4) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(3306)) - .color(0x3232FF).iconSet(METALLIC) + .color(0xf9f9f9).secondaryColor(0x307fc2).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FOIL) .element(GTElements.Os) .rotorStats(16.0f, 4.0f, 1280) @@ -559,7 +565,7 @@ public static void register() { Palladium = new Material.Builder("palladium") .ingot().fluid().ore() - .color(0x808080).iconSet(SHINY) + .color(0xA0A0A0).secondaryColor(0x4b4a3a).iconSet(SHINY) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE) .element(GTElements.Pd) .blastTemp(1828, GasTier.LOW, GTValues.VA[GTValues.HV], 900) @@ -580,7 +586,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2041)) .ore() - .color(0xFFFFC8).iconSet(SHINY) + .color(0xfff9da).secondaryColor(0x4e4e45).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_RING) .element(GTElements.Pt) .cableProperties(GTValues.V[5], 2, 1) @@ -591,14 +597,14 @@ public static void register() { .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(913)) .ore(true) - .color(0xF03232).iconSet(METALLIC) + .color(0x222730).secondaryColor(0xba2727).iconSet(METALLIC) .element(GTElements.Pu239) .buildAndRegister(); Plutonium241 = new Material.Builder("plutonium_241") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(913)) - .color(0xFA4646).iconSet(SHINY) + .color(0x222730).secondaryColor(0xfa7272).iconSet(SHINY) .appendFlags(EXT_METAL) .element(GTElements.Pu241) .buildAndRegister(); @@ -606,12 +612,12 @@ public static void register() { Potassium = new Material.Builder("potassium") .dust(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(337)) - .color(0xBEDCFF).iconSet(METALLIC) + .color(0xd2e1f2).secondaryColor(0x6189b8).iconSet(METALLIC) .element(GTElements.K) .buildAndRegister(); Praseodymium = new Material.Builder("praseodymium") - .color(0xCECECE).iconSet(METALLIC) + .color(0xCECECE).secondaryColor(0x424d33).iconSet(METALLIC) .element(GTElements.Pr) .buildAndRegister(); @@ -632,73 +638,74 @@ public static void register() { .buildAndRegister(); Radium = new Material.Builder("radium") - .color(0xFFFFCD).iconSet(SHINY) + .color(0x838361).secondaryColor(0x90ff2d).iconSet(SHINY) .element(GTElements.Ra) .buildAndRegister(); Rhenium = new Material.Builder("rhenium") - .color(0xB6BAC3).iconSet(SHINY) + .color(0xcbcfd7).secondaryColor(0x37393d).iconSet(SHINY) .element(GTElements.Re) .buildAndRegister(); Rhodium = new Material.Builder("rhodium") .ingot().fluid() - .color(0xDC0C58).iconSet(BRIGHT) + .color(0xf36bba).secondaryColor(0xDC0C58).iconSet(BRIGHT) .appendFlags(EXT2_METAL, GENERATE_GEAR, GENERATE_FINE_WIRE) .element(GTElements.Rh) .blastTemp(2237, GasTier.MID, GTValues.VA[GTValues.EV], 1200) .buildAndRegister(); Roentgenium = new Material.Builder("roentgenium") - .color(0xE3FDEC).iconSet(SHINY) + .color(0x3e4840).secondaryColor(0xE3FDEC).iconSet(SHINY) .element(GTElements.Rg) .buildAndRegister(); Rubidium = new Material.Builder("rubidium") - .color(0xF01E1E).iconSet(SHINY) + .color(0xbdb0b0).secondaryColor(0x451c1c).iconSet(SHINY) .element(GTElements.Rb) .buildAndRegister(); Ruthenium = new Material.Builder("ruthenium") .ingot().fluid() - .color(0x50ACCD).iconSet(SHINY) + .color(0xc7ced1).secondaryColor(0x3c7285).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_GEAR) .element(GTElements.Ru) .blastTemp(2607, GasTier.MID, GTValues.VA[GTValues.EV], 900) .buildAndRegister(); Rutherfordium = new Material.Builder("rutherfordium") - .color(0xFFF6A1).iconSet(SHINY) + .color(0x6b6157).secondaryColor(0xFFF6A1).iconSet(SHINY) .element(GTElements.Rf) .buildAndRegister(); Samarium = new Material.Builder("samarium") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1345)) - .color(0xFFFFCC).iconSet(METALLIC) + .color(0xc5c5b3).secondaryColor(0x183e3f).iconSet(METALLIC) .flags(GENERATE_LONG_ROD) .element(GTElements.Sm) .blastTemp(5400, GasTier.HIGH, GTValues.VA[GTValues.EV], 1500) .buildAndRegister(); Scandium = new Material.Builder("scandium") + .color(0xb1b2ac).secondaryColor(0x1c3433) .iconSet(METALLIC) .element(GTElements.Sc) .buildAndRegister(); Seaborgium = new Material.Builder("seaborgium") - .color(0x19C5FF).iconSet(SHINY) + .color(0x807c76).secondaryColor(0x19C5FF).iconSet(SHINY) .element(GTElements.Sg) .buildAndRegister(); Selenium = new Material.Builder("selenium") - .color(0xB6BA6B).iconSet(SHINY) + .color(0x58587b).secondaryColor(0x401b24).iconSet(SHINY) .element(GTElements.Se) .buildAndRegister(); Silicon = new Material.Builder("silicon") .ingot().fluid() - .color(0x3C3C50).iconSet(METALLIC) + .color(0xaaaab5).secondaryColor(0x10293b).iconSet(METALLIC) .flags(GENERATE_FOIL) .element(GTElements.Si) .blastTemp(2273) // no gas tier for silicon @@ -708,7 +715,7 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1235)) .ore() - .color(0xDCDCFF).iconSet(SHINY) + .color(0xDCDCFF).secondaryColor(0x5a4705).iconSet(SHINY) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING) .element(GTElements.Ag) .cableProperties(GTValues.V[3], 1, 1) @@ -716,12 +723,12 @@ public static void register() { Sodium = new Material.Builder("sodium") .dust() - .color(0x000096).iconSet(METALLIC) + .color(0xabb1ba).secondaryColor(0x2b30a3).iconSet(METALLIC) .element(GTElements.Na) .buildAndRegister(); Strontium = new Material.Builder("strontium") - .color(0xC8C8C8).iconSet(METALLIC) + .color(0x7a7953).secondaryColor(0x4c0b06).iconSet(METALLIC) .element(GTElements.Sr) .buildAndRegister(); @@ -735,13 +742,13 @@ public static void register() { Tantalum = new Material.Builder("tantalum") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(3290)) - .color(0x78788c).iconSet(METALLIC) + .color(0xa8a7c6).secondaryColor(0x1f2b20).iconSet(METALLIC) .appendFlags(STD_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE) .element(GTElements.Ta) .buildAndRegister(); Technetium = new Material.Builder("technetium") - .color(0x545455).iconSet(SHINY) + .color(0xb1d0d8).secondaryColor(0xd7fce2).iconSet(SHINY) .element(GTElements.Tc) .buildAndRegister(); @@ -751,11 +758,12 @@ public static void register() { .buildAndRegister(); Tennessine = new Material.Builder("tennessine") - .color(0x977FD6).iconSet(SHINY) + .color(0x768189).secondaryColor(0xbca3ff).iconSet(SHINY) .element(GTElements.Ts) .buildAndRegister(); Terbium = new Material.Builder("terbium") + .color(0xcedab4).secondaryColor(0x263640) .iconSet(METALLIC) .element(GTElements.Tb) .buildAndRegister(); @@ -764,17 +772,18 @@ public static void register() { .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2023)) .ore() - .color(0x001E00).iconSet(SHINY) + .color(0x323528).secondaryColor(0x051E05).iconSet(SHINY) .appendFlags(STD_METAL, GENERATE_ROD) .element(GTElements.Th) .buildAndRegister(); Thallium = new Material.Builder("thallium") - .color(0xC1C1DE).iconSet(SHINY) + .color(0xc1c9de).secondaryColor(0x1e576a).iconSet(SHINY) .element(GTElements.Tl) .buildAndRegister(); Thulium = new Material.Builder("thulium") + .color(0xafb0a4).secondaryColor(0x420b0b) .iconSet(METALLIC) .element(GTElements.Tm) .buildAndRegister(); @@ -792,7 +801,7 @@ public static void register() { Titanium = new Material.Builder("titanium") // todo Ore? Look at EBF recipe here if we do Ti ores .ingot(3).fluid() - .color(0xDCA0F0).iconSet(METALLIC) + .color(0xd8d5d9).secondaryColor(0x440050).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, GENERATE_FRAME) .element(GTElements.Ti) .toolStats(ToolProperty.Builder.of(8.0F, 6.0F, 1536, 3) @@ -804,6 +813,7 @@ public static void register() { Tritium = new Material.Builder("tritium") .fluid(FluidStorageKeys.GAS, new FluidBuilder().state(FluidState.GAS).customStill()) + .color(0xff316b).secondaryColor(0xd00000) .iconSet(METALLIC) .element(GTElements.T) .buildAndRegister(); @@ -811,7 +821,7 @@ public static void register() { Tungsten = new Material.Builder("tungsten") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(3695)) - .color(0x323232).iconSet(METALLIC) + .color(0x3b3a32).secondaryColor(0x2a2800).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_FRAME) .element(GTElements.W) .rotorStats(7.0f, 3.0f, 2560) @@ -823,7 +833,7 @@ public static void register() { Uranium238 = new Material.Builder("uranium") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1405)) - .color(0x32F032).iconSet(METALLIC) + .color(0x33342c).secondaryColor(0x1d891d).iconSet(METALLIC) .appendFlags(EXT_METAL) .element(GTElements.U238) .buildAndRegister(); @@ -831,14 +841,14 @@ public static void register() { Uranium235 = new Material.Builder("uranium_235") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1405)) - .color(0x46FA46).iconSet(SHINY) + .color(0x33342c).secondaryColor(0x46FA46).iconSet(SHINY) .appendFlags(EXT_METAL) .element(GTElements.U235) .buildAndRegister(); Vanadium = new Material.Builder("vanadium") .ingot().fluid() - .color(0x323232).iconSet(METALLIC) + .color(0x696d76).secondaryColor(0x240808).iconSet(METALLIC) .element(GTElements.V) .blastTemp(2183, GasTier.MID) .buildAndRegister(); @@ -856,7 +866,7 @@ public static void register() { Yttrium = new Material.Builder("yttrium") .ingot().fluid() - .color(0x76524C).iconSet(METALLIC) + .color(0x7d8072).secondaryColor(0x15161a).iconSet(METALLIC) .element(GTElements.Y) .blastTemp(1799) .buildAndRegister(); @@ -864,13 +874,13 @@ public static void register() { Zinc = new Material.Builder("zinc") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(693)) - .color(0xEBEBFA).iconSet(METALLIC) + .color(0xEBEBFA).secondaryColor(0x232c30).iconSet(METALLIC) .appendFlags(STD_METAL, MORTAR_GRINDABLE, GENERATE_FOIL, GENERATE_RING, GENERATE_FINE_WIRE) .element(GTElements.Zn) .buildAndRegister(); Zirconium = new Material.Builder("zirconium") - .color(0xC8FFFF).iconSet(METALLIC) + .color(0xfff0e2).secondaryColor(0x271813).iconSet(METALLIC) .element(GTElements.Zr) .buildAndRegister(); @@ -878,7 +888,7 @@ public static void register() { .ingot(4) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().customStill()) .ore() - .color(0x323232, false).iconSet(METALLIC) + .color(0x323232, false).secondaryColor(0x1e251b).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW) .element(GTElements.Nq) .rotorStats(6.0f, 4.0f, 1280) @@ -890,7 +900,7 @@ public static void register() { NaquadahEnriched = new Material.Builder("enriched_naquadah") .ingot(4) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().customStill()) - .color(0x3C3C3C, false).iconSet(METALLIC) + .color(0x3C3C3C, false).secondaryColor(0x122f06).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FOIL) .element(GTElements.Nq1) .blastTemp(7000, GasTier.HIGH, GTValues.VA[GTValues.IV], 1000) @@ -899,7 +909,7 @@ public static void register() { Naquadria = new Material.Builder("naquadria") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().customStill()) - .color(0x1E1E1E, false).iconSet(SHINY) + .color(0x1E1E1E, false).secondaryColor(0x59b3ff).iconSet(SHINY) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW) .element(GTElements.Nq2) .blastTemp(9000, GasTier.HIGH, GTValues.VA[GTValues.ZPM], 1200) @@ -920,7 +930,7 @@ public static void register() { Tritanium = new Material.Builder("tritanium") .ingot(6) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(25_000)) - .color(0x600000).iconSet(METALLIC) + .color(0xc35769).secondaryColor(0x210840).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FRAME, GENERATE_RING, GENERATE_SMALL_GEAR, GENERATE_ROUND, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_GEAR) .element(GTElements.Tr) .cableProperties(GTValues.V[8], 1, 8) @@ -930,7 +940,7 @@ public static void register() { Duranium = new Material.Builder("duranium") .ingot(5) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(7500)) - .color(0x4BAFAF).iconSet(BRIGHT) + .color(0xf3e7a9).secondaryColor(0x9c9487).iconSet(BRIGHT) .appendFlags(EXT_METAL, GENERATE_FOIL, GENERATE_GEAR) .element(GTElements.Dr) .toolStats(ToolProperty.Builder.of(14.0F, 12.0F, 8192, 5) @@ -940,7 +950,7 @@ public static void register() { Trinium = new Material.Builder("trinium") .ingot(7).fluid() - .color(0x9973BD).iconSet(SHINY) + .color(0x81808a).secondaryColor(0x351d4b).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_BOLT_SCREW, GENERATE_GEAR) .element(GTElements.Ke) .cableProperties(GTValues.V[7], 6, 4) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java index 12b3bf14f0..276029598b 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java @@ -6,6 +6,7 @@ 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.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; import com.gregtechceu.gtceu.api.fluids.attribute.FluidAttributes; import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -21,7 +22,7 @@ public class FirstDegreeMaterials { public static void register() { Almandine = new Material.Builder("almandine") .gem(1).ore(3, 1) - .color(0xFF0000) + .color(0xa21717).secondaryColor(0x4b1e0c) .components(Aluminium, 2, Iron, 3, Silicon, 3, Oxygen, 12) .buildAndRegister(); @@ -34,7 +35,7 @@ public static void register() { AnnealedCopper = new Material.Builder("annealed_copper") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1358)) - .color(0xFF8D3B).iconSet(BRIGHT) + .color(0xf2c079).secondaryColor(0xe45534).iconSet(BRIGHT) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE) .components(Copper, 1) .cableProperties(GTValues.V[2], 1, 1) @@ -43,13 +44,13 @@ public static void register() { Asbestos = new Material.Builder("asbestos") .dust(1).ore(3, 1) - .color(0xE6E6E6) + .color(0xE6E6E6).secondaryColor(0xdbd7bf) .components(Magnesium, 3, Silicon, 2, Hydrogen, 4, Oxygen, 9) .buildAndRegister(); Ash = new Material.Builder("ash") .dust(1) - .color(0x969696) + .color(0xd1d1d1).secondaryColor(0x8b8989) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 1) .buildAndRegister(); @@ -85,7 +86,7 @@ public static void register() { Brass = new Material.Builder("brass") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1160)) - .color(0xFFB400).iconSet(METALLIC) + .color(0xffe36e).secondaryColor(0x935828).iconSet(METALLIC) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE) .components(Zinc, 1, Copper, 3) .rotorStats(8.0f, 3.0f, 152) @@ -95,7 +96,7 @@ public static void register() { Bronze = new Material.Builder("bronze") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1357)) - .color(0xFF8000).iconSet(METALLIC) + .color(0xffc370).secondaryColor(0x806752).iconSet(METALLIC) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_FRAME, GENERATE_SMALL_GEAR, GENERATE_FOIL, GENERATE_GEAR) .components(Tin, 1, Copper, 3) .toolStats(ToolProperty.Builder.of(3.0F, 2.0F, 192, 2) @@ -106,7 +107,7 @@ public static void register() { Goethite = new Material.Builder("goethite") .dust(1).ore() - .color(0xC86400).iconSet(METALLIC) + .color(0x97873a).secondaryColor(0x313131).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, BLAST_FURNACE_CALCITE_TRIPLE) .components(Iron, 1, Hydrogen, 1, Oxygen, 2) .buildAndRegister(); @@ -119,7 +120,7 @@ public static void register() { Cassiterite = new Material.Builder("cassiterite") .dust(1).ore(2, 1) - .color(0xDCDCDC).iconSet(METALLIC) + .color(0x89847e).secondaryColor(0x3b3b35).iconSet(METALLIC) .components(Tin, 1, Oxygen, 2) .buildAndRegister(); @@ -137,14 +138,14 @@ public static void register() { Charcoal = new Material.Builder("charcoal") .gem(1, 1600) //default charcoal burn time in vanilla - .color(0x644646).iconSet(FINE) + .color(0x7d6f58).secondaryColor(0x13110d).iconSet(FINE) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .components(Carbon, 1) .buildAndRegister(); Chromite = new Material.Builder("chromite") .dust(1).ore() - .color(0x23140F).iconSet(METALLIC) + .color(0xc5c1a8).secondaryColor(0x4c1a69).iconSet(METALLIC) .components(Iron, 1, Chromium, 2, Oxygen, 4) .buildAndRegister(); @@ -171,20 +172,20 @@ public static void register() { Cobaltite = new Material.Builder("cobaltite") .dust(1).ore() - .color(0x5050FA).iconSet(METALLIC) + .color(0x1975ff).secondaryColor(0x56071f).iconSet(METALLIC) .components(Cobalt, 1, Arsenic, 1, Sulfur, 1) .buildAndRegister(); Cooperite = new Material.Builder("cooperite") .dust(1).ore() - .color(0xFFFFC8).iconSet(METALLIC) + .color(0xe9ffa7).secondaryColor(0x665f2f).iconSet(METALLIC) .components(Platinum, 3, Nickel, 1, Sulfur, 1, Palladium, 1) .buildAndRegister(); Cupronickel = new Material.Builder("cupronickel") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1542)) - .color(0xE39680).iconSet(METALLIC) + .color(0xffda8a).secondaryColor(0xcd2b00).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_SPRING, GENERATE_FINE_WIRE) .components(Copper, 1, Nickel, 1) .itemPipeProperties(2048, 1) @@ -211,7 +212,7 @@ public static void register() { Electrum = new Material.Builder("electrum") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1285)) - .color(0xFFFF64).iconSet(SHINY) + .color(0xffff8b).secondaryColor(0xff8533).iconSet(SHINY) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FINE_WIRE, GENERATE_RING) .components(Silver, 1, Gold, 1) .itemPipeProperties(1024, 2) @@ -234,7 +235,7 @@ public static void register() { Garnierite = new Material.Builder("garnierite") .dust(3).ore() - .color(0x32C846).iconSet(METALLIC) + .color(0x32c880).secondaryColor(0x344028).iconSet(METALLIC) .components(Nickel, 1, Oxygen, 1) .buildAndRegister(); @@ -256,14 +257,14 @@ public static void register() { .fluid(FluidStorageKeys.LIQUID, new FluidBuilder() .temperature(273) .customStill()) - .color(0xC8C8FF, false).iconSet(SHINY) + .color(0xeef6ff, false).secondaryColor(0x6389c9).iconSet(SHINY) .flags(NO_SMASHING, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Oxygen, 1) .buildAndRegister(); Ilmenite = new Material.Builder("ilmenite") .dust(3).ore() - .color(0x463732).iconSet(METALLIC) + .color(0x2b2a24).secondaryColor(0x2b1700).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iron, 1, Titanium, 1, Oxygen, 3) .buildAndRegister(); @@ -285,7 +286,7 @@ public static void register() { Invar = new Material.Builder("invar") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1916)) - .color(0xB4B478).iconSet(METALLIC) + .color(0xe2e8e1).secondaryColor(0x495d57).iconSet(METALLIC) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_FRAME, GENERATE_GEAR) .components(Iron, 2, Nickel, 1) .toolStats(ToolProperty.Builder.of(4.0F, 3.0F, 384, 2) @@ -299,7 +300,7 @@ public static void register() { Kanthal = new Material.Builder("kanthal") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1708)) - .color(0xC2D2DF).iconSet(METALLIC) + .color(0xC2D2DF).secondaryColor(0x4c4238).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_SPRING) .components(Iron, 1, Aluminium, 1, Chromium, 1) .cableProperties(GTValues.V[3], 4, 3) @@ -308,7 +309,7 @@ public static void register() { Lazurite = new Material.Builder("lazurite") .gem(1).ore(6, 4) - .color(0x6478FF).iconSet(LAPIS) + .color(0xC8BEFF).iconSet(LAPIS) .flags(GENERATE_PLATE, NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_ROD, DECOMPOSITION_BY_ELECTROLYZING) .components(Aluminium, 6, Silicon, 6, Calcium, 8, Sodium, 8) .buildAndRegister(); @@ -325,26 +326,26 @@ public static void register() { Magnesite = new Material.Builder("magnesite") .dust().ore() - .color(0xFAFAB4).iconSet(METALLIC) + .color(0xfbfbf6).secondaryColor(0x80705e).iconSet(METALLIC) .components(Magnesium, 1, Carbon, 1, Oxygen, 3) .buildAndRegister(); Magnetite = new Material.Builder("magnetite") .dust().ore() - .color(0x1E1E1E).iconSet(METALLIC) + .color(0x9d9d9d).secondaryColor(0x06070e).iconSet(METALLIC) .components(Iron, 3, Oxygen, 4) .buildAndRegister(); Molybdenite = new Material.Builder("molybdenite") .dust().ore() - .color(0x191919).iconSet(METALLIC) + .color(0xe3ddc3).secondaryColor(0x191919).iconSet(METALLIC) .components(Molybdenum, 1, Sulfur, 2) .buildAndRegister(); Nichrome = new Material.Builder("nichrome") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1818)) - .color(0xCDCEF6).iconSet(METALLIC) + .color(0xebe6d6).secondaryColor(0x282b42).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_SPRING) .components(Nickel, 4, Chromium, 1) .cableProperties(GTValues.V[EV], 4, 4) @@ -373,7 +374,7 @@ public static void register() { Obsidian = new Material.Builder("obsidian") .dust(3) - .color(0x503264) + .color(0x3b2754).secondaryColor(0x000001) .flags(NO_SMASHING, EXCLUDE_BLOCK_CRAFTING_RECIPES, GENERATE_PLATE) .components(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 4) .buildAndRegister(); @@ -387,7 +388,7 @@ public static void register() { PlatinumRaw = new Material.Builder("platinum_raw") .dust() - .color(0xFFFFC8).iconSet(METALLIC) + .color(0xa09a7b).secondaryColor(0x4e4e45).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Platinum, 1, Chlorine, 2) .buildAndRegister(); @@ -395,7 +396,7 @@ public static void register() { SterlingSilver = new Material.Builder("sterling_silver") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1258)) - .color(0xFADCE1).iconSet(SHINY) + .color(0xfaf4dc).secondaryColor(0x484434).iconSet(SHINY) .appendFlags(EXT2_METAL) .components(Copper, 1, Silver, 4) .toolStats(ToolProperty.Builder.of(3.0F, 8.0F, 768, 2) @@ -409,7 +410,7 @@ public static void register() { RoseGold = new Material.Builder("rose_gold") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1341)) - .color(0xFFE61E).iconSet(SHINY) + .color(0xecd5b8).secondaryColor(0xd85f2d).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_RING) .components(Copper, 1, Gold, 4) .toolStats(ToolProperty.Builder.of(12.0F, 2.0F, 768, 2) @@ -423,7 +424,7 @@ public static void register() { BlackBronze = new Material.Builder("black_bronze") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1328)) - .color(0x64327D) + .color(0x8b7c70).secondaryColor(0x4b3d32) .appendFlags(EXT2_METAL, GENERATE_GEAR) .components(Gold, 1, Silver, 1, Copper, 3) .rotorStats(12.0f, 2.0f, 256) @@ -434,7 +435,7 @@ public static void register() { BismuthBronze = new Material.Builder("bismuth_bronze") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1036)) - .color(0x647D7D) + .color(0xffd26f).secondaryColor(0x895f3d) .appendFlags(EXT2_METAL) .components(Bismuth, 1, Zinc, 1, Copper, 3) .rotorStats(8.0f, 3.0f, 256) @@ -443,7 +444,7 @@ public static void register() { Biotite = new Material.Builder("biotite") .dust(1) - .color(0x141E14).iconSet(METALLIC) + .color(0x343b34).secondaryColor(0x121200).iconSet(METALLIC) .components(Potassium, 1, Magnesium, 3, Aluminium, 3, Fluorine, 2, Silicon, 3, Oxygen, 10) .buildAndRegister(); @@ -455,7 +456,7 @@ public static void register() { Pyrite = new Material.Builder("pyrite") .dust(1).ore() - .color(0x967828).iconSet(ROUGH) + .color(0xfffee6).secondaryColor(0xb69f4e).iconSet(ROUGH) .flags(BLAST_FURNACE_CALCITE_DOUBLE) .components(Iron, 1, Sulfur, 2) .buildAndRegister(); @@ -474,14 +475,14 @@ public static void register() { RockSalt = new Material.Builder("rock_salt") .gem(1).ore(2, 1) - .color(0xF0C8C8).iconSet(FINE) + .color(0xffeae1).secondaryColor(0xF0C8C8).iconSet(FINE) .flags(NO_SMASHING) .components(Potassium, 1, Chlorine, 1) .buildAndRegister(); Ruridit = new Material.Builder("ruridit") .ingot(3) - .colorAverage().iconSet(BRIGHT) + .color(0xFFFFFF).secondaryColor(0xc5c5c5).iconSet(BRIGHT) .flags(GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_LONG_ROD) .components(Ruthenium, 2, Iridium, 1) .blastTemp(4500, GasTier.HIGH, GTValues.VA[GTValues.EV], 1600) @@ -503,7 +504,7 @@ public static void register() { Saltpeter = new Material.Builder("saltpeter") .dust(1).ore(2, 1) - .color(0xE6E6E6).iconSet(FINE) + .color(0xE6E6E6).secondaryColor(0xe6e1cf).iconSet(FINE) .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE) .components(Potassium, 1, Nitrogen, 1, Oxygen, 3) .buildAndRegister(); @@ -532,13 +533,13 @@ public static void register() { AluminiumSulfite = new Material.Builder("aluminium_sulfite") .dust() - .color(0xCC4BBB).iconSet(DULL) + .color(0xd4ecf9).secondaryColor(0xa6b9b6).iconSet(DULL) .components(Aluminium, 2, Sulfur, 3, Oxygen, 9) .buildAndRegister().setFormula("Al2(SO3)3", true); Tantalite = new Material.Builder("tantalite") .dust(3).ore() - .color(0x915028).iconSet(METALLIC) + .color(0x4e6b94).secondaryColor(0x632300).iconSet(METALLIC) .components(Manganese, 1, Tantalum, 2, Oxygen, 6) .buildAndRegister(); @@ -572,7 +573,7 @@ public static void register() { StainlessSteel = new Material.Builder("stainless_steel") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2011)) - .color(0xC8C8DC).iconSet(SHINY) + .color(0xededfd).secondaryColor(0x19191d).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_LONG_ROD, GENERATE_FOIL, GENERATE_GEAR) .components(Iron, 6, Chromium, 1, Manganese, 1, Nickel, 1) .toolStats(ToolProperty.Builder.of(7.0F, 5.0F, 1024, 3) @@ -585,7 +586,7 @@ public static void register() { Steel = new Material.Builder("steel") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2046)) - .color(0x808080).iconSet(METALLIC) + .color(0xa7a7a7).secondaryColor(0x121c37).iconSet(METALLIC) .appendFlags(EXT2_METAL, MORTAR_GRINDABLE, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FRAME, DISABLE_DECOMPOSITION, GENERATE_FINE_WIRE, GENERATE_GEAR) .components(Iron, 1) @@ -600,7 +601,7 @@ public static void register() { Stibnite = new Material.Builder("stibnite") .dust().ore() - .color(0x464646).iconSet(METALLIC) + .color(0x656565).secondaryColor(0x0a1432).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Antimony, 2, Sulfur, 3) .buildAndRegister(); @@ -616,7 +617,7 @@ public static void register() { TinAlloy = new Material.Builder("tin_alloy") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1258)) - .color(0xC8C8C8).iconSet(METALLIC) + .color(0xC8C8C8).secondaryColor(0x8b8b8b).iconSet(METALLIC) .appendFlags(EXT2_METAL) .components(Tin, 1, Iron, 1) .fluidPipeProperties(1572, 20, true) @@ -640,7 +641,7 @@ public static void register() { Ultimet = new Material.Builder("ultimet") .ingot(4) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1980)) - .color(0xB4B4E6).iconSet(SHINY) + .color(0x9f9fb1).secondaryColor(0x385086).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_GEAR) .components(Cobalt, 5, Chromium, 2, Nickel, 1, Molybdenum, 1) .toolStats(ToolProperty.Builder.of(10.0F, 7.0F, 2048, 4) @@ -652,7 +653,7 @@ public static void register() { Uraninite = new Material.Builder("uraninite") .dust(3).ore(true) - .color(0x232323).iconSet(METALLIC) + .color(0xffd52e).secondaryColor(0x17212b).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Uranium238, 1, Oxygen, 2) .buildAndRegister() @@ -667,7 +668,7 @@ public static void register() { VanadiumGallium = new Material.Builder("vanadium_gallium") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1712)) - .color(0x80808C).iconSet(SHINY) + .color(0x89aeec).secondaryColor(0x00379d).iconSet(SHINY) .appendFlags(STD_METAL, GENERATE_FOIL, GENERATE_SPRING, GENERATE_SPRING_SMALL) .components(Vanadium, 3, Gallium, 1) .cableProperties(GTValues.V[7], 4, 2) @@ -677,7 +678,7 @@ public static void register() { WroughtIron = new Material.Builder("wrought_iron") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2011)) - .color(0xC8B4B4).iconSet(METALLIC) + .color(0xbcbcbc).secondaryColor(0x521c0b).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_GEAR, GENERATE_FOIL, MORTAR_GRINDABLE, GENERATE_RING, GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION, BLAST_FURNACE_CALCITE_TRIPLE) .components(Iron, 1) .toolStats(ToolProperty.Builder.of(2.0F, 2.0F, 384, 2) @@ -696,7 +697,7 @@ public static void register() { YellowLimonite = new Material.Builder("yellow_limonite") .dust().ore() - .color(0xC8C800).iconSet(METALLIC) + .color(0xf5e315).secondaryColor(0xc06f33).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, BLAST_FURNACE_CALCITE_DOUBLE) .components(Iron, 1, Hydrogen, 1, Oxygen, 2) .buildAndRegister(); @@ -704,7 +705,7 @@ public static void register() { YttriumBariumCuprate = new Material.Builder("yttrium_barium_cuprate") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1799)) - .color(0x504046).iconSet(METALLIC) + .color(0x796d72).secondaryColor(0x260a3a).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FOIL, GENERATE_BOLT_SCREW) .components(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7) .cableProperties(GTValues.V[8], 4, 4) @@ -741,7 +742,7 @@ public static void register() { Graphene = new Material.Builder("graphene") .dust().ingot() - .color(0x808080).iconSet(SHINY) + .color(0x808080).secondaryColor(0x3d3838).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION, GENERATE_FOIL) .components(Carbon, 1) .cableProperties(GTValues.V[5], 1, 1) @@ -749,7 +750,7 @@ public static void register() { TungsticAcid = new Material.Builder("tungstic_acid") .dust() - .color(0xBCC800).iconSet(SHINY) + .color(0xfffc03).secondaryColor(0x886217).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Tungsten, 1, Oxygen, 4) .buildAndRegister(); @@ -757,7 +758,7 @@ public static void register() { Osmiridium = new Material.Builder("osmiridium") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(3012)) - .color(0x6464FF).iconSet(METALLIC) + .color(0xe5dcef).secondaryColor(0x241a44).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_ROTOR, GENERATE_ROUND, GENERATE_FINE_WIRE, GENERATE_GEAR) .components(Iridium, 3, Osmium, 1) .rotorStats(9.0f, 3.0f, 3152) @@ -773,13 +774,13 @@ public static void register() { CalciumChloride = new Material.Builder("calcium_chloride") .dust() - .color(0xEBEBFA).iconSet(FINE) + .color(0xFFFFFF).secondaryColor(0xe7e7d7).iconSet(FINE) .components(Calcium, 1, Chlorine, 2) .buildAndRegister(); Bornite = new Material.Builder("bornite") .dust(1).ore() - .color(0x97662B).iconSet(METALLIC) + .color(0xffe05a).secondaryColor(0x442602).iconSet(METALLIC) .components(Copper, 5, Iron, 1, Sulfur, 4) .buildAndRegister(); @@ -789,10 +790,6 @@ public static void register() { .components(Copper, 2, Sulfur, 1) .buildAndRegister(); - // Free ID 349 - - // Free ID 350 - GalliumArsenide = new Material.Builder("gallium_arsenide") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1511)) @@ -825,7 +822,7 @@ public static void register() { NickelZincFerrite = new Material.Builder("nickel_zinc_ferrite") .ingot(0) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1410)) - .color(0x3C3C3C).iconSet(METALLIC) + .color(0x3f2821).secondaryColor(0x2c2725).iconSet(METALLIC) .flags(GENERATE_RING) .components(Nickel, 1, Zinc, 1, Iron, 4, Oxygen, 8) .buildAndRegister(); @@ -871,7 +868,7 @@ public static void register() { FerriteMixture = new Material.Builder("ferrite_mixture") .dust(1) - .color(0xB4B4B4).iconSet(METALLIC) + .color(0xB4B4B4).secondaryColor(0x763200).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Nickel, 1, Zinc, 1, Iron, 4) .buildAndRegister(); @@ -884,7 +881,7 @@ public static void register() { PlatinumGroupSludge = new Material.Builder("platinum_group_sludge") .dust(1) - .color(0x001E00).iconSet(FINE) + .color(0x343228).secondaryColor(0x001E00).iconSet(FINE) .flags(DISABLE_DECOMPOSITION) .buildAndRegister(); @@ -897,7 +894,7 @@ public static void register() { SodiumBicarbonate = new Material.Builder("sodium_bicarbonate") .dust(1) - .color(0x565b96).iconSet(ROUGH) + .color(0xFFFFFF).secondaryColor(0xa7d2df).iconSet(ROUGH) .components(Sodium, 1, Hydrogen, 1, Carbon, 1, Oxygen, 3) .buildAndRegister(); @@ -915,7 +912,7 @@ public static void register() { AntimonyTrioxide = new Material.Builder("antimony_trioxide") .dust(1) - .color(0xE6E6F0) + .color(0xf5f5ff).secondaryColor(0xc4c4d6) .components(Antimony, 2, Oxygen, 3) .buildAndRegister(); @@ -957,7 +954,7 @@ public static void register() { MetalMixture = new Material.Builder("metal_mixture") .dust(1) - .color(0x502d16).iconSet(METALLIC) + .color(0x697077).secondaryColor(0x502d16).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .buildAndRegister(); @@ -975,7 +972,7 @@ public static void register() { Bastnasite = new Material.Builder("bastnasite") .dust().ore(2, 1) - .color(0xC86E2D).iconSet(FINE) + .color(0xcaab60).secondaryColor(0xc8502d).iconSet(FINE) .components(Cerium, 1, Carbon, 1, Fluorine, 1, Oxygen, 3) .buildAndRegister(); @@ -993,7 +990,7 @@ public static void register() { Lepidolite = new Material.Builder("lepidolite") .dust().ore(2, 1) - .color(0xF0328C).iconSet(FINE) + .color(0xffdae4).secondaryColor(0x75376f).iconSet(FINE) .components(Potassium, 1, Lithium, 3, Aluminium, 4, Fluorine, 2, Oxygen, 10) .buildAndRegister(); @@ -1013,7 +1010,7 @@ public static void register() { Mica = new Material.Builder("mica") .dust().ore(2, 1) - .color(0xC3C3CD).iconSet(FINE) + .color(0xecfeff).secondaryColor(0xc2a03c).iconSet(FINE) .components(Potassium, 1, Aluminium, 3, Silicon, 3, Fluorine, 2, Oxygen, 10) .buildAndRegister(); @@ -1025,19 +1022,13 @@ public static void register() { Alunite = new Material.Builder("alunite") .dust().ore(3, 1) - .color(0xE1B441).iconSet(METALLIC) + .color(0xfbd677).secondaryColor(0xe11e0a).iconSet(METALLIC) .components(Potassium, 1, Aluminium, 3, Silicon, 2, Hydrogen, 6, Oxygen, 14) .buildAndRegister(); - // Free ID 389 - - // Free ID 390 - - // Free ID 391 - Talc = new Material.Builder("talc") .dust().ore(2, 1) - .color(0x5AB45A).iconSet(FINE) + .color(0xebffe9).secondaryColor(0x6fe19b).iconSet(FINE) .components(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12) .buildAndRegister(); @@ -1066,7 +1057,7 @@ public static void register() { TungstenCarbide = new Material.Builder("tungsten_carbide") .ingot(4).fluid() - .color(0x330066).iconSet(METALLIC) + .color(0x6b6478).secondaryColor(0x392e44).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FOIL, GENERATE_GEAR, GENERATE_SMALL_GEAR, GENERATE_FRAME, DECOMPOSITION_BY_CENTRIFUGING) .components(Tungsten, 1, Carbon, 1) .toolStats(ToolProperty.Builder.of(60.0F, 2.0F, 1024, 4) @@ -1128,7 +1119,7 @@ public static void register() { SulfurDioxide = new Material.Builder("sulfur_dioxide") .gas() - .color(0xC8C819) + .color(0x0E4880) .components(Sulfur, 1, Oxygen, 2) .buildAndRegister(); @@ -1146,7 +1137,7 @@ public static void register() { Ammonia = new Material.Builder("ammonia") .gas() - .color(0x3F3480) + .color(0x4465a2).secondaryColor(0x3F3480) .components(Nitrogen, 1, Hydrogen, 3) .buildAndRegister(); @@ -1206,7 +1197,7 @@ public static void register() { PotassiumFeldspar = new Material.Builder("potassium_feldspar") .dust(1) - .color(0x782828).iconSet(FINE) + .color(0xffe3bc).secondaryColor(0xd4918a).iconSet(FINE) .components(Potassium, 1, Aluminium, 1, Silicon, 1, Oxygen, 8) .buildAndRegister(); @@ -1228,6 +1219,7 @@ public static void register() { Steam = new Material.Builder("steam") .fluid(FluidStorageKeys.GAS, new FluidBuilder() + .state(FluidState.GAS) .temperature(373) .customStill()) .flags(DISABLE_DECOMPOSITION) @@ -1262,7 +1254,7 @@ public static void register() { ManganesePhosphide = new Material.Builder("manganese_phosphide") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1368)) - .color(0xE1B454).iconSet(METALLIC) + .color(0xE1B454).secondaryColor(0x223033).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Manganese, 1, Phosphorus, 1) .cableProperties(GTValues.V[GTValues.LV], 2, 0, true, 78) @@ -1272,7 +1264,7 @@ public static void register() { MagnesiumDiboride = new Material.Builder("magnesium_diboride") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1103)) - .color(0x331900).iconSet(METALLIC) + .color(0x603c1a).secondaryColor(0x423e39).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Magnesium, 1, Boron, 2) .cableProperties(GTValues.V[MV], 4, 0, true, 78) @@ -1282,7 +1274,7 @@ public static void register() { MercuryBariumCalciumCuprate = new Material.Builder("mercury_barium_calcium_cuprate") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1075)) - .color(0x555555).iconSet(SHINY) + .color(0x777777).secondaryColor(0x3f2e2e).iconSet(SHINY) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Mercury, 1, Barium, 2, Calcium, 2, Copper, 3, Oxygen, 8) .cableProperties(GTValues.V[HV], 4, 0, true, 78) @@ -1292,7 +1284,7 @@ public static void register() { UraniumTriplatinum = new Material.Builder("uranium_triplatinum") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1882)) - .color(0x008700).iconSet(SHINY) + .color(0x457045).secondaryColor(0x66ff00).iconSet(SHINY) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Uranium238, 1, Platinum, 3) .cableProperties(GTValues.V[GTValues.EV], 6, 0, true, 30) @@ -1303,7 +1295,7 @@ public static void register() { SamariumIronArsenicOxide = new Material.Builder("samarium_iron_arsenic_oxide") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1347)) - .color(0x330033).iconSet(SHINY) + .color(0x850e85).secondaryColor(0x332f33).iconSet(SHINY) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Samarium, 1, Iron, 1, Arsenic, 1, Oxygen, 1) .cableProperties(GTValues.V[GTValues.IV], 6, 0, true, 30) @@ -1313,7 +1305,7 @@ public static void register() { IndiumTinBariumTitaniumCuprate = new Material.Builder("indium_tin_barium_titanium_cuprate") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1012)) - .color(0x994C00).iconSet(METALLIC) + .color(0x686760).secondaryColor(0x673300).iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING, GENERATE_FINE_WIRE) .components(Indium, 4, Tin, 2, Barium, 2, Titanium, 1, Copper, 7, Oxygen, 14) .cableProperties(GTValues.V[GTValues.LuV], 8, 0, true, 5) @@ -1334,7 +1326,7 @@ public static void register() { EnrichedNaquadahTriniumEuropiumDuranide = new Material.Builder("enriched_naquadah_trinium_europium_duranide") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(5930)) - .color(0x7D9673).iconSet(METALLIC) + .color(0xc5c1a4).secondaryColor(0x2b0645).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, GENERATE_FINE_WIRE) .components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1) .cableProperties(GTValues.V[GTValues.UV], 16, 0, true, 3) @@ -1353,7 +1345,7 @@ public static void register() { InertMetalMixture = new Material.Builder("inert_metal_mixture") .dust() - .color(0xE2AE72).iconSet(METALLIC) + .color(0x2b0645).secondaryColor(0x6a1600).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Rhodium, 1, Ruthenium, 1, Oxygen, 4) .buildAndRegister(); @@ -1374,14 +1366,14 @@ public static void register() { OsmiumTetroxide = new Material.Builder("osmium_tetroxide") .dust() - .color(0xACAD71).iconSet(METALLIC) + .color(0xACAD71).secondaryColor(0x291f34).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Osmium, 1, Oxygen, 4) .buildAndRegister(); IridiumChloride = new Material.Builder("iridium_chloride") .dust() - .color(0x013220).iconSet(METALLIC) + .color(0x373c09).secondaryColor(0x012213).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Chlorine, 3) .buildAndRegister(); @@ -1393,33 +1385,33 @@ public static void register() { TitaniumTrifluoride = new Material.Builder("titanium_trifluoride") .dust() - .color(0x8F00FF).iconSet(SHINY) + .color(0x8F00FF).secondaryColor(0x341465).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Titanium, 1, Fluorine, 3) .buildAndRegister(); CalciumPhosphide = new Material.Builder("calcium_phosphide") .dust() - .color(0xA52A2A).iconSet(METALLIC) + .color(0xFFF5DE).secondaryColor(0xf6baba).iconSet(METALLIC) .components(Calcium, 1, Phosphorus, 1) .buildAndRegister(); IndiumPhosphide = new Material.Builder("indium_phosphide") .dust() - .color(0x582E5C).iconSet(SHINY) + .color(0x734d77).secondaryColor(0x2c272d).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Indium, 1, Phosphorus, 1) .buildAndRegister(); BariumSulfide = new Material.Builder("barium_sulfide") .dust() - .color(0xF0EAD6).iconSet(METALLIC) + .color(0x80784a).secondaryColor(0x2c333b).iconSet(METALLIC) .components(Barium, 1, Sulfur, 1) .buildAndRegister(); TriniumSulfide = new Material.Builder("trinium_sulfide") .dust() - .color(0xE68066).iconSet(SHINY) + .color(0xE68066).secondaryColor(0x6f143a).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Trinium, 1, Sulfur, 1) .buildAndRegister(); @@ -1432,34 +1424,34 @@ public static void register() { GalliumSulfide = new Material.Builder("gallium_sulfide") .dust() - .color(0xFFF59E).iconSet(SHINY) + .color(0xffee5d).secondaryColor(0xedf008).iconSet(SHINY) .components(Gallium, 1, Sulfur, 1) .buildAndRegister(); AntimonyTrifluoride = new Material.Builder("antimony_trifluoride") .dust() - .color(0xF7EABC).iconSet(METALLIC) + .color(0xfffbef).secondaryColor(0xF7EABC).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Antimony, 1, Fluorine, 3) .buildAndRegister(); EnrichedNaquadahSulfate = new Material.Builder("enriched_naquadah_sulfate") .dust() - .color(0x2E2E1C).iconSet(METALLIC) + .color(0xff8023).secondaryColor(0x044610).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(NaquadahEnriched, 1, Sulfur, 1, Oxygen, 4) .buildAndRegister(); NaquadriaSulfate = new Material.Builder("naquadria_sulfate") .dust() - .color(0x006633).iconSet(SHINY) + .color(0x85ff5a).secondaryColor(0x006633).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Naquadria, 1, Sulfur, 1, Oxygen, 4) .buildAndRegister(); Pyrochlore = new Material.Builder("pyrochlore") .dust().ore() - .color(0x2B1100).iconSet(METALLIC) + .color(0x5b4838).secondaryColor(0x331400).iconSet(METALLIC) .flags() .components(Calcium, 2, Niobium, 2, Oxygen, 7) .buildAndRegister(); diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java index c7863f825f..dad7b44a53 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/HigherDegreeMaterials.java @@ -17,7 +17,7 @@ public static void register() { Electrotine = new Material.Builder("electrotine") .dust().ore(5, 1, true) - .color(0x3CB4C8).iconSet(SHINY) + .color(0x83cbf5).secondaryColor(0x004585).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Redstone, 1, Electrum, 1) .buildAndRegister(); @@ -36,7 +36,7 @@ public static void register() { RedSteel = new Material.Builder("red_steel") .ingot(3).fluid() - .color(0x8C6464).iconSet(METALLIC) + .color(0xa09191).secondaryColor(0x500404).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_GEAR) .components(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(7.0F, 6.0F, 2560, 3) @@ -46,7 +46,7 @@ public static void register() { BlueSteel = new Material.Builder("blue_steel") .ingot(3).fluid() - .color(0x64648C).iconSet(METALLIC) + .color(0xa5bdda).secondaryColor(0x24245f).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR) .components(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4) .toolStats(ToolProperty.Builder.of(15.0F, 6.0F, 1024, 3) @@ -56,7 +56,7 @@ public static void register() { Basalt = new Material.Builder("basalt") .dust(1) - .color(0x3C3232).iconSet(ROUGH) + .color(0x5c5c5c).secondaryColor(0x1b2632).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Olivine, 1, Calcite, 3, Flint, 8, DarkAsh, 4) .buildAndRegister(); @@ -70,7 +70,7 @@ public static void register() { Redrock = new Material.Builder("redrock") .dust(1) - .color(0xFF5032).iconSet(ROUGH) + .color(0xffa49e).secondaryColor(0x52362a).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Calcite, 2, Flint, 1) .buildAndRegister(); @@ -84,7 +84,7 @@ public static void register() { HSSG = new Material.Builder("hssg") .ingot(3).fluid() - .color(0x999900).iconSet(METALLIC) + .color(0x9cbabe).secondaryColor(0x032550).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_SPRING, GENERATE_FINE_WIRE, GENERATE_FOIL, GENERATE_GEAR) .components(TungstenSteel, 5, Chromium, 1, Molybdenum, 2, Vanadium, 1) .rotorStats(10.0f, 5.5f, 4000) @@ -95,7 +95,7 @@ public static void register() { RedAlloy = new Material.Builder("red_alloy") .ingot(0) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1400)) - .color(0xC80000) + .color(0xc55252).secondaryColor(0xC80000) .appendFlags(STD_METAL, GENERATE_FINE_WIRE, GENERATE_BOLT_SCREW, DISABLE_DECOMPOSITION) .components(Copper, 1, Redstone, 4) .cableProperties(GTValues.V[0], 1, 0) @@ -110,7 +110,7 @@ public static void register() { HSSE = new Material.Builder("hsse") .ingot(4).fluid() - .color(0x336600).iconSet(METALLIC) + .color(0x9d9cbe).secondaryColor(0x2b0350).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FRAME, GENERATE_RING) .components(HSSG, 6, Cobalt, 1, Manganese, 1, Silicon, 1) .toolStats(ToolProperty.Builder.of(5.0F, 10.0F, 3072, 4) @@ -121,7 +121,7 @@ public static void register() { HSSS = new Material.Builder("hsss") .ingot(4).fluid() - .color(0x660033).iconSet(METALLIC) + .color(0xae9abe).secondaryColor(0x66000e).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_ROTOR, GENERATE_ROUND, GENERATE_FOIL, GENERATE_GEAR) .components(HSSG, 6, Iridium, 2, Osmium, 1) .rotorStats(15.0f, 7.0f, 3000) @@ -132,34 +132,35 @@ public static void register() { IridiumMetalResidue = new Material.Builder("iridium_metal_residue") .dust() - .color(0x5C5D68).iconSet(METALLIC) + .color(0x5C5D68).secondaryColor(0x462941).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Chlorine, 3, PlatinumSludgeResidue, 1) .buildAndRegister(); Granite = new Material.Builder("granite") .dust() - .color(0xCFA18C).iconSet(ROUGH) + .color(0xd69077).secondaryColor(0x71352c).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 4, Redrock, 1) .buildAndRegister(); Brick = new Material.Builder("brick") .dust() - .color(0x9B5643).iconSet(ROUGH) + .color(0xc76245).secondaryColor(0x2d1610).iconSet(ROUGH) .flags(EXCLUDE_BLOCK_CRAFTING_RECIPES, NO_SMELTING, DECOMPOSITION_BY_CENTRIFUGING) .components(Clay, 1) .buildAndRegister(); Fireclay = new Material.Builder("fireclay") .dust() - .color(0xADA09B).iconSet(ROUGH) + .color(0xffeab6).secondaryColor(0x84581c).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING, NO_SMELTING) .components(Clay, 1, Brick, 1) .buildAndRegister(); Diorite = new Material.Builder("diorite") .dust() + .color(0xe9e9e9).secondaryColor(0x7b7b7b) .iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Mirabilite, 2, Clay, 7) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java index 56fbe61511..ddd1df9906 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java @@ -19,7 +19,7 @@ public static void register() { SiliconeRubber = new Material.Builder("silicone_rubber") .polymer() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(900)) - .color(0xDCDCDC) + .color(0xF0F0F0).secondaryColor(0xE8E8E0) .flags(GENERATE_GEAR, GENERATE_RING, GENERATE_FOIL) .components(Carbon, 2, Hydrogen, 6, Oxygen, 1, Silicon, 1) .buildAndRegister(); @@ -33,13 +33,13 @@ public static void register() { RawRubber = new Material.Builder("raw_rubber") .polymer() - .color(0xCCC789) + .color(0x54503D).secondaryColor(0x54403D) .components(Carbon, 5, Hydrogen, 8) .buildAndRegister(); RawStyreneButadieneRubber = new Material.Builder("raw_styrene_butadiene_rubber") .dust() - .color(0x54403D).iconSet(SHINY) + .color(0x54403D).secondaryColor(0x241520).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION, FLAMMABLE) .components(Carbon, 20, Hydrogen, 26) .buildAndRegister() @@ -48,7 +48,7 @@ public static void register() { StyreneButadieneRubber = new Material.Builder("styrene_butadiene_rubber") .polymer() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1000)) - .color(0x211A18).iconSet(SHINY) + .color(0x34312b).secondaryColor(0x110B09).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_RING) .components(Carbon, 20, Hydrogen, 26) .buildAndRegister() @@ -72,7 +72,7 @@ public static void register() { PolyvinylChloride = new Material.Builder("polyvinyl_chloride") .polymer() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(373)) - .color(0xD7E6E6) + .color(0xFF9955) .appendFlags(EXT_METAL, GENERATE_FOIL) .components(Carbon, 2, Hydrogen, 3, Chlorine, 1) .itemPipeProperties(512, 4) @@ -147,7 +147,7 @@ public static void register() { Sugar = new Material.Builder("sugar") .gem(1) - .color(0xFAFAFA).iconSet(FINE) + .color(0xFFFFFF).secondaryColor(0x545468).iconSet(FINE) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 12, Oxygen, 6) .buildAndRegister(); @@ -485,7 +485,7 @@ public static void register() { Rubber = new Material.Builder("rubber") .polymer(0) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(400)) - .color(0x000000).iconSet(SHINY) + .color(0x353529).secondaryColor(0x080808).iconSet(SHINY) .toolStats(ToolProperty.Builder.of(1.0F, 1.0F, 128, 1, GTToolType.SOFT_MALLET).build()) .flags(GENERATE_GEAR, GENERATE_RING, GENERATE_FOIL, GENERATE_BOLT_SCREW) .components(Carbon, 5, Hydrogen, 8) @@ -533,5 +533,21 @@ public static void register() { .flags(GENERATE_PLATE, DISABLE_DECOMPOSITION, NO_SMASHING) .components(Butyraldehyde, 1, PolyvinylAcetate, 1) .buildAndRegister(); + + Biphenyl = new Material.Builder("biphenyl") + .dust() + .color(0x8B8C4F).iconSet(FINE) + .flags(DISABLE_DECOMPOSITION) + .components(Carbon, 12, Hydrogen, 10) + .buildAndRegister() + .setFormula("(C6H5)2", true); + + PolychlorinatedBiphenyl = new Material.Builder("polychlorinated_biphenyl") + .fluid() + .color(0xCACC0E) + .flags(DISABLE_DECOMPOSITION) + .components(Carbon, 12, Hydrogen, 8, Chlorine, 2) + .buildAndRegister() + .setFormula("(C6H4Cl)2", true); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java index 5a94594cf4..393c5bac99 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java @@ -37,7 +37,7 @@ public static void register() { Borax = new Material.Builder("borax") .dust(1) - .color(0xFAFAFA).iconSet(FINE) + .color(0xFAFAFA).secondaryColor(0xd7e7e7).iconSet(FINE) .components(Sodium, 2, Boron, 4, Water, 10, Oxygen, 7) .buildAndRegister(); @@ -82,7 +82,7 @@ public static void register() { .fluid(FluidStorageKeys.LIQUID, new FluidBuilder() .temperature(4000) .customStill()) - .color(0xFFC800, false).iconSet(FINE) + .color(0xfff94d, false).secondaryColor(0xff330c).iconSet(FINE) .flags(NO_SMELTING, MORTAR_GRINDABLE, DECOMPOSITION_BY_CENTRIFUGING) //todo burning flag .components(DarkAsh, 1, Sulfur, 1) .buildAndRegister(); @@ -98,7 +98,7 @@ public static void register() { BlackSteel = new Material.Builder("black_steel") .ingot().fluid() - .color(0x646464).iconSet(METALLIC) + .color(0x666666).secondaryColor(0x1a120e).iconSet(METALLIC) .appendFlags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_FRAME) .components(Nickel, 1, BlackBronze, 1, Steel, 3) .cableProperties(GTValues.V[4], 3, 2) @@ -107,7 +107,7 @@ public static void register() { DamascusSteel = new Material.Builder("damascus_steel") .ingot(3).fluid() - .color(0x6E6E6E).iconSet(METALLIC) + .color(0x6E6E6E).secondaryColor(0x302222).iconSet(METALLIC) .appendFlags(EXT_METAL) .components(Steel, 1) .toolStats(ToolProperty.Builder.of(6.0F, 4.0F, 1024, 3) @@ -120,7 +120,7 @@ public static void register() { TungstenSteel = new Material.Builder("tungsten_steel") .ingot(4).fluid() - .color(0x6464A0).iconSet(METALLIC) + .color(0xadb8df).secondaryColor(0x03192f).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_DENSE, GENERATE_FRAME, GENERATE_SPRING, GENERATE_FOIL, GENERATE_FINE_WIRE, GENERATE_GEAR) .components(Steel, 1, Tungsten, 1) .toolStats(ToolProperty.Builder.of(9.0F, 7.0F, 2048, 4) @@ -134,7 +134,7 @@ public static void register() { CobaltBrass = new Material.Builder("cobalt_brass") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1202)) - .color(0xB4B4A0).iconSet(METALLIC) + .color(0xbbac82).secondaryColor(0x596338).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_GEAR) .components(Brass, 7, Aluminium, 1, Cobalt, 1) .toolStats(ToolProperty.Builder.of(2.5F, 2.0F, 1024, 2) @@ -167,14 +167,14 @@ public static void register() { Marble = new Material.Builder("marble") .dust() - .color(0xC8C8C8).iconSet(ROUGH) + .color(0xf0f5f4).secondaryColor(0xb3b3b3).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Magnesium, 1, Calcite, 7) .buildAndRegister(); Deepslate = new Material.Builder("deepslate") .dust() - .color(0x0A0A0A).iconSet(ROUGH) + .color(0x797979).secondaryColor(0x2f2f37).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 4, Biotite, 1) .buildAndRegister(); @@ -190,7 +190,7 @@ public static void register() { VanadiumMagnetite = new Material.Builder("vanadium_magnetite") .dust().ore() - .color(0x23233C).iconSet(METALLIC) + .color(0x8a94a2).secondaryColor(0x170322).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Magnetite, 1, Vanadium, 1) .buildAndRegister(); @@ -212,14 +212,14 @@ public static void register() { Bentonite = new Material.Builder("bentonite") .dust().ore(3, 1) - .color(0xF5D7D2).iconSet(ROUGH) + .color(0xede8a3).secondaryColor(0xcdb44c).iconSet(ROUGH) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Magnesium, 6, Silicon, 12, Hydrogen, 4, Water, 5, Oxygen, 36) .buildAndRegister(); FullersEarth = new Material.Builder("fullers_earth") .dust().ore(2, 1) - .color(0xA0A078).iconSet(FINE) + .color(0xf3efbb).secondaryColor(0xb8d066).iconSet(FINE) .components(Magnesium, 1, Silicon, 4, Hydrogen, 1, Water, 4, Oxygen, 11) .buildAndRegister(); @@ -246,7 +246,7 @@ public static void register() { Trona = new Material.Builder("trona") .dust(1).ore(2, 1) - .color(0x87875F).iconSet(METALLIC) + .color(0xe7e7b4).secondaryColor(0x87875F).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 3, Carbon, 2, Hydrogen, 1, Water, 2, Oxygen, 6) .buildAndRegister(); @@ -267,14 +267,14 @@ public static void register() { Concrete = new Material.Builder("concrete") .dust() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(286)) - .color(0x646464).iconSet(ROUGH) + .color(0xfaf3e8).secondaryColor(0xbbbaba).iconSet(ROUGH) .flags(NO_SMASHING, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES) .components(Stone, 1) .buildAndRegister(); SteelMagnetic = new Material.Builder("magnetic_steel") .ingot() - .color(0x808080).iconSet(MAGNETIC) + .color(0xa7a7a7).secondaryColor(0x121c37).iconSet(MAGNETIC) .flags(GENERATE_ROD, IS_MAGNETIC) .components(Steel, 1) .ingotSmeltInto(Steel) @@ -286,7 +286,7 @@ public static void register() { VanadiumSteel = new Material.Builder("vanadium_steel") .ingot(3) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(2073)) - .color(0xc0c0c0).iconSet(METALLIC) + .color(0xd4d1f1).secondaryColor(0x19140d).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_FOIL, GENERATE_GEAR) .components(Vanadium, 1, Chromium, 1, Steel, 7) .toolStats(ToolProperty.Builder.of(3.0F, 3.0F, 1536, 3) @@ -299,7 +299,7 @@ public static void register() { Potin = new Material.Builder("potin") .ingot() .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1084)) - .color(0xc99781).iconSet(METALLIC) + .color(0xaaada3).secondaryColor(0x5e3320).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_GEAR) .components(Copper, 6, Tin, 2, Lead, 1) .fluidPipeProperties(1456, 32, true) @@ -308,25 +308,21 @@ public static void register() { BorosilicateGlass = new Material.Builder("borosilicate_glass") .ingot(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(1921)) - .color(0xE6F3E6).iconSet(SHINY) + .color(0xFAFAFA).secondaryColor(0xfaf5c0).iconSet(SHINY) .flags(GENERATE_FINE_WIRE, GENERATE_PLATE) .components(Boron, 1, SiliconDioxide, 7) .buildAndRegister(); Andesite = new Material.Builder("andesite") .dust() - .color(0xBEBEBE).iconSet(ROUGH) + .color(0xa8aa9a).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Asbestos, 4, Saltpeter, 1) .buildAndRegister(); - // FREE ID 2040 - - // FREE ID 2041 - NaquadahAlloy = new Material.Builder("naquadah_alloy") .ingot(5).fluid() - .color(0x282828).iconSet(METALLIC) + .color(0x323232).secondaryColor(0x301131).iconSet(METALLIC) .appendFlags(EXT2_METAL, GENERATE_SPRING, GENERATE_RING, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_DENSE, GENERATE_FOIL, GENERATE_GEAR) .components(Naquadah, 2, Osmiridium, 1, Trinium, 1) .toolStats(ToolProperty.Builder.of(40.0F, 12.0F, 3072, 5) @@ -444,35 +440,35 @@ public static void register() { PalladiumRaw = new Material.Builder("palladium_raw") .dust() - .color(Palladium.getMaterialARGB()).iconSet(METALLIC) + .color(0x5d4e1a).secondaryColor(0x33352d).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Palladium, 1, Ammonia, 1) .buildAndRegister(); RarestMetalMixture = new Material.Builder("rarest_metal_mixture") .dust() - .color(0x832E11).iconSet(SHINY) + .color(0xca8832).secondaryColor(0xb21900).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Osmium, 1, Oxygen, 4, Water, 1) .buildAndRegister(); AmmoniumChloride = new Material.Builder("ammonium_chloride") .dust() - .color(0x9711A6) + .color(0x60a1c5).secondaryColor(0x48619c) .components(Ammonia, 1, HydrochloricAcid, 1) .buildAndRegister() .setFormula("NH4Cl", true); AcidicOsmiumSolution = new Material.Builder("acidic_osmium_solution") .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().attribute(FluidAttributes.ACID)) - .color(0xA3AA8A) + .color(0xDAC5C5) .flags(DISABLE_DECOMPOSITION) .components(Osmium, 1, Oxygen, 4, Water, 1, HydrochloricAcid, 1) .buildAndRegister(); RhodiumPlatedPalladium = new Material.Builder("rhodium_plated_palladium") .ingot().fluid() - .color(0xDAC5C5).iconSet(SHINY) + .color(0xd1d1d1).secondaryColor(0x000000).iconSet(SHINY) .appendFlags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR) .components(Palladium, 3, Rhodium, 1) .rotorStats(12.0f, 3.0f, 1024) @@ -481,7 +477,7 @@ public static void register() { Clay = new Material.Builder("clay") .dust(1) - .color(0xC8C8DC).iconSet(ROUGH) + .color(0xbec9e8).secondaryColor(0x373944).iconSet(ROUGH) .flags(MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES) .components(Sodium, 2, Lithium, 1, Aluminium, 2, Silicon, 2, Water, 6) .buildAndRegister(); @@ -489,7 +485,7 @@ public static void register() { Redstone = new Material.Builder("redstone") .dust().ore(5, 1, true) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(500)) - .color(0xC80000).iconSet(ROUGH) + .color(0xff0000).secondaryColor(0x340605).iconSet(ROUGH) .flags(GENERATE_PLATE, NO_SMASHING, NO_SMELTING, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, EXCLUDE_PLATE_COMPRESSOR_RECIPE, DECOMPOSITION_BY_CENTRIFUGING) .components(Silicon, 1, Pyrite, 5, Ruby, 1, Mercury, 3) diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java index b10b4c8162..41db08f40d 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java @@ -16,13 +16,18 @@ public class UnknownCompositionMaterials { public static void register() { WoodGas = new Material.Builder("wood_gas") - .gas().color(0xDECD87).buildAndRegister(); + .gas() + .color(0xDECD87).secondaryColor(0xdeb287) + .buildAndRegister(); WoodVinegar = new Material.Builder("wood_vinegar") - .fluid().color(0xD45500).buildAndRegister(); + .fluid() + .color(0xD45500).secondaryColor(0x905800) + .buildAndRegister(); WoodTar = new Material.Builder("wood_tar") - .fluid().color(0x28170B) + .fluid() + .color(0x3a271a).secondaryColor(0x28170B) .flags(STICKY, FLAMMABLE).buildAndRegister(); CharcoalByproducts = new Material.Builder("charcoal_byproducts") @@ -331,7 +336,7 @@ public static void register() { Gunpowder = new Material.Builder("gunpowder") .dust(0) - .color(0x808080).iconSet(ROUGH) + .color(0xa4a4a4).secondaryColor(0x767676).iconSet(ROUGH) .flags(FLAMMABLE, EXPLOSIVE, NO_SMELTING, NO_SMASHING) .buildAndRegister(); @@ -343,12 +348,12 @@ public static void register() { RareEarth = new Material.Builder("rare_earth") .dust(0) - .color(0x808064).iconSet(FINE) + .color(0xffdc88).secondaryColor(0xe99673).iconSet(FINE) .buildAndRegister(); Stone = new Material.Builder("stone") .dust(2) - .color(0xCDCDCD).iconSet(ROUGH) + .color(0x8f8f8f).secondaryColor(0x898989).iconSet(ROUGH) .flags(MORTAR_GRINDABLE, GENERATE_GEAR, NO_SMASHING, NO_SMELTING) .buildAndRegister(); @@ -358,7 +363,7 @@ public static void register() { Glowstone = new Material.Builder("glowstone") .dust(1) .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(500)) - .color(0xFFFF00).iconSet(SHINY) + .color(0xfcb34c).secondaryColor(0xce7533).iconSet(SHINY) .flags(NO_SMASHING, GENERATE_PLATE, EXCLUDE_PLATE_COMPRESSOR_RECIPE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES) .buildAndRegister(); @@ -388,34 +393,34 @@ public static void register() { Collagen = new Material.Builder("collagen") .dust(1) - .color(0x80471C).iconSet(ROUGH) + .color(0xffadb7).secondaryColor(0x80471C).iconSet(ROUGH) .buildAndRegister(); Gelatin = new Material.Builder("gelatin") .dust(1) - .color(0x588BAE).iconSet(ROUGH) + .color(0xfaf7cb).secondaryColor(0x693d00).iconSet(ROUGH) .buildAndRegister(); Agar = new Material.Builder("agar") .dust(1) - .color(0x4F7942).iconSet(ROUGH) + .color(0xbdd168).secondaryColor(0x403218).iconSet(ROUGH) .buildAndRegister(); Milk = new Material.Builder("milk") .fluid(FluidStorageKeys.LIQUID, new FluidBuilder() .temperature(295) .customStill()) - .color(0xFEFEFE).iconSet(FINE) + .color(0xfffbf0).secondaryColor(0xf6eac8).iconSet(FINE) .buildAndRegister(); Cocoa = new Material.Builder("cocoa") .dust(0) - .color(0x643200).iconSet(FINE) + .color(0x976746).secondaryColor(0x301a0a).iconSet(FINE) .buildAndRegister(); Wheat = new Material.Builder("wheat") .dust(0) - .color(0xFFFFC4).iconSet(FINE) + .color(0xdcbb65).secondaryColor(0x565138).iconSet(FINE) .buildAndRegister(); Meat = new Material.Builder("meat") @@ -425,7 +430,7 @@ public static void register() { Wood = new Material.Builder("wood") .wood() - .color(0x643200).iconSet(WOOD) + .color(0xfcfcf2).secondaryColor(0x643200).iconSet(WOOD) .fluidPipeProperties(340, 5, false) .toolStats(ToolProperty.Builder.of(1.0F, 1.0F, 128, 1, GTToolType.SOFT_MALLET).build()) .flags(GENERATE_PLATE, GENERATE_ROD, GENERATE_BOLT_SCREW, GENERATE_LONG_ROD, FLAMMABLE, GENERATE_GEAR, GENERATE_FRAME) @@ -433,7 +438,7 @@ public static void register() { Paper = new Material.Builder("paper") .dust(0) - .color(0xFAFAFA).iconSet(FINE) + .color(0xFAFAFA).secondaryColor(0x878787).iconSet(FINE) .flags(GENERATE_PLATE, FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE, EXCLUDE_PLATE_COMPRESSOR_RECIPE) .buildAndRegister(); @@ -536,7 +541,7 @@ public static void register() { TreatedWood = new Material.Builder("treated_wood") .wood() - .color(0x502800).iconSet(WOOD) + .color(0x644218).secondaryColor(0x4e0b00).iconSet(WOOD) .fluidPipeProperties(340, 10, false) .flags(GENERATE_PLATE, FLAMMABLE, GENERATE_ROD, GENERATE_FRAME) .buildAndRegister(); @@ -546,5 +551,8 @@ public static void register() { .temperature(300) .customStill()) .buildAndRegister(); + + PCBCoolant = new Material.Builder("pcb_coolant") + .fluid().color(0xD5D69C).buildAndRegister(); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java b/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java index 6a5d8bfd20..0c8dc42ea8 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java @@ -7,6 +7,7 @@ import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.ICleanroomReceiver; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; +import com.gregtechceu.gtceu.common.machine.multiblock.part.DiodePartMachine; import com.gregtechceu.gtceu.common.machine.trait.CleanroomLogic; import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; @@ -157,6 +158,7 @@ protected void initializeAbilities() { List energyContainers = new ArrayList<>(); Map ioMap = getMultiblockState().getMatchContext().getOrCreate("ioMap", Long2ObjectMaps::emptyMap); for (IMultiPart part : getParts()) { + if (part instanceof DiodePartMachine) continue; IO io = ioMap.getOrDefault(part.self().getPos().asLong(), IO.BOTH); if(io == IO.NONE || io == IO.OUT) continue; for (var handler : part.getRecipeHandlers()) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java b/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java index 3bb985b502..0da3d31e64 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java @@ -14,7 +14,6 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.util.ClickData; import com.lowdragmc.lowdraglib.gui.widget.ComponentPanelWidget; @@ -191,7 +190,7 @@ public static GTRecipe recipeModifier(MetaMachine machine, @Nonnull GTRecipe rec public void addDisplayText(List textList) { IDisplayUIMachine.super.addDisplayText(textList); if (isFormed()){ - textList.add(Component.translatable("gtceu.multiblock.large_boiler.temperature", (int) (currentTemperature * 274.15), (int) (maxTemperature * 274.15))); + textList.add(Component.translatable("gtceu.multiblock.large_boiler.temperature", (int) (currentTemperature + 274.15), (int) (maxTemperature + 274.15))); textList.add(Component.translatable("gtceu.multiblock.large_boiler.steam_output", currentTemperature)); var throttleText = Component.translatable("gtceu.multiblock.large_boiler.throttle", diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java b/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java index b3207d6ae5..8a2475314e 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java @@ -9,7 +9,10 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.TickableSubscription; import com.gregtechceu.gtceu.api.machine.TieredMachine; -import com.gregtechceu.gtceu.api.machine.feature.*; +import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputItem; +import com.gregtechceu.gtceu.api.machine.feature.IDropSaveMachine; +import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine; +import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.syncdata.RequireRerender; import com.lowdragmc.lowdraglib.gui.editor.Icons; @@ -74,7 +77,7 @@ public class QuantumChestMachine extends TieredMachine implements IAutoOutputIte protected ISubscription exportItemSubs; @Persisted @Getter @Setter private boolean isVoiding; - @Persisted @Getter + @Persisted @DescSynced @Getter private final ItemStackTransfer lockedItem; public QuantumChestMachine(IMachineBlockEntity holder, int tier, int maxStoredItems, Object... args) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java b/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java index 112348955c..23b3205f6a 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumTankMachine.java @@ -74,7 +74,7 @@ public class QuantumTankMachine extends TieredMachine implements IAutoOutputFlui protected FluidStack stored = FluidStack.empty(); @Persisted @Getter @Setter private boolean isVoiding; - @Persisted @Getter + @Persisted @DescSynced @Getter private final FluidStorage lockedFluid; public QuantumTankMachine(IMachineBlockEntity holder, int tier, long maxStoredFluids, Object... args) { diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java index 4e770f14e3..cf3471e587 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/Insulation.java @@ -9,6 +9,7 @@ import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import lombok.Getter; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; import java.util.function.Supplier; @@ -78,8 +79,11 @@ public ResourceLocation type() { } public PipeModel createPipeModel(Material material) { - Supplier wireTexturePath = () -> MaterialIconType.wire.getBlockTexturePath(material.getMaterialIconSet(), true); - PipeModel model = new PipeModel(thickness, isCable ? () -> GTCEu.id("block/cable/insulation_5") : wireTexturePath, wireTexturePath); + Supplier wireSideTexturePath = () -> MaterialIconType.wire.getBlockTexturePath(material.getMaterialIconSet(), true).withSuffix("_side"); + Supplier wireEndTexturePath = () -> MaterialIconType.wire.getBlockTexturePath(material.getMaterialIconSet(), true).withSuffix("_end"); + Supplier<@Nullable ResourceLocation> wireSideOverlayTexturePath = () -> MaterialIconType.wire.getBlockTexturePath(material.getMaterialIconSet(), "side_overlay", true); + Supplier<@Nullable ResourceLocation> wireEndOverlayTexturePath = () -> MaterialIconType.wire.getBlockTexturePath(material.getMaterialIconSet(), "end_overlay", true); + PipeModel model = new PipeModel(thickness, isCable ? () -> GTCEu.id("block/cable/insulation_5") : wireSideTexturePath, wireEndTexturePath, wireSideOverlayTexturePath, wireEndOverlayTexturePath); if (isCable) { model.setEndOverlayTexture(GTCEu.id("block/cable/insulation_%s".formatted(insulationLevel))); } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java index 2934e9e640..5823f41fed 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeNet.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.common.pipelike.fluidpipe; import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; +import com.gregtechceu.gtceu.api.misc.RateCounter; import com.lowdragmc.lowdraglib.pipelike.LevelPipeNet; import com.lowdragmc.lowdraglib.pipelike.PipeNet; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; @@ -8,11 +9,9 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.material.Fluid; -import org.apache.commons.lang3.mutable.MutableLong; import org.jetbrains.annotations.NotNull; import java.util.*; -import java.util.function.Consumer; import java.util.stream.Stream; /** @@ -25,7 +24,7 @@ public class FluidPipeNet extends PipeNet { private final Map> NET_DATA = new HashMap<>(); private final Long2ObjectMap channelFluidsByBlock = new Long2ObjectOpenHashMap<>(); - private final Long2ObjectMap throughputUsagesByBlock = new Long2ObjectOpenHashMap<>(); + private final Long2ObjectMap throughputsCountersByBlock = new Long2ObjectOpenHashMap<>(); private long lastUpdate; public FluidPipeNet(LevelPipeNet world) { @@ -38,7 +37,7 @@ public List getNetData(BlockPos pipePos) { if (data == null) { data = FluidPipeNetWalker.createNetData(this, pipePos); if (data == null) { - // walker failed, don't cache so it tries again on next insertion + // walker failed. don't cache, so it tries again on next insertion return Collections.emptyList(); } data.sort(Comparator.comparingInt(PipeNetRoutePath::getDistance)); @@ -67,13 +66,7 @@ public void onPipeConnectionsUpdate() { * @return The throughput over the last second */ public long getLastSecondTotalThroughput(BlockPos blockPos, int channel) { - MutableLong totalAmount = new MutableLong(0L); - - withLastSecondUsages(blockPos.asLong(), (used) -> { - totalAmount.add(used.channelAmounts[channel]); - }); - - return totalAmount.longValue(); + return getThroughputCounters(blockPos.asLong())[channel].getUsedSum(); } /** @@ -121,7 +114,7 @@ public int useChannel(BlockPos pos, Fluid fluid) { */ public void useThroughput(BlockPos pos, int channel, long amount) { updateTick(); - getCurrentTickUsage(pos.asLong()).channelAmounts[channel] += amount; + getThroughputCounters(pos.asLong())[channel].addUsed(amount); } public Fluid getFluid(BlockPos pos, int channel) { @@ -145,71 +138,23 @@ private void updateTick() { } - private static class ThroughputUsage { - public long tick = 0L; - public long[] channelAmounts = new long[FluidPipeProperties.MAX_PIPE_CHANNELS]; - - public ThroughputUsage() { - resetAmounts(); - } - - public ThroughputUsage(ThroughputUsage value) { - this.tick = value.tick; - this.channelAmounts = Arrays.copyOf(value.channelAmounts, value.channelAmounts.length); - } - - public void resetAmounts() { - Arrays.fill(channelAmounts, 0L); - } - } - @NotNull - private ThroughputUsage[] getThroughputUsages(long blockPos) { - return throughputUsagesByBlock.computeIfAbsent(blockPos, bp -> - Stream.generate(ThroughputUsage::new).limit(20).toArray(ThroughputUsage[]::new) + private RateCounter[] getThroughputCounters(long blockPos) { + return throughputsCountersByBlock.computeIfAbsent(blockPos, bp -> + Stream.generate(() -> new RateCounter(() -> getLevel().getGameTime(), 20)) + .limit(FluidPipeProperties.MAX_PIPE_CHANNELS) + .toArray(RateCounter[]::new) ); } - private ThroughputUsage getCurrentTickUsage(long blockPos) { - var currentTick = getLevel().getGameTime(); - var lastSecondThroughputs = getThroughputUsages(blockPos); - var currentThroughput = lastSecondThroughputs[(int) (currentTick % 20)]; - - if (currentThroughput.tick != currentTick) { - currentThroughput.tick = currentTick; - currentThroughput.resetAmounts(); - } - - return currentThroughput; - } - - private void withLastSecondUsages(long blockPos, Consumer consumer) { - var minTick = getLevel().getGameTime() - 19; - var lastSecondThroughputs = getThroughputUsages(blockPos); - - for (int i = 0; i < 20; i++) { - ThroughputUsage throughputUsage = lastSecondThroughputs[i]; - if (throughputUsage.tick < minTick) - continue; - - consumer.accept(throughputUsage); - } - } - private Fluid[] getChannelFluids(long blockPos) { return channelFluidsByBlock.computeIfAbsent(blockPos, bp -> new Fluid[FluidPipeProperties.MAX_PIPE_CHANNELS]); } private long[] getLastSecondTotalUsagePerChannel(long blockPos) { - var totalAmounts = new long[FluidPipeProperties.MAX_PIPE_CHANNELS]; - - withLastSecondUsages(blockPos, (used) -> { - for (int channel = 0; channel < FluidPipeProperties.MAX_PIPE_CHANNELS; channel++) { - totalAmounts[channel] += used.channelAmounts[channel]; - } - }); - - return totalAmounts; + return Arrays.stream(getThroughputCounters(blockPos)) + .mapToLong(RateCounter::getUsedSum) + .toArray(); } private int findBestFreeChannel(long pos) { @@ -261,27 +206,27 @@ protected FluidPipeData readNodeData(CompoundTag tagCompound) { } - public record Snapshot(Long2ObjectMap channelFluids, Long2ObjectMap throughputUsage) { + public record Snapshot(Long2ObjectMap channelFluids, Long2ObjectMap throughputCounters) { } public Snapshot createSnapshot() { Long2ObjectMap channelUsedCopied = new Long2ObjectOpenHashMap<>(); channelFluidsByBlock.forEach((k, v) -> channelUsedCopied.put(k.longValue(), Arrays.copyOf(v, v.length))); - Long2ObjectOpenHashMap throughputUsedCopied = new Long2ObjectOpenHashMap<>(); - throughputUsagesByBlock.forEach((k, v) -> throughputUsedCopied.put(k.longValue(), Arrays.stream(v) - .map(ThroughputUsage::new) - .toArray(ThroughputUsage[]::new) + Long2ObjectOpenHashMap throughputCountersCopied = new Long2ObjectOpenHashMap<>(); + throughputsCountersByBlock.forEach((k, v) -> throughputCountersCopied.put(k.longValue(), Arrays.stream(v) + .map(RateCounter::copy) + .toArray(RateCounter[]::new) )); - return new Snapshot(channelUsedCopied, throughputUsedCopied); + return new Snapshot(channelUsedCopied, throughputCountersCopied); } public void resetData(Snapshot snapshot) { channelFluidsByBlock.clear(); channelFluidsByBlock.putAll(snapshot.channelFluids); - throughputUsagesByBlock.clear(); - throughputUsagesByBlock.putAll(snapshot.throughputUsage); + throughputsCountersByBlock.clear(); + throughputsCountersByBlock.putAll(snapshot.throughputCounters); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java index 150a573524..112acd1aa6 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeType.java @@ -74,8 +74,9 @@ public ResourceLocation type() { public PipeModel createPipeModel(Material material) { if (material.hasProperty(PropertyKey.WOOD)) { - return new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side_wood"), () -> GTCEu.id("block/pipe/pipe_%s_in_wood".formatted(name))); + return new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side_wood"), () -> GTCEu.id("block/pipe/pipe_%s_in_wood".formatted(name)), null, null); } - return new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side"), () -> GTCEu.id("block/pipe/pipe_%s_in".formatted(name))); + return new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side"), () -> GTCEu.id("block/pipe/pipe_%s_in".formatted(name)), + null, null/*() -> GTCEu.id("block/pipe/pipe_side_secondary"), () -> GTCEu.id("block/pipe/pipe_%s_in_secondary".formatted(name)) TODO enable once the textures are added*/); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java index 1f596f31f3..b2ca4d4d9e 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java @@ -4,6 +4,7 @@ import com.gregtechceu.gtceu.api.capability.ICoverable; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.CoverBehavior; +import com.gregtechceu.gtceu.api.misc.RateCounter; import com.gregtechceu.gtceu.common.blockentity.ItemPipeBlockEntity; import com.gregtechceu.gtceu.common.cover.ConveyorCover; import com.gregtechceu.gtceu.common.cover.ItemFilterCover; @@ -34,7 +35,10 @@ public class ItemNetHandler implements IItemTransfer { private final Level world; private final Direction facing; private final Map simulatedTransfersGlobalRoundRobin = new HashMap<>(); - private int simulatedTransfers = 0; + + private final RateCounter simulatedCounter = new RateCounter(this::getLevelTime, 20); + private final RateCounter transferredCounter = new RateCounter(this::getLevelTime, 20); + private final ItemStackTransfer testHandler = new ItemStackTransfer(1); public ItemNetHandler(ItemPipeNet net, ItemPipeBlockEntity pipe, Direction facing) { @@ -44,12 +48,18 @@ public ItemNetHandler(ItemPipeNet net, ItemPipeBlockEntity pipe, Direction facin this.world = pipe.getPipeLevel(); } + private long getLevelTime() { + return net.getLevel().getGameTime(); + } + public void updateNetwork(ItemPipeNet net) { this.net = net; } private void copyTransferred() { - simulatedTransfers = pipe.getTransferredItems(); + simulatedCounter.clear(); + simulatedCounter.addUsed(transferredCounter.getUsedSum()); + simulatedTransfersGlobalRoundRobin.clear(); simulatedTransfersGlobalRoundRobin.putAll(pipe.getTransferred()); } @@ -390,17 +400,15 @@ public static int countStack(IItemTransfer handler, ItemStack stack, RobotArmCov private int checkTransferable(float rate, int amount, boolean simulate) { int max = (int) ((rate * 64) + 0.5); - if (simulate) - return Math.max(0, Math.min(max - simulatedTransfers, amount)); - else - return Math.max(0, Math.min(max - pipe.getTransferredItems(), amount)); + RateCounter rateCounter = simulate ? simulatedCounter : transferredCounter; + + return Math.max(0, Math.min(max - (int) rateCounter.getUsedSum(), amount)); } private void transfer(boolean simulate, int amount) { - if (simulate) - simulatedTransfers += amount; - else - pipe.transferItems(amount); + RateCounter rateCounter = simulate ? simulatedCounter : transferredCounter; + + rateCounter.addUsed(amount); } @Override diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java index 4c4f1717ba..b4a8e98207 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeType.java @@ -73,9 +73,10 @@ public ResourceLocation type() { public PipeModel createPipeModel(Material material) { PipeModel model; if (material.hasProperty(PropertyKey.WOOD)) { - model = new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side_wood"), () -> GTCEu.id("block/pipe/pipe_%s_in_wood".formatted(this.isRestrictive() ? values()[this.ordinal() - 4].name : name))); + model = new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side_wood"), () -> GTCEu.id("block/pipe/pipe_%s_in_wood".formatted(this.isRestrictive() ? values()[this.ordinal() - 4].name : name)), null, null); } else { - model = new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side"), () -> GTCEu.id("block/pipe/pipe_%s_in".formatted(this.isRestrictive() ? values()[this.ordinal() - 4].name : name))); + model = new PipeModel(thickness, () -> GTCEu.id("block/pipe/pipe_side"), () -> GTCEu.id("block/pipe/pipe_%s_in".formatted(this.isRestrictive() ? values()[this.ordinal() - 4].name : name)), + null, null/*() -> GTCEu.id("block/pipe/pipe_side_secondary"), () -> GTCEu.id("block/pipe/pipe_%s_in_secondary".formatted(this.isRestrictive() ? values()[this.ordinal() - 4].name : name)) TODO enable once the textures are added*/); } if (isRestrictive()) { model.setSideOverlayTexture(GTCEu.id("block/pipe/pipe_restrictive")); diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserPipeType.java b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserPipeType.java index b41fdab78f..a13604b1f7 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserPipeType.java +++ b/common/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserPipeType.java @@ -3,8 +3,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.pipenet.IPipeType; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.StringRepresentable; -public enum LaserPipeType implements IPipeType { +import java.util.Locale; + +public enum LaserPipeType implements IPipeType, StringRepresentable { NORMAL; public static final ResourceLocation TYPE_ID = GTCEu.id("laser"); @@ -28,4 +31,9 @@ public boolean isPaintable() { public ResourceLocation type() { return TYPE_ID; } + + @Override + public String getSerializedName() { + return name().toLowerCase(Locale.ROOT); + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java b/common/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java index 2ce69bb251..91b02e99ba 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java +++ b/common/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java @@ -301,5 +301,8 @@ public static class DeveloperConfigs { @Configurable @Configurable.Comment({"Dump all registered GT recipes?", "Default: false"}) public boolean dumpRecipes = false; + @Configurable + @Configurable.Comment({"Dump all registered GT models/blockstates/etc?", "Default: false"}) + public boolean dumpAssets = false; } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java b/common/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java index 1631f88406..e4c827eb01 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java +++ b/common/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java @@ -10,10 +10,15 @@ import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.gregtechceu.gtceu.client.renderer.block.MaterialBlockRenderer; +import com.gregtechceu.gtceu.client.renderer.item.TagPrefixItemRenderer; +import com.gregtechceu.gtceu.client.renderer.item.ToolItemRenderer; +import com.gregtechceu.gtceu.common.data.GTModels; import com.gregtechceu.gtceu.common.data.GTRecipes; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.core.mixins.BlockBehaviourAccessor; import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; +import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.tterrag.registrate.util.entry.BlockEntry; import dev.architectury.injectables.annotations.ExpectPlatform; @@ -28,10 +33,9 @@ import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.function.Consumer; +import java.util.function.Supplier; import java.util.stream.Collectors; public class MixinHelpers { @@ -78,7 +82,7 @@ public static void addFluidTexture(Material material, FluidStorage.FluidEntry va throw new AssertionError(); } - public static List addDynamicData(Collection packs) { + public static List addDynamicDataPack(Collection packs) { List packResources = new ArrayList<>(packs); // Clear old data GTDynamicDataPack.clearServer(); @@ -93,4 +97,28 @@ public static List addDynamicData(Collection packs packResources.add(new GTDynamicDataPack("gtceu:dynamic_data", AddonFinder.getAddons().stream().map(IGTAddon::addonModId).collect(Collectors.toSet()))); return packResources; } + + public static List addDynamicResourcePack(Collection packs) { + List packResources = new ArrayList<>(packs); + // Clear old data + GTDynamicResourcePack.clearClient(); + + // Register recipes & unification data again + long startTime = System.currentTimeMillis(); + MaterialBlockRenderer.reinitModels(); + TagPrefixItemRenderer.reinitModels(); + ToolItemRenderer.reinitModels(); + GTModels.registerMaterialFluidModels(); + GTCEu.LOGGER.info("GregTech Model loading took {}ms", System.currentTimeMillis() - startTime); + + // Load the data + packResources.add(new GTDynamicResourcePack("gtceu:dynamic_assets", AddonFinder.getAddons().stream().map(IGTAddon::addonModId).collect(Collectors.toSet()))); + return packResources; + } + + // unused on purpose. Do not call, will destroy ram usage. + public static void initializeDynamicTextures() { + //MaterialBlockRenderer.initTextures(); + //TagPrefixItemRenderer.initTextures(); + } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftMixin.java b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftMixin.java new file mode 100644 index 0000000000..6cd79e3f9c --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftMixin.java @@ -0,0 +1,22 @@ +package com.gregtechceu.gtceu.core.mixins; + +import com.gregtechceu.gtceu.core.MixinHelpers; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import net.minecraft.client.Minecraft; +import net.minecraft.server.packs.PackResources; +import net.minecraft.server.packs.resources.ReloadInstance; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import java.util.List; + +@Mixin(Minecraft.class) +public class MinecraftMixin { + @ModifyExpressionValue( + method = {"reloadResourcePacks(Z)Ljava/util/concurrent/CompletableFuture;", ""}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/repository/PackRepository;openAllSelected()Ljava/util/List;") + ) + private List gtceu$loadPacks(List resources) { + return MixinHelpers.addDynamicResourcePack(resources); + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftServerMixin.java b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftServerMixin.java index 8d6a9b12d7..a2239d6fdd 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftServerMixin.java +++ b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/MinecraftServerMixin.java @@ -14,6 +14,6 @@ public class MinecraftServerMixin { @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;(Lnet/minecraft/server/packs/PackType;Ljava/util/List;)V"), index = 1) public List gtceu$injectDynamicData(PackType type, List packs) { - return MixinHelpers.addDynamicData(packs); + return MixinHelpers.addDynamicDataPack(packs); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/core/mixins/WorldLoaderPackConfigMixin.java b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/WorldLoaderPackConfigMixin.java index 7f506580ba..c6e1573029 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/core/mixins/WorldLoaderPackConfigMixin.java +++ b/common/src/main/java/com/gregtechceu/gtceu/core/mixins/WorldLoaderPackConfigMixin.java @@ -14,6 +14,6 @@ public class WorldLoaderPackConfigMixin { @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;(Lnet/minecraft/server/packs/PackType;Ljava/util/List;)V"), index = 1) public List gtceu$injectDynamicData(PackType type, List packs) { - return MixinHelpers.addDynamicData(packs); + return MixinHelpers.addDynamicDataPack(packs); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java b/common/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java index 8a509c06f1..6fff7c135e 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java @@ -13,14 +13,7 @@ public static void init(RegistrateLangProvider provider) { private static void initCasingLang(RegistrateLangProvider provider) { // Coils - replace(provider, "block.gtceu.wire_coil_cupronickel", "Cupronickel Coil Block"); - replace(provider, "block.gtceu.wire_coil_kanthal", "Kanthal Coil Block"); - replace(provider, "block.gtceu.wire_coil_nichrome", "Nichrome Coil Block"); - replace(provider, "block.gtceu.wire_coil_tungstensteel", "Tungstensteel Coil Block"); - replace(provider, "block.gtceu.wire_coil_hss_g", "HSS-G Coil Block"); - replace(provider, "block.gtceu.wire_coil_naquadah", "Naquadah Coil Block"); - replace(provider, "block.gtceu.wire_coil_trinium", "Trinium Coil Block"); - replace(provider, "block.gtceu.wire_coil_tritanium", "Tritanium Coil Block"); + replace(provider, "block.gtceu.hssg_coil_block", "HSS-G Coil Block"); replace(provider, "block.gtceu.wire_coil.tooltip_extended_info", "§7Hold SHIFT to show Coil Bonus Info"); replace(provider, "block.gtceu.wire_coil.tooltip_heat", "§cBase Heat Capacity: §f%d K"); @@ -35,33 +28,30 @@ private static void initCasingLang(RegistrateLangProvider provider) { // Casings replace(provider, "block.gtceu.casing_bronze_bricks", "Bronze Machine Casing"); replace(provider, "block.gtceu.casing_primitive_bricks", "Firebricks"); - replace(provider, "block.gtceu.casing_invar_heatproof", "Heat Proof Invar Machine Casing"); - replace(provider, "block.gtceu.casing_aluminium_frostproof", "Frost Proof Aluminium Machine Casing"); - replace(provider, "block.gtceu.casing_steel_solid", "Solid Steel Machine Casing"); - replace(provider, "block.gtceu.casing_stainless_clean", "Clean Stainless Steel Casing"); - replace(provider, "block.gtceu.casing_titanium_stable", "Stable Titanium Machine Casing"); - replace(provider, "block.gtceu.casing_tungstensteel_robust", "Robust Tungstensteel Machine Casing"); + replace(provider, "block.gtceu.heatproof_machine_casing", "Heat Proof Invar Machine Casing"); + replace(provider, "block.gtceu.frostproof_machine_casing", "Frost Proof Aluminium Machine Casing"); + replace(provider, "block.gtceu.steel_machine_casing", "Solid Steel Machine Casing"); + replace(provider, "block.gtceu.clean_machine_casing", "Clean Stainless Steel Casing"); + replace(provider, "block.gtceu.stable_machine_casing", "Stable Titanium Machine Casing"); + replace(provider, "block.gtceu.robust_machine_casing", "Robust Tungstensteel Machine Casing"); replace(provider, "block.gtceu.casing_coke_bricks", "Coke Oven Bricks"); - replace(provider, "block.gtceu.casing_ptfe_inert", "Chemically Inert PTFE Machine Casing"); - replace(provider, "block.gtceu.casing_hsse_sturdy", "Sturdy HSS-E Machine Casing"); + replace(provider, "block.gtceu.inert_machine_casing", "Chemically Inert PTFE Machine Casing"); + replace(provider, "block.gtceu.sturdy_machine_casing", "Sturdy HSS-E Machine Casing"); replace(provider, "block.gtceu.casing_grate", "Grate Machine Casing"); - replace(provider, "block.gtceu.casing_assembly_control", "Assembly Control Casing"); - replace(provider, "block.gtceu.casing_polytetrafluoroethylene_pipe", "PTFE Pipe Casing"); - replace(provider, "block.gtceu.casing_laminated_glass", "Laminated Glass"); - replace(provider, "block.gtceu.casing_bronze_gearbox", "Bronze Gearbox Casing"); - replace(provider, "block.gtceu.casing_steel_gearbox", "Steel Gearbox Casing"); - replace(provider, "block.gtceu.casing_stainless_steel_gearbox", "Stainless Steel Gearbox Casing"); - replace(provider, "block.gtceu.casing_titanium_gearbox", "Titanium Gearbox Casing"); - replace(provider, "block.gtceu.casing_tungstensteel_gearbox", "Tungstensteel Gearbox Casing"); - replace(provider, "block.gtceu.casing_steel_turbine", "Steel Turbine Casing"); - replace(provider, "block.gtceu.casing_titanium_turbine", "Titanium Turbine Casing"); - replace(provider, "block.gtceu.casing_stainless_turbine", "Stainless Turbine Casing"); - replace(provider, "block.gtceu.casing_tungstensteel_turbine", "Tungstensteel Turbine Casing"); - replace(provider, "block.gtceu.casing_bronze_pipe", "Bronze Pipe Casing"); - replace(provider, "block.gtceu.casing_steel_pipe", "Steel Pipe Casing"); - replace(provider, "block.gtceu.casing_titanium_pipe", "Titanium Pipe Casing"); - replace(provider, "block.gtceu.casing_tungstensteel_pipe", "Tungstensteel Pipe Casing"); - replace(provider, "block.gtceu.casing_pump_deck", "Pump Deck"); + replace(provider, "block.gtceu.assembly_line_unit", "Assembly Control Casing"); + replace(provider, "block.gtceu.ptfe_pipe_casing", "PTFE Pipe Casing"); + replace(provider, "block.gtceu.bronze_gearbox", "Bronze Gearbox Casing"); + replace(provider, "block.gtceu.steel_gearbox", "Steel Gearbox Casing"); + replace(provider, "block.gtceu.stainless_steel_gearbox", "Stainless Steel Gearbox Casing"); + replace(provider, "block.gtceu.titanium_gearbox", "Titanium Gearbox Casing"); + replace(provider, "block.gtceu.tungstensteel_gearbox", "Tungstensteel Gearbox Casing"); + replace(provider, "block.gtceu.titanium_turbine_casing", "Titanium Turbine Casing"); + replace(provider, "block.gtceu.stainless_steel_turbine_casing", "Stainless Turbine Casing"); + replace(provider, "block.gtceu.tungstensteel_turbine_casing", "Tungstensteel Turbine Casing"); + replace(provider, "block.gtceu.bronze_pipe_casing", "Bronze Pipe Casing"); + replace(provider, "block.gtceu.steel_pipe_casing", "Steel Pipe Casing"); + replace(provider, "block.gtceu.titanium_pipe_casing", "Titanium Pipe Casing"); + replace(provider, "block.gtceu.tungstensteel_pipe_casing", "Tungstensteel Pipe Casing"); replace(provider, "block.gtceu.steam_casing_bronze", "Bronze Hull"); provider.add("block.gtceu.steam_casing_bronze.tooltip", "§7For your first Steam Machines"); @@ -72,15 +62,6 @@ private static void initCasingLang(RegistrateLangProvider provider) { replace(provider, "block.gtceu.steam_casing_bricked_steel", "Bricked Wrought Iron Hull"); provider.add("block.gtceu.steam_casing_bricked_steel.tooltip", "§7For improved Steam Machines"); - replace(provider, "block.gtceu.active_casing_engine_intake", "Engine Intake Casing"); - replace(provider, "block.gtceu.active_casing_extreme_engine_intake", "Extreme Engine Intake Casing"); - replace(provider, "block.gtceu.active_casing_assembly_line", "Assembly Line Casing"); - - replace(provider, "block.gtceu.bronze_firebox", "Bronze Firebox Casing"); - replace(provider, "block.gtceu.steel_firebox", "Steel Firebox Casing"); - replace(provider, "block.gtceu.titanium_firebox", "Titanium Firebox Casing"); - replace(provider, "block.gtceu.tungstensteel_firebox", "Tungstensteel Firebox Casing"); - //GCyM Casings replace(provider, "block.gtceu.laser_safe_engraving_casing", "Laser-Safe Engraving Casing"); replace(provider, "block.gtceu.large_scale_assembler_casing", "Large-Scale Assembler Casing"); @@ -91,11 +72,11 @@ private static void initCasingLang(RegistrateLangProvider provider) { //replace(provider, "tile.steam_casing.wood_wall.name", "Wooden Wall"); // todo fusion - replace(provider, "block.superconducting_coil", "Superconducting Coil Block"); - replace(provider, "block.fusion_coil", "Fusion Coil Block"); - replace(provider, "block.fusion_casing", "Fusion Machine Casing"); - replace(provider, "block.fusion_casing_mk2", "Fusion Machine Casing MK II"); - replace(provider, "block.fusion_casing_mk3", "Fusion Machine Casing MK III"); + replace(provider, "block.gtceu.superconducting_coil", "Superconducting Coil Block"); + replace(provider, "block.gtceu.fusion_coil", "Fusion Coil Block"); + replace(provider, "block.gtceu.fusion_casing", "Fusion Machine Casing"); + replace(provider, "block.gtceu.fusion_casing_mk2", "Fusion Machine Casing MK II"); + replace(provider, "block.gtceu.fusion_casing_mk3", "Fusion Machine Casing MK III"); provider.add("block.filter.tooltip", "Creates a §aParticle-Free§7 environment"); provider.add("block.filter_sterile.tooltip", "Creates a §aSterilized§7 environment"); @@ -218,15 +199,5 @@ private static void initCasingLang(RegistrateLangProvider provider) { provider.add("tile.stone_bricks_square.concrete_light.name", "Square Light Concrete Bricks"); provider.add("tile.stone_bricks_square.concrete_dark.name", "Square Dark Concrete Bricks"); */ - provider.add("tile.stone_bricks_square.concrete_dark.name", "Square Dark Concrete Bricks"); - provider.add("tile.wire_coil.tooltip_extended_info", "Hold SHIFT to show Coil Bonus Info"); - provider.add("tile.wire_coil.tooltip_heat", "§cBase Heat Capacity: §f%d K"); - provider.add("tile.wire_coil.tooltip_smelter", "§8Multi Smelter:"); - provider.add("tile.wire_coil.tooltip_parallel_smelter", " §5Max Parallel: §f%s"); - provider.add("tile.wire_coil.tooltip_energy_smelter", " §aEnergy Usage: §f%s EU/t §8per recipe"); - provider.add("tile.wire_coil.tooltip_pyro", "§8Pyrolyse Oven:"); - provider.add("tile.wire_coil.tooltip_speed_pyro", " §bProcessing Speed: §f%s%%"); - provider.add("tile.wire_coil.tooltip_cracking", "§8Cracking Unit:"); - provider.add("tile.wire_coil.tooltip_energy_cracking", " §aEnergy Usage: §f%s%%"); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java index 772799536b..39e1aa28f1 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.data.lang; -import com.gregtechceu.gtceu.common.data.GTCreativeModeTabs; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.lowdragmc.lowdraglib.utils.LocalizationUtils; import com.tterrag.registrate.providers.RegistrateLangProvider; @@ -13,8 +12,6 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; - /** * @author KilaBash * @date 2023/3/19 @@ -316,14 +313,14 @@ public static void init(RegistrateLangProvider provider) { provider.add("cover.conveyor.mode", "Mode: %s"); provider.add("cover.conveyor.mode.export", "Mode: Export"); provider.add("cover.conveyor.mode.import", "Mode: Import"); - multilineLang(provider, "cover.conveyor.distribution.round_robin_enhanced", "Distribution Mode\n§bEnhanced Round Robin§r\n§7Splits items equally to all inventories"); - multilineLang(provider, "cover.conveyor.distribution.round_robin", "Distribution Mode\n§bRound Robin§r with Priority\n§7Tries to split items equally to inventories"); - multilineLang(provider, "cover.conveyor.distribution.first_insert", "Distribution Mode\n§bFirst Insert§r\n§7Will insert into the first inventory it finds"); + multilineLang(provider, "cover.conveyor.distribution.round_robin_global", "Distribution Mode: §bRound Robin\n§7Splits items equally across connected inventories"); + multilineLang(provider, "cover.conveyor.distribution.round_robin_prio", "Distribution Mode: §bRound Robin with Priority\n§7Tries to split items across connected inventories and considers higher priorities first.\n§7Restrictive item pipes lower the priority of a path."); + multilineLang(provider, "cover.conveyor.distribution.insert_first", "Distribution Mode: §bPriority\n§7Will insert into the first inventory with the highest priority it can find.\n§7Restrictive item pipes lower the priority of a path."); multilineLang(provider, "cover.conveyor.blocks_input.enabled", "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.\n§aEnabled"); multilineLang(provider, "cover.conveyor.blocks_input.disabled", "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.\n§cDisabled"); - provider.add("cover.universal.manual_import_export.mode.disabled", "Manual I/O: Disabled"); - provider.add("cover.universal.manual_import_export.mode.filtered", "Manual I/O: Filtered"); - provider.add("cover.universal.manual_import_export.mode.unfiltered", "Manual I/O: Unfiltered"); + provider.add("cover.universal.manual_import_export.mode.disabled", "Manual I/O: §bDisabled\n§7Items / Fluids will only move as specified by the cover and its filter."); + provider.add("cover.universal.manual_import_export.mode.filtered", "Manual I/O: §bFiltered\n§7Items / Fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any)"); + provider.add("cover.universal.manual_import_export.mode.unfiltered", "Manual I/O: §bUnfiltered\n§7Items / Fluids can be moved independently of the cover mode. The filter only applies to what is inserted or extracted by this cover itself."); multilineLang(provider, "cover.universal.manual_import_export.mode.description", "§eDisabled§r - Items/fluids will only move as specified by the cover and its filter. \n§eAllow Filtered§r - Items/fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any). \n§eAllow Unfiltered§r - Items/fluids can be moved independently of the cover mode. Filter applies to the items inserted or extracted by this cover"); provider.add("cover.conveyor.item_filter.title", "Item Filter"); multiLang(provider, "cover.conveyor.ore_dictionary.title", "Ore Dictionary Name", "(use * for wildcard)"); @@ -397,11 +394,52 @@ public static void init(RegistrateLangProvider provider) { replace(provider, GTMaterials.HSSE.getUnlocalizedName(), "HSS-E"); replace(provider, GTMaterials.HSSS.getUnlocalizedName(), "HSS-S"); replace(provider, GTMaterials.UUMatter.getUnlocalizedName(), "UU-Matter"); + replace(provider, GTMaterials.PCBCoolant.getUnlocalizedName(), "PCB Coolant"); replace(provider, GTMaterials.TungstenSteel.getUnlocalizedName(), "Tungstensteel"); replace(provider, GTMaterials.OilHeavy.getUnlocalizedName(), "Heavy Oil"); + replace(provider, "block.gtceu.oil_heavy", "Heavy Oil"); replace(provider, GTMaterials.OilLight.getUnlocalizedName(), "Light Oil"); + replace(provider, "block.gtceu.oil_light", "Light Oil"); replace(provider, GTMaterials.RawOil.getUnlocalizedName(), "Raw Oil"); - replace(provider, GTMaterials.HSLASteel.getUnlocalizedName(), "HSLA-Steel"); + replace(provider, "block.gtceu.oil_medium", "Raw Oil"); + + replace(provider, GTMaterials.HydroCrackedButadiene.getUnlocalizedName(), "Hydro-Cracked Butadiene"); + replace(provider, GTMaterials.HydroCrackedButane.getUnlocalizedName(), "Hydro-Cracked Butane"); + replace(provider, GTMaterials.HydroCrackedButene.getUnlocalizedName(), "Hydro-Cracked Butene"); + replace(provider, GTMaterials.HydroCrackedButene.getUnlocalizedName(), "Hydro-Cracked Butene"); + replace(provider, GTMaterials.HydroCrackedEthane.getUnlocalizedName(), "Hydro-Cracked Ethane"); + replace(provider, GTMaterials.HydroCrackedEthylene.getUnlocalizedName(), "Hydro-Cracked Ethylene"); + replace(provider, GTMaterials.HydroCrackedPropane.getUnlocalizedName(), "Hydro-Cracked Propane"); + replace(provider, GTMaterials.HydroCrackedPropene.getUnlocalizedName(), "Hydro-Cracked Propene"); + replace(provider, GTMaterials.SteamCrackedButadiene.getUnlocalizedName(), "Steam-Cracked Butadiene"); + replace(provider, GTMaterials.SteamCrackedButane.getUnlocalizedName(), "Steam-Cracked Butane"); + replace(provider, GTMaterials.SteamCrackedButene.getUnlocalizedName(), "Steam-Cracked Butene"); + replace(provider, GTMaterials.SteamCrackedButene.getUnlocalizedName(), "Steam-Cracked Butene"); + replace(provider, GTMaterials.SteamCrackedEthane.getUnlocalizedName(), "Steam-Cracked Ethane"); + replace(provider, GTMaterials.SteamCrackedEthylene.getUnlocalizedName(), "Steam-Cracked Ethylene"); + replace(provider, GTMaterials.SteamCrackedPropane.getUnlocalizedName(), "Steam-Cracked Propane"); + replace(provider, GTMaterials.SteamCrackedPropene.getUnlocalizedName(), "Steam-Cracked Propene"); + replace(provider, GTMaterials.LightlyHydroCrackedGas.getUnlocalizedName(), "Lightly Hydro-Cracked Gas"); + replace(provider, GTMaterials.LightlyHydroCrackedHeavyFuel.getUnlocalizedName(), "Lightly Hydro-Cracked Heavy Fuel"); + replace(provider, GTMaterials.LightlyHydroCrackedLightFuel.getUnlocalizedName(), "Lightly Hydro-Cracked Light Fuel"); + replace(provider, GTMaterials.LightlyHydroCrackedNaphtha.getUnlocalizedName(), "Lightly Hydro-Cracked Naphtha"); + replace(provider, GTMaterials.LightlySteamCrackedGas.getUnlocalizedName(), "Lightly Steam-Cracked Gas"); + replace(provider, GTMaterials.LightlySteamCrackedHeavyFuel.getUnlocalizedName(), "Lightly Steam-Cracked Heavy Fuel"); + replace(provider, GTMaterials.LightlySteamCrackedLightFuel.getUnlocalizedName(), "Lightly Steam-Cracked Light Fuel"); + replace(provider, GTMaterials.LightlySteamCrackedNaphtha.getUnlocalizedName(), "Lightly Steam-Cracked Naphtha"); + replace(provider, GTMaterials.SeverelyHydroCrackedGas.getUnlocalizedName(), "Severely Hydro-Cracked Gas"); + replace(provider, GTMaterials.SeverelyHydroCrackedHeavyFuel.getUnlocalizedName(), "Severely Hydro-Cracked Heavy Fuel"); + replace(provider, GTMaterials.SeverelyHydroCrackedLightFuel.getUnlocalizedName(), "Severely Hydro-Cracked Light Fuel"); + replace(provider, GTMaterials.SeverelyHydroCrackedNaphtha.getUnlocalizedName(), "Severely Hydro-Cracked Naphtha"); + replace(provider, GTMaterials.SeverelySteamCrackedGas.getUnlocalizedName(), "Severely Steam-Cracked Gas"); + replace(provider, GTMaterials.SeverelySteamCrackedHeavyFuel.getUnlocalizedName(), "Severely Steam-Cracked Heavy Fuel"); + replace(provider, GTMaterials.SeverelySteamCrackedLightFuel.getUnlocalizedName(), "Severely Steam-Cracked Light Fuel"); + replace(provider, GTMaterials.SeverelySteamCrackedNaphtha.getUnlocalizedName(), "Severely Steam-Cracked Naphtha"); + + replace(provider, GTMaterials.Zeron100.getUnlocalizedName(), "Zeron-100"); + replace(provider, GTMaterials.IncoloyMA956.getUnlocalizedName(), "Incoloy MA-956"); + replace(provider, GTMaterials.Stellite100.getUnlocalizedName(), "Stellite-100"); + replace(provider, GTMaterials.HastelloyC276.getUnlocalizedName(), "Hastelloy C-276"); provider.add("item.netherrack_nether_quartz", "Nether Quartz Ore"); @@ -450,14 +488,14 @@ public static void init(RegistrateLangProvider provider) { provider.add("item.wood_small_dust", "Small Pile of Wood Pulp"); provider.add("item.wood_dust", "Wood Pulp"); provider.add("item.wood_plate", "Wood Plank"); - provider.add("item.wood_rodLong", "Long Wood Stick"); + provider.add("item.wood_long_rod", "Long Wood Stick"); provider.add("item.wood_bolt", "Short Wood Stick"); provider.add("item.treated_wood_tiny_dust", "Tiny Pile of Treated Wood Pulp"); provider.add("item.treated_wood_small_dust", "Small Pile of Treated Wood Pulp"); provider.add("item.treated_wood_dust", "Treated Wood Pulp"); provider.add("item.treated_wood_plate", "Treated Wood Plank"); provider.add("item.treated_wood_rod", "Treated Wood Stick"); - provider.add("item.treated_wood_rodLong", "Long Treated Wood Stick"); + provider.add("item.treated_wood_long_rod", "Long Treated Wood Stick"); provider.add("item.treated_wood_bolt", "Short Treated Wood Stick"); provider.add("item.glass_gem", "Glass Crystal"); provider.add("item.glass_chipped_gem", "Chipped Glass Crystal"); @@ -505,7 +543,7 @@ public static void init(RegistrateLangProvider provider) { provider.add("item.pitchblende_dust", "Pitchblende"); provider.add("item.talc_refined_ore", "Refined Talc"); provider.add("item.talc_purified_ore", "Purified Talc"); - provider.add("item.talc_crushed", "Ground Talc"); + provider.add("item.talc_crushed_ore", "Ground Talc"); provider.add("item.talc_tiny_dust", "Tiny Pile of Talc"); provider.add("item.talc_small_dust", "Small Pile of Talc"); provider.add("item.talc_impure_dust", "Impure Pile of Talc"); @@ -518,7 +556,7 @@ public static void init(RegistrateLangProvider provider) { provider.add("item.meat_small_dust", "Small Pile of Mince Meat"); provider.add("item.meat_dust", "Mince Meat"); provider.add("item.borosilicate_glass_ingot", "Borosilicate Glass Bar"); - provider.add("item.borosilicate_glass_wireFine", "Borosilicate Glass Fibers"); + provider.add("item.borosilicate_glass_fine_wire", "Borosilicate Glass Fibers"); provider.add("item.platinum_group_sludge_tiny_dust", "Tiny Clump of Platinum Group Sludge"); provider.add("item.platinum_group_sludge_small_dust", "Small Clump of Platinum Group Sludge"); provider.add("item.platinum_group_sludge_dust", "Platinum Group Sludge"); @@ -1251,7 +1289,7 @@ public static List getMultiLang(String key, Object... args) { * See {@link #getMultiLang(String)}. If no multiline key is available, get single instead. * * @param key Base key of the multi lang. E.g. "terminal.fluid_prospector.tier". - * @returnReturns all translation components from a multi lang's sub-keys. + * @return Returns all translation components from a multi lang's sub-keys. */ public static List getSingleOrMultiLang(String key) { List multiLang = getMultiLang(key); diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java b/common/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java index 9638b4dd68..6024de0e69 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java @@ -8,6 +8,10 @@ public class MachineLang { protected static void init(RegistrateLangProvider provider) { + replace(provider, "block.gtceu.steam_large_turbine", "Large Steam Turbine"); + replace(provider, "block.gtceu.gas_large_turbine", "Large Gas Turbine"); + replace(provider, "block.gtceu.plasma_large_turbine", "Large Plasma Turbine"); + // Steam machines replace(provider, "block.gtceu.steam_solid_boiler.bronze", "Small Steam Solid Boiler"); replace(provider, "block.gtceu.steam_liquid_boiler.bronze", "Small Steam Liquid Boiler"); diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java b/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java index 1a2ea12a79..0dead29b47 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicDataPack.java @@ -2,6 +2,7 @@ import com.google.common.collect.Sets; import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.data.GTRecipes; @@ -64,9 +65,22 @@ public static void addRecipe(FinishedRecipe recipe) { } } - private static void writeJson(ResourceLocation id, String subdir, Path parent, JsonObject json){ + /** + * if subdir is null, no file ending is appended. + * @param id the resource location of the file to be written. + * @param subdir a nullable subdirectory for the data. + * @param parent the parent folder where to write data to. + * @param json the json to write. + */ + @ApiStatus.Internal + public static void writeJson(ResourceLocation id, @Nullable String subdir, Path parent, JsonElement json) { try { - Path file = parent.resolve(id.getNamespace()).resolve(subdir).resolve(id.getPath() + ".json"); + Path file; + if (subdir != null) { + file = parent.resolve(id.getNamespace()).resolve(subdir).resolve(id.getPath() + ".json"); // assume JSON + } else { + file = parent.resolve(id.getNamespace()).resolve(id.getPath()); // assume the file type is also appended if a full path is given. + } Files.createDirectories(file.getParent()); try(OutputStream output = Files.newOutputStream(file)) { output.write(json.toString().getBytes()); @@ -111,7 +125,7 @@ public boolean hasResource(PackType type, ResourceLocation location) { @Override public Collection getResources(PackType type, String namespace, String path, Predicate filter) { if (type == PackType.SERVER_DATA) - return DATA.keySet().stream().filter(loc -> loc.getPath().startsWith(path) && filter.test(loc)).collect(Collectors.toList()); + return DATA.keySet().stream().filter(loc -> loc.getPath().startsWith(path.endsWith("/") ? path : path + "/") && filter.test(loc)).collect(Collectors.toList()); return Collections.emptyList();//LANG.keySet().stream().filter(loc -> loc.getPath().startsWith(path) && filter.test(loc.getPath())).collect(Collectors.toList()); } diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java b/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java new file mode 100644 index 0000000000..9e108e1350 --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/data/pack/GTDynamicResourcePack.java @@ -0,0 +1,208 @@ +package com.gregtechceu.gtceu.data.pack; + +import com.google.common.collect.Sets; +import com.google.gson.JsonElement; +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.config.ConfigHolder; +import com.lowdragmc.lowdraglib.Platform; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import it.unimi.dsi.fastutil.objects.ObjectSet; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.SharedConstants; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.PackResources; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.metadata.MetadataSectionSerializer; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +import net.minecraft.server.packs.resources.IoSupplier; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.Nullable; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collection; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.function.Supplier; + +import static com.gregtechceu.gtceu.data.pack.GTDynamicDataPack.writeJson; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +public class GTDynamicResourcePack implements PackResources { + + protected static final ObjectSet CLIENT_DOMAINS = new ObjectOpenHashSet<>(); + @ApiStatus.Internal + public static final ConcurrentMap DATA = new ConcurrentHashMap<>(); + + private final String name; + + static { + CLIENT_DOMAINS.addAll(Sets.newHashSet(GTCEu.MOD_ID, "minecraft", "forge", "c")); + } + + public GTDynamicResourcePack(String name, Collection domains) { + this.name = name; + CLIENT_DOMAINS.addAll(domains); + } + + public static void clearClient() { + DATA.clear(); + } + + public static void addBlockModel(ResourceLocation loc, JsonElement obj) { + ResourceLocation l = getModelLocation(loc); + if (ConfigHolder.INSTANCE.dev.dumpAssets) { + Path parent = Platform.getGamePath().resolve("gtceu/dumped/assets"); + writeJson(l, null, parent, obj); + } + DATA.put(l, obj.toString().getBytes(StandardCharsets.UTF_8)); + } + + public static void addBlockModel(ResourceLocation loc, Supplier obj) { + addBlockModel(loc, obj.get()); + } + + public static void addItemModel(ResourceLocation loc, JsonElement obj) { + ResourceLocation l = getItemModelLocation(loc); + if (ConfigHolder.INSTANCE.dev.dumpAssets) { + Path parent = Platform.getGamePath().resolve("gtceu/dumped/assets"); + writeJson(l, null, parent, obj); + } + DATA.put(l, obj.toString().getBytes(StandardCharsets.UTF_8)); + } + + public static void addItemModel(ResourceLocation loc, Supplier obj) { + addItemModel(loc, obj.get()); + } + + public static void addBlockState(ResourceLocation loc, JsonElement stateJson) { + ResourceLocation l = getBlockStateLocation(loc); + if (ConfigHolder.INSTANCE.dev.dumpAssets) { + Path parent = Platform.getGamePath().resolve("gtceu/dumped/assets"); + writeJson(l, null, parent, stateJson); + } + DATA.put(l, stateJson.toString().getBytes(StandardCharsets.UTF_8)); + } + + public static void addBlockState(ResourceLocation loc, Supplier generator) { + addBlockState(loc, generator.get()); + } + + public static void addBlockTexture(ResourceLocation loc, byte[] data) { + ResourceLocation l = getTextureLocation("block", loc); + if (ConfigHolder.INSTANCE.dev.dumpAssets) { + Path parent = Platform.getGamePath().resolve("gtceu/dumped/assets"); + writeByteArray(l, null, parent, data); + } + DATA.put(l, data); + } + + public static void addItemTexture(ResourceLocation loc, byte[] data) { + ResourceLocation l = getTextureLocation("item", loc); + if (ConfigHolder.INSTANCE.dev.dumpAssets) { + Path parent = Platform.getGamePath().resolve("gtceu/dumped/assets"); + writeByteArray(l, null, parent, data); + } + DATA.put(l, data); + } + + @ApiStatus.Internal + public static void writeByteArray(ResourceLocation id, @Nullable String subdir, Path parent, byte[] data) { + try { + Path file; + if (subdir != null) { + file = parent.resolve(id.getNamespace()).resolve(subdir).resolve(id.getPath() + ".png"); // assume PNG + } else { + file = parent.resolve(id.getNamespace()).resolve(id.getPath()); // assume the file type is also appended if a full path is given. + } + Files.createDirectories(file.getParent()); + try(OutputStream output = Files.newOutputStream(file)) { + output.write(data); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Nullable + @Override + public IoSupplier getRootResource(String... elements) { + return null; + } + + @Override + public IoSupplier getResource(PackType type, ResourceLocation location) { + if (type == PackType.CLIENT_RESOURCES) { + if (DATA.containsKey(location)) + return () -> new ByteArrayInputStream(DATA.get(location)); + } + return null; + } + + @Override + public void listResources(PackType packType, String namespace, String path, ResourceOutput resourceOutput) { + if (packType == PackType.CLIENT_RESOURCES) { + if (!path.endsWith("/")) path += "/"; + final String finalPath = path; + DATA.keySet().stream().filter(Objects::nonNull).filter(loc -> loc.getPath().startsWith(finalPath)).forEach((id) -> { + IoSupplier resource = this.getResource(packType, id); + if (resource != null) { + resourceOutput.accept(id, resource); + } + }); + } + } + + @Override + public Set getNamespaces(PackType type) { + return type == PackType.CLIENT_RESOURCES ? CLIENT_DOMAINS : Set.of(); + } + + @Nullable + @Override + public T getMetadataSection(MetadataSectionSerializer metaReader) { + if(metaReader == PackMetadataSection.TYPE) { + return (T) new PackMetadataSection(Component.literal("GTCEu dynamic assets"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES)); + } + return null; + } + + @Override + public String packId() { + return this.name; + } + + @Override + public void close() { + //NOOP + } + + public static ResourceLocation getBlockStateLocation(ResourceLocation blockId) { + return new ResourceLocation(blockId.getNamespace(), String.join("", "blockstates/", blockId.getPath(), ".json")); + } + + public static ResourceLocation getModelLocation(ResourceLocation blockId) { + return new ResourceLocation(blockId.getNamespace(), String.join("", "models/", blockId.getPath(), ".json")); + } + + public static ResourceLocation getItemModelLocation(ResourceLocation itemId) { + return new ResourceLocation(itemId.getNamespace(), String.join("", "models/item/", itemId.getPath(), ".json")); + } + + public static ResourceLocation getTextureLocation(@Nullable String path, ResourceLocation tagId) { + if (path == null) { + return new ResourceLocation(tagId.getNamespace(), String.join("", "textures/", tagId.getPath(), ".png")); + } + return new ResourceLocation(tagId.getNamespace(), String.join("", "textures/", path, "/", tagId.getPath(), ".png")); + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java new file mode 100644 index 0000000000..78e28a53ec --- /dev/null +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/ComputerRecipes.java @@ -0,0 +1,49 @@ +package com.gregtechceu.gtceu.data.recipe.misc; + +import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import net.minecraft.data.recipes.FinishedRecipe; + +import java.util.function.Consumer; + +import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; +import static com.gregtechceu.gtceu.common.data.GTItems.*; +import static com.gregtechceu.gtceu.common.data.GTMachines.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; + +public class ComputerRecipes { + + public static void init(Consumer provider) { + + ASSEMBLER_RECIPES.recipeBuilder("high_power_casing") + .inputItems(frameGt, Iridium) + .inputItems(plate, Iridium, 6) + .inputItems(CustomTags.IV_CIRCUITS) + .inputItems(wireFine, Cobalt, 16) + .inputItems(wireFine, Copper, 16) + .inputItems(wireGtSingle, NiobiumTitanium, 2) + .outputItems(GTBlocks.HIGH_POWER_CASING.asStack(2)) + .duration(100).EUt(VA[IV]).save(provider); + + ASSEMBLER_RECIPES.recipeBuilder("active_transformer") + .inputItems(POWER_TRANSFORMER[LuV]) + .inputItems(CustomTags.LuV_CIRCUITS, 2) + .inputItems(wireGtSingle, IndiumTinBariumTitaniumCuprate, 8) + .inputItems(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) + .inputFluids(PCBCoolant.getFluid(1000)) + .outputItems(ACTIVE_TRANSFORMER) + .duration(300).EUt(VA[LuV]).save(provider); + + ASSEMBLER_RECIPES.recipeBuilder("laser_cable") + .inputItems(GTBlocks.CASING_LAMINATED_GLASS.get().asItem(), 1) + .inputItems(foil, Osmiridium, 2) + .inputFluids(Polytetrafluoroethylene.getFluid(L)) + .outputItems(LASER_PIPES[0]) + .cleanroom(CleanroomType.CLEANROOM) + .duration(100).EUt(VA[IV]).save(provider); + } +} diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java index 5a8f0ead6c..6209c64bd0 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java @@ -47,6 +47,8 @@ private MachineRecipeLoader() { } public static void init(Consumer provider) { + ComputerRecipes.init(provider); + registerDecompositionRecipes(provider); registerBlastFurnaceRecipes(provider); registerAssemblerRecipes(provider); diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java index f5ea047640..f7f55d665c 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java @@ -188,7 +188,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, true, "coke_oven_hatch", GTMachines.COKE_OVEN_HATCH.asStack(), "CD", 'C', GTBlocks.CASING_COKE_BRICKS.asStack(), 'D', GTMachines.WOODEN_DRUM.asStack()); VanillaRecipeHelper.addShapedRecipe(provider, true, "electric_blast_furnace", GTMachines.ELECTRIC_BLAST_FURNACE.asStack(), "FFF", "CMC", "WCW", 'M', GTBlocks.CASING_INVAR_HEATPROOF.asStack(), 'F', Blocks.FURNACE.asItem(), 'C', CustomTags.LV_CIRCUITS, 'W', new UnificationEntry(TagPrefix.cableGtSingle, GTMaterials.Tin)); VanillaRecipeHelper.addShapedRecipe(provider, true, "vacuum_freezer", GTMachines.VACUUM_FREEZER.asStack(), "PPP", "CMC", "WCW", 'M', GTBlocks.CASING_ALUMINIUM_FROSTPROOF.asStack(), 'P', GTItems.ELECTRIC_PUMP_HV, 'C', CustomTags.EV_CIRCUITS, 'W', new UnificationEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); - VanillaRecipeHelper.addShapedRecipe(provider, true, "implosion_compressor", GTMachines.IMPLOSION_COMPRESSOR.asStack(), "OOO", "CMC", "WCW", 'M', GTBlocks.CASING_STEEL_SOLID.asStack(), 'O', new UnificationEntry(TagPrefix.block, GTMaterials.Obsidian), 'C', CustomTags.HV_CIRCUITS, 'W', new UnificationEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); + VanillaRecipeHelper.addShapedRecipe(provider, true, "implosion_compressor", GTMachines.IMPLOSION_COMPRESSOR.asStack(), "OOO", "CMC", "WCW", 'M', GTBlocks.CASING_STEEL_SOLID.asStack(), 'O', new UnificationEntry(TagPrefix.rock, GTMaterials.Obsidian), 'C', CustomTags.HV_CIRCUITS, 'W', new UnificationEntry(TagPrefix.cableGtSingle, GTMaterials.Gold)); VanillaRecipeHelper.addShapedRecipe(provider, true, "distillation_tower", GTMachines.DISTILLATION_TOWER.asStack(), "CBC", "FMF", "CBC", 'M', GTMachines.HULL[HV].asStack(), 'B', new UnificationEntry(TagPrefix.pipeLargeFluid, GTMaterials.StainlessSteel), 'C', CustomTags.EV_CIRCUITS, 'F', GTItems.ELECTRIC_PUMP_HV); VanillaRecipeHelper.addShapedRecipe(provider, true, "cracking_unit", GTMachines.CRACKER.asStack(), "CEC", "PHP", "CEC", 'C', GTBlocks.COIL_CUPRONICKEL.asStack(), 'E', GTItems.ELECTRIC_PUMP_HV.asStack(), 'P', CustomTags.HV_CIRCUITS, 'H', GTMachines.HULL[HV].asStack()); diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java index a7e9f41880..710f25725a 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityMachineRecipeLoader.java @@ -4,6 +4,8 @@ import appeng.core.definitions.AEParts; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry; +import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.integration.ae2.GTAEMachines; @@ -14,8 +16,7 @@ import static com.gregtechceu.gtceu.api.GTValues.*; import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; -import static com.gregtechceu.gtceu.common.data.GTBlocks.LD_FLUID_PIPE; -import static com.gregtechceu.gtceu.common.data.GTBlocks.LD_ITEM_PIPE; +import static com.gregtechceu.gtceu.common.data.GTBlocks.*; import static com.gregtechceu.gtceu.common.data.GTItems.*; import static com.gregtechceu.gtceu.common.data.GTMachines.*; import static com.gregtechceu.gtceu.common.data.GTMaterials.*; diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java index 7b6ae2bd16..4f41cfc763 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/MixerRecipes.java @@ -114,6 +114,12 @@ public static void init(Consumer provider) { .outputItems(dust, EnderPearl, 10) .save(provider); + MIXER_RECIPES.recipeBuilder("pcb_coolant").duration(200).EUt(VA[HV]) + .inputFluids(PolychlorinatedBiphenyl.getFluid(750)) + .inputFluids(DistilledWater.getFluid(250)) + .outputFluids(PCBCoolant.getFluid(1000)) + .save(provider); + // Alloys VanillaRecipeHelper.addShapelessRecipe(provider, "dust_brass", ChemicalHelper.get(dust, Brass, 3), new UnificationEntry(dust, Copper), diff --git a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java index eef2187a42..e40c74e983 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java +++ b/common/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java @@ -682,5 +682,33 @@ public static void init(Consumer provider) { .inputFluids(PolyvinylAcetate.getFluid(144)) .outputFluids(PolyvinylButyral.getFluid(144)) .duration(400).EUt(VA[HV]).save(provider); + + CHEMICAL_RECIPES.recipeBuilder("biphenyl_from_toluene") + .inputFluids(Benzene.getFluid(1000)) + .inputFluids(Toluene.getFluid(1000)) + .outputItems(dust, Biphenyl, 2) + .outputFluids(Methane.getFluid(1000)) + .duration(200).EUt(VH[HV]).save(provider); + + CHEMICAL_RECIPES.recipeBuilder("biphenyl_from_oxygen") + .inputFluids(Benzene.getFluid(2000)) + .inputFluids(Oxygen.getFluid(1000)) + .circuitMeta(1) + .outputItems(dust, Biphenyl, 2) + .outputFluids(Water.getFluid(1000)) + .duration(400).EUt(VA[HV]).save(provider); + + CHEMICAL_RECIPES.recipeBuilder("benzene_from_biphenyl") + .inputItems(dust, Biphenyl, 2) + .inputFluids(Hydrogen.getFluid(2000)) + .outputFluids(Benzene.getFluid(2000)) + .duration(400).EUt(VA[EV]).save(provider); + + CHEMICAL_RECIPES.recipeBuilder("polychlorinated_biphenyl") + .inputItems(dust, Biphenyl, 2) + .inputFluids(Chlorine.getFluid(4000)) + .outputFluids(PolychlorinatedBiphenyl.getFluid(1000)) + .outputFluids(HydrochloricAcid.getFluid(2000)) + .duration(200).EUt(VH[HV]).save(provider); } } diff --git a/common/src/main/java/com/gregtechceu/gtceu/utils/GradientUtil.java b/common/src/main/java/com/gregtechceu/gtceu/utils/GradientUtil.java index 28f196d667..8a366510bf 100644 --- a/common/src/main/java/com/gregtechceu/gtceu/utils/GradientUtil.java +++ b/common/src/main/java/com/gregtechceu/gtceu/utils/GradientUtil.java @@ -8,6 +8,16 @@ public class GradientUtil { private GradientUtil() { } + public static int argbToAbgr(int argb) { + int r = (argb >> 16) & 0xFF; + int b = argb & 0xFF; + return (argb & 0xFF00FF00) | (b << 16) | r; + } + + public static int argbToRgba(int argb) { + return argb << 8 | (argb >>> 24); + } + public static float[] getRGB(int color) { float r = ((color >> 16) & 0xFF) / 255f; float g = ((color >> 8) & 0xFF) / 255f; @@ -16,6 +26,48 @@ public static float[] getRGB(int color) { return new float[]{r, g, b}; } + public static int multiplyBlendRGBA(int c1, int c2) { + int a1 = (c1 & 0xff); + int r1 = ((c1 & 0xff000000) >> 24); + int g1 = ((c1 & 0xff0000) >> 16); + int b1 = ((c1 & 0xff00) >> 8); + + int a2 = (c2 & 0xff); + int r2 = ((c2 & 0xff000000) >> 24); + int g2 = ((c2 & 0xff0000) >> 16); + int b2 = ((c2 & 0xff00) >> 8); + + int a = (a1 * a2) / 255; + int r = (r1 * r2) / 255; + int g = (g1 * g2) / 255; + int b = (b1 * b2) / 255; + + return a << 24 | r << 16 | g << 8 | b; + } + + public static int blend(int c1, int c2, float ratio) { + if ( ratio > 1f ) ratio = 1f; + else if ( ratio < 0f ) ratio = 0f; + float iRatio = 1.0f - ratio; + + int a1 = (c1 >> 24 & 0xff); + int r1 = ((c1 & 0xff0000) >> 16); + int g1 = ((c1 & 0xff00) >> 8); + int b1 = (c1 & 0xff); + + int a2 = (c2 >> 24 & 0xff); + int r2 = ((c2 & 0xff0000) >> 16); + int g2 = ((c2 & 0xff00) >> 8); + int b2 = (c2 & 0xff); + + int a = (int)((a1 * iRatio) + (a2 * ratio)); + int r = (int)((r1 * iRatio) + (r2 * ratio)); + int g = (int)((g1 * iRatio) + (g2 * ratio)); + int b = (int)((b1 * iRatio) + (b2 * ratio)); + + return a << 24 | r << 16 | g << 8 | b; + } + public static Tuple getGradient(int rgb, int luminanceDifference) { float[] hsl = RGBtoHSL(rgb); float[] upshade = new float[3]; diff --git a/common/src/main/resources/assets/gtceu/models/block/cube_2_layer_tintindex_both.json b/common/src/main/resources/assets/gtceu/models/block/cube_2_layer_tintindex_both.json new file mode 100644 index 0000000000..de14939ca3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/cube_2_layer_tintindex_both.json @@ -0,0 +1,30 @@ +{ + "parent": "block/block", + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#bot_down", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#bot_up", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#bot_north", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#bot_south", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#bot_west", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#bot_east", "cullface": "east", "tintindex": 0 } + } + }, + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "shade": false, + "faces": { + "down": { "texture": "#top_down", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top_up", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#top_north", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#top_south", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#top_west", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#top_east", "cullface": "east", "tintindex": 1 } + } + } + ] +} diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/block.json new file mode 100644 index 0000000000..7870d88807 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/dull/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/frame_gt.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/frame_gt.json new file mode 100644 index 0000000000..ea612555f0 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/frame_gt.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/dull/frame_gt" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/raw_ore_block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/raw_ore_block.json new file mode 100644 index 0000000000..6f1d7ae8a2 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/dull/raw_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/dull/raw_ore_block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/emerald/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/emerald/block.json new file mode 100644 index 0000000000..6d62fe228b --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/emerald/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/emerald/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/fine/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/fine/block.json new file mode 100644 index 0000000000..442a04f68f --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/fine/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/fine/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/glass/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/glass/block.json new file mode 100644 index 0000000000..a6ee5ced18 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/glass/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/glass/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/lapis/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/lapis/block.json new file mode 100644 index 0000000000..e6a0fe0418 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/lapis/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/lapis/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/block.json new file mode 100644 index 0000000000..fbf30f7697 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/lignite/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/raw_ore_block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/raw_ore_block.json new file mode 100644 index 0000000000..3af3a3c14a --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/lignite/raw_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/lignite/raw_ore_block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/metallic/raw_ore_block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/metallic/raw_ore_block.json new file mode 100644 index 0000000000..694a7326cd --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/metallic/raw_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/metallic/raw_ore_block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/netherstar/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/netherstar/block.json new file mode 100644 index 0000000000..95a50307fb --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/netherstar/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/netherstar/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/opal/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/opal/block.json new file mode 100644 index 0000000000..d07266f25d --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/opal/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/opal/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/block.json new file mode 100644 index 0000000000..ca47d20315 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/paper/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/frame_gt.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/frame_gt.json new file mode 100644 index 0000000000..9d7afc56ea --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/paper/frame_gt.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/paper/frame_gt" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/block.json new file mode 100644 index 0000000000..e4640b0b37 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/powder/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/frame_gt.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/frame_gt.json new file mode 100644 index 0000000000..65b9e86773 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/powder/frame_gt.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/powder/frame_gt" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/quartz/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/quartz/block.json new file mode 100644 index 0000000000..40b4e8486e --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/quartz/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/quartz/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/block.json new file mode 100644 index 0000000000..0231774f34 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/rough/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/raw_ore_block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/raw_ore_block.json new file mode 100644 index 0000000000..6c0c5a2c75 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/rough/raw_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/rough/raw_ore_block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/sand/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/sand/block.json new file mode 100644 index 0000000000..fe2e0c53a6 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/sand/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/sand/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/block.json new file mode 100644 index 0000000000..4a0a9c1327 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/shiny/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/raw_ore_block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/raw_ore_block.json new file mode 100644 index 0000000000..41b838992f --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/shiny/raw_ore_block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/shiny/raw_ore_block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/material_sets/wood/block.json b/common/src/main/resources/assets/gtceu/models/block/material_sets/wood/block.json new file mode 100644 index 0000000000..2c5239d93a --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/material_sets/wood/block.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:block/tinted_cube_all_0", + "textures": { + "all": "gtceu:block/material_sets/wood/block" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/block/tinted_cube_all_0.json b/common/src/main/resources/assets/gtceu/models/block/tinted_cube_all_0.json new file mode 100644 index 0000000000..d9165e3d51 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/block/tinted_cube_all_0.json @@ -0,0 +1,52 @@ +{ + "parent": "block/block", + "textures": { + "particle": "#all" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#all", + "cullface": "down", + "tintindex": 0 + }, + "up": { + "texture": "#all", + "cullface": "up", + "tintindex": 0 + }, + "north": { + "texture": "#all", + "cullface": "north", + "tintindex": 0 + }, + "south": { + "texture": "#all", + "cullface": "south", + "tintindex": 0 + }, + "west": { + "texture": "#all", + "cullface": "west", + "tintindex": 0 + }, + "east": { + "texture": "#all", + "cullface": "east", + "tintindex": 0 + } + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/bolt.json index baefd1744f..f1d45853bb 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/bolt.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/bolt.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/bolt", "textures": { - "layer1": "gtceu:item/material_sets/bright/bolt_overlay" + "layer2": "gtceu:item/material_sets/bright/bolt_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json_old similarity index 55% rename from common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json rename to common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json_old index 1767cea5ee..556d1f25a3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust.json_old @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/dust", "textures": { - "layer1": "gtceu:item/material_sets/bright/dust_overlay" + "layer2": "gtceu:item/material_sets/bright/dust_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json_old similarity index 56% rename from common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json rename to common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json_old index ac934ed977..255c8a68e0 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_small.json_old @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/dust_small", "textures": { - "layer1": "gtceu:item/material_sets/bright/dust_small_overlay" + "layer2": "gtceu:item/material_sets/bright/dust_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json_old similarity index 56% rename from common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json rename to common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json_old index 61c7b69999..ac3f02c691 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/dust_tiny.json_old @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/dust_tiny", "textures": { - "layer1": "gtceu:item/material_sets/bright/dust_tiny_overlay" + "layer2": "gtceu:item/material_sets/bright/dust_tiny_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/foil.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/foil.json new file mode 100644 index 0000000000..6cd2f46317 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/foil.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/foil", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/bright/foil_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear.json new file mode 100644 index 0000000000..b5c52bef9b --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/bright/gear", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/bright/gear_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear_small.json new file mode 100644 index 0000000000..e5aab3cf4e --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/gear_small.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/gear_small", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/bright/gear_small_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot.json index 1020a18c02..178a04dbe1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot.json @@ -1,6 +1,8 @@ { - "parent": "gtceu:item/material_sets/shiny/ingot", + "parent": "item/generated", "textures": { - "layer1": "gtceu:item/material_sets/bright/ingot_overlay" + "layer0": "gtceu:item/material_sets/bright/ingot", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/bright/ingot_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_double.json index 812eab9a85..53d5565a32 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_double.json @@ -1,6 +1,6 @@ { - "parent": "gtceu:item/material_sets/shiny/ingot_double", + "parent": "gtceu:item/material_sets/bright/ingot", "textures": { - "layer1": "gtceu:item/material_sets/bright/ingot_double_overlay" + "layer3": "gtceu:item/material_sets/dull/ingot_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_hot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_hot.json new file mode 100644 index 0000000000..e6be25277b --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/ingot_hot.json @@ -0,0 +1,7 @@ +{ + "parent": "gtceu:item/material_sets/bright/ingot", + "textures": { + "layer3": "gtceu:item/material_sets/dull/ingot_hot_overlay" + } +} + diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/nugget.json index 910b2889f6..a823f13b36 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/nugget.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/nugget.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/nugget", "textures": { - "layer1": "gtceu:item/material_sets/bright/nugget_overlay" + "layer2": "gtceu:item/material_sets/bright/nugget_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate.json index 4bcf7e1f7a..dea415a79c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate.json @@ -1,6 +1,8 @@ { - "parent": "gtceu:item/material_sets/shiny/plate", + "parent": "item/generated", "textures": { - "layer1": "gtceu:item/material_sets/bright/plate_overlay" + "layer0": "gtceu:item/material_sets/bright/plate", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/bright/plate_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_dense.json index 6a00b057c2..9bddf3b434 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_dense.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/plate_dense", "textures": { - "layer1": "gtceu:item/material_sets/bright/plate_dense_overlay" + "layer2": "gtceu:item/material_sets/bright/plate_dense_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_double.json index 8c086e0c4c..eb19e04fb7 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/plate_double.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/plate_double", "textures": { - "layer1": "gtceu:item/material_sets/bright/plate_double_overlay" + "layer2": "gtceu:item/material_sets/bright/plate_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod.json index cf9e5b321c..846ea867af 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/rod", "textures": { - "layer1": "gtceu:item/material_sets/bright/rod_overlay" + "layer2": "gtceu:item/material_sets/bright/rod_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod_long.json index 177289e8cb..807a96a053 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rod_long.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/rod_long", "textures": { - "layer1": "gtceu:item/material_sets/bright/rod_long_overlay" + "layer2": "gtceu:item/material_sets/bright/rod_long_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rotor.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rotor.json new file mode 100644 index 0000000000..1a5c69f06c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/rotor.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/rotor", + "textures": { + "layer2": "gtceu:item/material_sets/bright/rotor_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/round.json index 1a5fba98e5..d2ef2e2191 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/round.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/round.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/shiny/round", "textures": { - "layer1": "gtceu:item/material_sets/bright/round_overlay" + "layer2": "gtceu:item/material_sets/bright/round_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/screw.json new file mode 100644 index 0000000000..acf45d8aad --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/screw.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/screw", + "textures": { + "layer2": "gtceu:item/material_sets/bright/screw_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring.json new file mode 100644 index 0000000000..8567147df2 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/spring", + "textures": { + "layer2": "gtceu:item/material_sets/bright/spring_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring_small.json new file mode 100644 index 0000000000..3d4170fcee --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/spring_small.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/spring_small", + "textures": { + "layer2": "gtceu:item/material_sets/bright/spring_small_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/turbine_blade.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/turbine_blade.json new file mode 100644 index 0000000000..ea652a9668 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/turbine_blade.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/turbine_blade", + "textures": { + "layer2": "gtceu:item/material_sets/bright/turbine_blade_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/wire_fine.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/wire_fine.json new file mode 100644 index 0000000000..2ffdbdf0ee --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/bright/wire_fine.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/wire_fine", + "textures": { + "layer2": "gtceu:item/material_sets/bright/wire_fine_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/certus/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/certus/gem.json index db391164c7..fa33862453 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/certus/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/certus/gem.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/certus/gem", - "layer1": "gtceu:item/material_sets/certus/gem_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/certus/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/gem.json index 732746d546..3d763109eb 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/diamond/gem" + "layer0": "gtceu:item/material_sets/diamond/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/raw_ore.json index 0caea56adf..39bc845dac 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/raw_ore.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/diamond/raw_ore.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/diamond/raw_ore" + "layer0": "gtceu:item/material_sets/diamond/raw_ore", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/bolt.json index 5aa1fd9634..4874e27d5c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/bolt.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/bolt.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/bolt", - "layer1": "gtceu:item/material_sets/dull/bolt_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/bolt_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed.json index be2934897d..5a87cdcd51 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/crushed", - "layer1": "gtceu:item/material_sets/dull/crushed_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/crushed_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_purified.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_purified.json index 1071b76c50..4f00830ffb 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_purified.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_purified.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/crushed_purified" + "layer0": "gtceu:item/material_sets/dull/crushed", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_refined.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_refined.json index 0cbb29ade3..13bf6d8803 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_refined.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/crushed_refined.json @@ -1,6 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/crushed_refined" + "layer0": "gtceu:item/material_sets/dull/crushed_refined", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/crushed_refined_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust.json index e9f3f5478f..f1ea63cbea 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/dust" + "layer0": "gtceu:item/material_sets/dull/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_impure.json index d092d237b0..46faa7946e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_impure.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/dust_impure", - "layer1": "gtceu:item/material_sets/dull/dust_impure_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/dust_impure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_pure.json index 60a6150ced..c102468e8d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_pure.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/dust_pure", - "layer1": "gtceu:item/material_sets/dull/dust_pure_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/dust_pure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_small.json index 07442e3347..1b84daffe3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_small.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/dust_small" + "layer0": "gtceu:item/material_sets/dull/dust_small", + "layer1":"gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_tiny.json index 5ccc6f7bb7..f717511b40 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/dust_tiny.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/dust_tiny" + "layer0": "gtceu:item/material_sets/dull/dust_tiny", + "layer1":"gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/foil.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/foil.json index b5fc3fea3e..949f486806 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/foil.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/foil.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/foil", - "layer1": "gtceu:item/material_sets/dull/foil_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/foil_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear.json index ffaa9160de..ca1c3e8172 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gear", - "layer1": "gtceu:item/material_sets/dull/gear_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gear_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear_small.json index ff531aa9b3..66fe0d2f33 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gear_small.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gear_small", - "layer1": "gtceu:item/material_sets/dull/gear_small_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gear_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem.json index 7130a6a581..7668223862 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gem", - "layer1": "gtceu:item/material_sets/dull/gem_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_chipped.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_chipped.json index 9f4e54c0b3..d1c550fb6a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_chipped.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_chipped.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gem_chipped", - "layer1": "gtceu:item/material_sets/dull/gem_chipped_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gem_chipped_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_exquisite.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_exquisite.json index adb2724504..66ece0b825 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_exquisite.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_exquisite.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gem_exquisite", - "layer1": "gtceu:item/material_sets/dull/gem_exquisite_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gem_exquisite_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawed.json index d11db20e72..f6be2e2bc1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawed.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawed.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gem_flawed", - "layer1": "gtceu:item/material_sets/dull/gem_flawed_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gem_flawed_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawless.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawless.json index c48f6b1642..0c4e240af1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawless.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/gem_flawless.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/gem_flawless", - "layer1": "gtceu:item/material_sets/dull/gem_flawless_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/gem_flawless_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot.json index 1a582a353b..8a7474a560 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot.json @@ -1,6 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/ingot" + "layer0": "gtceu:item/material_sets/dull/ingot", + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/ingot_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_double.json index 61baecd6b8..a10ca09d78 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_double.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/dull/ingot", "textures": { - "layer0": "gtceu:item/material_sets/dull/ingot_double", - "layer1": "gtceu:item/material_sets/dull/ingot_double_overlay" + "layer3": "gtceu:item/material_sets/dull/ingot_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_hot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_hot.json index 3978f678d0..240688d43e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_hot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ingot_hot.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/dull/ingot", "textures": { - "layer0": "gtceu:item/material_sets/dull/ingot_hot", - "layer1": "gtceu:item/material_sets/dull/ingot_hot_overlay" + "layer3": "gtceu:item/material_sets/dull/ingot_hot_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/lens.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/lens.json index 80c0257bc9..31351ef235 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/lens.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/lens.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/lens", - "layer1": "gtceu:item/material_sets/dull/lens_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/lens_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/nugget.json index f392bbbef6..8eca54339e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/nugget.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/nugget.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/nugget" + "layer0": "gtceu:item/material_sets/dull/nugget", + "layer1":"gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate.json index 3b821fdc1e..308257b240 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/plate", - "layer1": "gtceu:item/material_sets/dull/plate_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/plate_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_dense.json index 239a11cccc..0d7a1f07a0 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_dense.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/plate_dense", - "layer1": "gtceu:item/material_sets/dull/plate_dense_overlay" + "layer1":"gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/plate_dense_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_double.json index beb53c1ebe..80d9894510 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/plate_double.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/dull/plate", "textures": { - "layer0": "gtceu:item/material_sets/dull/plate_double", - "layer1": "gtceu:item/material_sets/dull/plate_double_overlay" + "layer3": "gtceu:item/material_sets/dull/plate_double_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/raw_ore.json index aa9a257804..bfa711b824 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/raw_ore.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/raw_ore.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/raw_ore" + "layer0": "gtceu:item/material_sets/dull/raw_ore", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ring.json index d355a6c4b5..1ffb357934 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ring.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/ring.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/ring", - "layer1": "gtceu:item/material_sets/dull/ring_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/ring_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod.json index deca8d2cb5..82f92f3246 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/dull/rod" + "layer0": "gtceu:item/material_sets/dull/rod", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod_long.json index f06fe00981..7347127f24 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rod_long.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/dull/rod_long" + "layer0": "gtceu:item/material_sets/dull/rod_long", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rotor.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rotor.json index cb4a08d1f0..925a9e059d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rotor.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/rotor.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/rotor", - "layer1": "gtceu:item/material_sets/dull/rotor_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/rotor_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/round.json index 5e38b7b1fb..4dab21f32f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/round.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/round.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/round" + "layer0": "gtceu:item/material_sets/dull/round", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/screw.json index cc64c03c92..db18c6b01c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/screw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/screw.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/screw", - "layer1": "gtceu:item/material_sets/dull/screw_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/screw_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring.json index 745360b564..67f4281493 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/spring", - "layer1": "gtceu:item/material_sets/dull/spring_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/spring_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring_small.json index 424ae60a0a..e32983d7a1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/spring_small.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/spring_small", - "layer1": "gtceu:item/material_sets/dull/spring_small_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/spring_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_buzz_saw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_buzz_saw.json index 4e81044424..2f0b0413b7 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_buzz_saw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_buzz_saw.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/tool_head_buzz_saw", - "layer1": "gtceu:item/material_sets/dull/tool_head_buzz_saw_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_buzz_saw_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_chainsaw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_chainsaw.json index ce1b4f6c8c..13eb2e4552 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_chainsaw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_chainsaw.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/tool_head_chainsaw" + "layer0": "gtceu:item/material_sets/dull/tool_head_chainsaw", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_drill.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_drill.json index eb2bbaada9..24cb4e07b5 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_drill.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_drill.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/dull/tool_head_drill" + "layer0": "gtceu:item/material_sets/dull/tool_head_drill", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_screwdriver.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_screwdriver.json index 5e1efb69a0..860428f302 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_screwdriver.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_screwdriver.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/tool_head_screwdriver", - "layer1": "gtceu:item/material_sets/dull/tool_head_screwdriver_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_screwdriver_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_wrench.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_wrench.json index 846c509edb..b3e9a7b948 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_wrench.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/tool_head_wrench.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/tool_head_wrench", - "layer1": "gtceu:item/material_sets/dull/tool_head_wrench_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_wrench_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/turbine_blade.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/turbine_blade.json index 626ac133f7..d74db505fb 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/turbine_blade.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/turbine_blade.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/turbine_blade", - "layer1": "gtceu:item/material_sets/dull/turbine_blade_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/turbine_blade_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/wire_fine.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/wire_fine.json index 4abd8926c7..bad0ffb1e7 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/wire_fine.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/dull/wire_fine.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/dull/wire_fine", - "layer1": "gtceu:item/material_sets/dull/wire_fine_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/wire_fine_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/emerald/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/emerald/gem.json index 14120db704..ffd7639d99 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/emerald/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/emerald/gem.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/emerald/gem", - "layer1": "gtceu:item/material_sets/emerald/gem_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/emerald/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust.json index 0d1f0e66f8..5f4c454c8f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/fine/dust" + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_impure.json index 96ff0a4349..6974aad84b 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_impure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/dull/dust_impure", "textures": { - "layer0": "gtceu:item/material_sets/fine/dust" + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_pure.json index cef88114fc..f81bf929bc 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_pure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/dull/dust_pure", "textures": { - "layer0": "gtceu:item/material_sets/fine/dust" + "layer0": "gtceu:item/material_sets/fine/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_small.json index 2ad2c17bb6..e1ec92ef29 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_small.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/fine/dust_small" + "layer0": "gtceu:item/material_sets/fine/dust_small", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_tiny.json index b101260188..8c70984cb3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/dust_tiny.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/fine/dust_tiny" + "layer0": "gtceu:item/material_sets/fine/dust_tiny", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem.json deleted file mode 100644 index 9d3a6bda29..0000000000 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/fine/gem", - "layer1": "gtceu:item/material_sets/fine/gem_overlay" - } -} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_chipped.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_chipped.json deleted file mode 100644 index a7fffb3d0a..0000000000 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_chipped.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/fine/gem_chipped", - "layer1": "gtceu:item/material_sets/fine/gem_chipped_overlay" - } -} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_flawed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_flawed.json deleted file mode 100644 index 1755ef432a..0000000000 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/gem_flawed.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/fine/gem_flawed", - "layer1": "gtceu:item/material_sets/fine/gem_flawed_overlay" - } -} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/raw_ore.json index 7b7a3d6534..c795e6b909 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/raw_ore.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/fine/raw_ore.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/fine/raw_ore" + "layer0": "gtceu:item/material_sets/fine/raw_ore", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/flint/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/flint/gem.json index 3635563b38..6f3b10fa62 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/flint/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/flint/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/flint/gem" + "layer0": "gtceu:item/material_sets/flint/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_horizontal/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_horizontal/gem.json index 2b2e4dc2d3..9d4f7447f4 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_horizontal/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_horizontal/gem.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/gem_horizontal/gem", - "layer1": "gtceu:item/material_sets/gem_horizontal/gem_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/gem_horizontal/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_vertical/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_vertical/gem.json index 544f1817d8..2d420456f5 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_vertical/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/gem_vertical/gem.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/gem_vertical/gem", - "layer1": "gtceu:item/material_sets/gem_vertical/gem_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/gem_vertical/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/lapis/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/lapis/gem.json index 6a88011724..29e5bd9308 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/lapis/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/lapis/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/lapis/gem" + "layer0": "gtceu:item/material_sets/lapis/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/lignite/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/lignite/gem.json index 4b38549616..4d4c4b585a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/lignite/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/lignite/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/lignite/gem" + "layer0": "gtceu:item/material_sets/lignite/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/bolt.json index 27c1d54ebc..e4dff1b89f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/bolt.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/bolt.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/bolt", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed.json index 9a9ab8a545..aa09ced82d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/crushed", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/crushed_overlay" + "layer2": "gtceu:item/material_sets/magnetic/crushed_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_purified.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_purified.json index 1c9a072858..42c617366a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_purified.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_purified.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/crushed_purified", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_refined.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_refined.json index fcc665b3a7..e67257dd6b 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_refined.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/crushed_refined.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/crushed_refined", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust.json index 2c5e35e8fc..68ba560c53 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/dust", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_impure.json index a119e3dadb..7e46c57276 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_impure.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/dust_impure", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/dust_impure_overlay" + "layer2": "gtceu:item/material_sets/magnetic/dust_impure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_pure.json index 41191fb594..e8e26b5690 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_pure.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/dust_pure", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/dust_pure_overlay" + "layer2": "gtceu:item/material_sets/magnetic/dust_pure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_small.json index 10992a180f..9fd31ada76 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_small.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/dust_small", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_tiny.json index d238585ba3..a4a22f1dd6 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/dust_tiny.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/dust_tiny", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/foil.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/foil.json index 3dc08a7ecf..fd56accfd9 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/foil.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/foil.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/foil", "textures": { - "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear.json index d29acb3d58..8282c9870f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gear", "textures": { - "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear_small.json index 02160bb557..20060537ba 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gear_small.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gear_small", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem.json index e0bd117609..e5c32a857e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gem", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_chipped.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_chipped.json index a3872d7ad4..2c2e82035a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_chipped.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_chipped.json @@ -1,7 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gem_chipped", "textures": { - "layer0": "gtceu:item/material_sets/magnetic/gem_chipped", - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_exquisite.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_exquisite.json index fd491e42cc..1389cb7551 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_exquisite.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_exquisite.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gem_exquisite", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawed.json index 88624e68b7..02bac3ab69 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawed.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawed.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gem_flawed", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawless.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawless.json index 6131cc86c2..0a138014b3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawless.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/gem_flawless.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/gem_flawless", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot.json index 69b0ec8b65..1723f14349 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/ingot", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot_double.json index e5fd870b09..c52d4726fa 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/ingot_double.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/ingot_double", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/lens.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/lens.json index c2e22c4922..7d639dc01e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/lens.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/lens.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/lens", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/lens_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/nugget.json index e7f6c9083b..815a8a0dde 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/nugget.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/nugget.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/nugget", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate.json index df52e3509c..f5e31da4ad 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/plate", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_dense.json index 56f71fee33..39ccc74c55 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_dense.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/plate_dense", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_double.json index 14bf2fb45d..7c8573b187 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/plate_double.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/plate_double", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer4": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod.json index 0e42446535..dd9b9ec435 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/rod", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod_long.json index 2182e33003..e2f1e93d6a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rod_long.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/rod_long", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rotor.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rotor.json index 9a10f64832..2a26332a3d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rotor.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/rotor.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/rotor", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/round.json index 38112c25a7..6fdb95b5ea 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/round.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/round.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/round", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/screw.json index 68213de78d..1d34d13fd1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/screw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/screw.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/metallic/screw", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer3": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring.json index fda495884c..63d80b22b2 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/spring", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring_small.json index 9bdbfb84c4..aa256d4b02 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/spring_small.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/spring_small", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_axe.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_axe.json index 3d3b9f320e..fe08a252e0 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_axe.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_axe.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_axe", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_buzz_saw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_buzz_saw.json index f1ec83e8fe..d339aecf51 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_buzz_saw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_buzz_saw.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_buzz_saw", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_chainsaw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_chainsaw.json index 946fe6501c..a06c4e5fb1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_chainsaw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_chainsaw.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_chainsaw", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_drill.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_drill.json index 9da3f633ca..ff302c9589 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_drill.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_drill.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_drill", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_file.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_file.json index d96b6541a3..d61425585e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_file.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_file.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_file", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hammer.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hammer.json index 92e5d4387d..9dda2bddd3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hammer.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hammer.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_hammer", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hoe.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hoe.json index b1e574f67e..10ed083656 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hoe.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_hoe.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_hoe", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_mallet.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_mallet.json index 11392e26a3..0f5775bd68 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_mallet.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_mallet.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_mallet", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_pickaxe.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_pickaxe.json index f7e8361466..d3997efc4a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_pickaxe.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_pickaxe", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_saw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_saw.json index fe813e6ef3..d3b7375031 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_saw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_saw.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_saw", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_screwdriver.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_screwdriver.json index 417aad60fc..8fb033b024 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_screwdriver.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_screwdriver.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_screwdriver", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_scythe.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_scythe.json index 094c3a3590..fd7a08e4c9 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_scythe.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_scythe.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_scythe", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_shovel.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_shovel.json index c8d6ad924f..f9bed2b838 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_shovel.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_shovel.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_shovel", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_sword.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_sword.json index 09d41fd99c..10c6c2daeb 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_sword.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_sword.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_sword", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_wrench.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_wrench.json index 701db4d9d7..3a1f010a55 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_wrench.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/tool_head_wrench.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/tool_head_wrench", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/turbine_blade.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/turbine_blade.json index dffd60beee..1d7cd492ce 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/turbine_blade.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/turbine_blade.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/turbine_blade", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/magnetic_overlay" + "layer2": "gtceu:item/material_sets/magnetic/magnetic_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/wire_fine.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/wire_fine.json index dff539b130..a4ecb2face 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/wire_fine.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/magnetic/wire_fine.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/dull/wire_fine", "textures": { - "layer1": "gtceu:item/material_sets/magnetic/wire_fine_overlay" + "layer2": "gtceu:item/material_sets/magnetic/wire_fine_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/bolt.json index 69dda457ff..bcfac02418 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/bolt.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/bolt.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/bolt" + "layer0": "gtceu:item/material_sets/metallic/bolt", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust.json index 988d40882d..64e0c21f12 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/dust" + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_impure.json index 2e6583ba91..506eaceb59 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_impure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/dull/dust_impure", "textures": { - "layer0": "gtceu:item/material_sets/metallic/dust" + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_pure.json index ffe66e687c..f716d67d97 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_pure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/dull/dust_pure", "textures": { - "layer0": "gtceu:item/material_sets/metallic/dust" + "layer0": "gtceu:item/material_sets/metallic/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_small.json index 481b9f9964..ea45465d4a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_small.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/dust_small" + "layer0": "gtceu:item/material_sets/metallic/dust_small", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_tiny.json index 88ede58468..b0b240e60d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/dust_tiny.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/dust_tiny" + "layer0": "gtceu:item/material_sets/metallic/dust_tiny", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot.json index 0f7e3f158d..374a263f2c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot.json @@ -1,6 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/ingot" + "layer0": "gtceu:item/material_sets/metallic/ingot", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/metallic/ingot_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_double.json index 5551dce51e..c94b464171 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_double.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/metallic/ingot", "textures": { - "layer0": "gtceu:item/material_sets/metallic/ingot_double" + "layer3": "gtceu:item/material_sets/metallic/ingot_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_hot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_hot.json new file mode 100644 index 0000000000..ac0a761f0c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/ingot_hot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot", + "textures": { + "layer3": "gtceu:item/material_sets/dull/ingot_hot_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/nugget.json index 5c901a76b2..2fba668d01 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/nugget.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/nugget.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/nugget" + "layer0": "gtceu:item/material_sets/metallic/nugget", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate.json index de42fe05b0..9f0155a9ae 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/metallic/plate", - "layer1": "gtceu:item/material_sets/shiny/plate_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/metallic/plate_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_dense.json index f3fa0c9b5e..f1d411605a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_dense.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/plate_dense" + "layer0": "gtceu:item/material_sets/metallic/plate_dense", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_double.json index 79c386c329..44d58ce010 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/plate_double.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/metallic/plate", "textures": { - "layer0": "gtceu:item/material_sets/metallic/plate_double", - "layer1": "gtceu:item/material_sets/metallic/plate_double_overlay" + "layer3": "gtceu:item/material_sets/metallic/plate_double_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/raw_ore.json index 1372e9e8e4..81832d4897 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/raw_ore.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/raw_ore.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/raw_ore" + "layer0": "gtceu:item/material_sets/metallic/raw_ore", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod.json index 0a67d63b5d..919a539e39 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/metallic/rod" + "layer0": "gtceu:item/material_sets/metallic/rod", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod_long.json index 6022768dc1..55d9137730 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/rod_long.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/metallic/rod_long" + "layer0": "gtceu:item/material_sets/metallic/rod_long", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/round.json index b93c0c9ebe..f0775a2107 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/round.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/round.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/metallic/round" + "layer0": "gtceu:item/material_sets/metallic/round", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/screw.json index d4219170ca..b1be56343f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/screw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/metallic/screw.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/metallic/screw", - "layer1": "gtceu:item/material_sets/shiny/screw_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/screw_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/netherstar/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/netherstar/gem.json index 3a443470cb..8e723870e6 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/netherstar/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/netherstar/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/netherstar/gem" + "layer0": "gtceu:item/material_sets/netherstar/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/opal/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/opal/gem.json index f5df71d205..9cdeceba17 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/opal/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/opal/gem.json @@ -1,6 +1,6 @@ { "parent": "gtceu:item/material_sets/ruby/gem", "textures": { - "layer1": "gtceu:item/material_sets/opal/gem_overlay" + "layer2": "gtceu:item/material_sets/opal/gem_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust.json index 57e8c2cedb..7cdedabdee 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/quartz/dust" + "layer0": "gtceu:item/material_sets/quartz/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_impure.json index 67a7c54015..eb95221f3e 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_impure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/rough/dust_impure", "textures": { - "layer0": "gtceu:item/material_sets/quartz/dust" + "layer0": "gtceu:item/material_sets/quartz/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_pure.json index 9fb4339d3c..5402ad4e29 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_pure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/rough/dust_pure", "textures": { - "layer0": "gtceu:item/material_sets/quartz/dust" + "layer0": "gtceu:item/material_sets/quartz/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_small.json index f7f86dfddf..302eca01e5 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_small.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/quartz/dust_small" + "layer0": "gtceu:item/material_sets/quartz/dust_small", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_tiny.json index 353eea11b9..96d88dd52d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/dust_tiny.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/quartz/dust_tiny" + "layer0": "gtceu:item/material_sets/quartz/dust_tiny", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/gem.json index fcf8b5d137..759eb55efd 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/quartz/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/quartz/gem" + "layer0": "gtceu:item/material_sets/quartz/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/bolt.json new file mode 100644 index 0000000000..bee1f15258 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/bolt.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/bolt", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed.json new file mode 100644 index 0000000000..f076aabc54 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/crushed", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_purified.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_purified.json new file mode 100644 index 0000000000..9ff9efab1c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_purified.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/crushed_purified", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_refined.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_refined.json new file mode 100644 index 0000000000..04139776a6 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/crushed_refined.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/crushed_refined", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust.json new file mode 100644 index 0000000000..a397f744f0 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/dust", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_impure.json new file mode 100644 index 0000000000..d626fb4dee --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_impure.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/dust_impure", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_pure.json new file mode 100644 index 0000000000..34ecb594bb --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_pure.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/dust_pure", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_small.json new file mode 100644 index 0000000000..6e9abb9bdb --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_small.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/dust_small", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_tiny.json new file mode 100644 index 0000000000..c584dfacba --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/dust_tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/dust_tiny", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/foil.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/foil.json new file mode 100644 index 0000000000..7fad811c80 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/foil.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/foil", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear.json new file mode 100644 index 0000000000..6d9d805f96 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/gear", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear_small.json new file mode 100644 index 0000000000..0326a83dc2 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gear_small.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/gear_small", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem.json new file mode 100644 index 0000000000..496730128c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/gem", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_chipped.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_chipped.json new file mode 100644 index 0000000000..6bda605697 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_chipped.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/gem_chipped", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_exquisite.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_exquisite.json new file mode 100644 index 0000000000..15fa22f992 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_exquisite.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/gem_exquisite", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawed.json new file mode 100644 index 0000000000..4da8976b6c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawed.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/gem_flawed", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawless.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawless.json new file mode 100644 index 0000000000..1a16cbcbe3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/gem_flawless.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/gem_flawless", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot.json new file mode 100644 index 0000000000..cd2b981e79 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_double.json new file mode 100644 index 0000000000..323c867bb5 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_double.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ingot_double", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json new file mode 100644 index 0000000000..26502f1e09 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ingot_hot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/ingot_hot", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/lens.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/lens.json new file mode 100644 index 0000000000..16b9897cf9 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/lens.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/lens", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/nugget.json new file mode 100644 index 0000000000..d3f9aa62ab --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/nugget", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate.json new file mode 100644 index 0000000000..1d5e06f6c3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/plate", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_dense.json new file mode 100644 index 0000000000..4484ac364f --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_dense.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/plate_dense", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_double.json new file mode 100644 index 0000000000..ac37c13a8b --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/plate_double.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/plate_double", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/raw_ore.json new file mode 100644 index 0000000000..ebe6141c23 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/raw_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/raw_ore", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ring.json new file mode 100644 index 0000000000..4d62bc2734 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/ring.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/ring", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod.json new file mode 100644 index 0000000000..a1c8c0f9f3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/rod", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod_long.json new file mode 100644 index 0000000000..17483ac0be --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rod_long.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/rod_long", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rotor.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rotor.json new file mode 100644 index 0000000000..27ee6c74b9 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/rotor.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/rotor", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/round.json new file mode 100644 index 0000000000..2f32883346 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/round.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/round", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/screw.json new file mode 100644 index 0000000000..8a6470cea5 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/screw.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/metallic/screw", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring.json new file mode 100644 index 0000000000..5e35640537 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/spring", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring_small.json new file mode 100644 index 0000000000..7eebb5a6c5 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/spring_small.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/spring_small", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_buzz_saw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_buzz_saw.json new file mode 100644 index 0000000000..b7df0720c3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_buzz_saw.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/tool_head_buzz_saw", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_chainsaw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_chainsaw.json new file mode 100644 index 0000000000..575c7f5361 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_chainsaw.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/tool_head_chainsaw", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_drill.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_drill.json new file mode 100644 index 0000000000..454ba46e7c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/tool_head_drill", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_screwdriver.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_screwdriver.json new file mode 100644 index 0000000000..85bd317f13 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_screwdriver.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/tool_head_screwdriver", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_wrench.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_wrench.json new file mode 100644 index 0000000000..2c6a0472e3 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/tool_head_wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/tool_head_wrench", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/turbine_blade.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/turbine_blade.json new file mode 100644 index 0000000000..397d8d7ab5 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/turbine_blade.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/turbine_blade", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/wire_fine.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/wire_fine.json new file mode 100644 index 0000000000..66d0441f8d --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/radioactive/wire_fine.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/dull/wire_fine", + "textures": { + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust.json index 411c37097c..0ea75fbcc9 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/dust" + "layer0": "gtceu:item/material_sets/rough/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_impure.json index 3f0e6f04b0..b1a93d5500 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_impure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/fine/dust_impure", "textures": { - "layer0": "gtceu:item/material_sets/rough/dust" + "layer0": "gtceu:item/material_sets/rough/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_pure.json index 14a2daaac5..f8acfcdfd1 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_pure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/fine/dust_pure", "textures": { - "layer0": "gtceu:item/material_sets/rough/dust" + "layer0": "gtceu:item/material_sets/rough/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_small.json index 5bd4e13216..8c2a453f32 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_small.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/dust_small" + "layer0": "gtceu:item/material_sets/rough/dust_small", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_tiny.json index 8e08623a08..7745501921 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/dust_tiny.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/dust_tiny" + "layer0": "gtceu:item/material_sets/rough/dust_tiny", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear.json index 96c49780ea..17bb682d70 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/gear" + "layer0": "gtceu:item/material_sets/rough/gear", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear_small.json new file mode 100644 index 0000000000..6de88ff5f4 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/gear_small.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/rough/gear_small", + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/ingot.json new file mode 100644 index 0000000000..c96d2cfce4 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/ingot.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/rough/ingot", + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate.json index 6e8dd42f5c..e0c50bece6 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate.json @@ -1,6 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/plate" + "layer0": "gtceu:item/material_sets/rough/plate", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/rough/plate_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_dense.json index 4b6ac55c84..4ecb4080bd 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_dense.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/rough/plate_dense" + "layer0": "gtceu:item/material_sets/rough/plate_dense", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_double.json index 469772b713..e04d4b4a1a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/rough/plate_double.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/rough/plate", "textures": { - "layer0": "gtceu:item/material_sets/rough/plate_double" + "layer3": "gtceu:item/material_sets/dull/plate_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/ruby/gem.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/ruby/gem.json index c9efa44d1f..2f302c548b 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/ruby/gem.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/ruby/gem.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/ruby/gem" + "layer0": "gtceu:item/material_sets/ruby/gem", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed.json index afdab23a7f..491cab0936 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed.json @@ -1,7 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/sand/crushed", - "layer1": "gtceu:item/material_sets/sand/crushed_overlay" + "layer0": "gtceu:item/material_sets/dull/crushed", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/crushed_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_purified.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_purified.json index c6053f9068..578abbfc93 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_purified.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_purified.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/sand/crushed_purified" + "layer0": "gtceu:item/material_sets/dull/crushed_purified", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_refined.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_refined.json deleted file mode 100644 index 9326cd51f3..0000000000 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/crushed_refined.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/sand/crushed_refined" - } -} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust.json index 35f7f6c73c..068c8a3833 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/sand/dust", - "layer1": "gtceu:item/material_sets/sand/dust_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/dust_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_impure.json index daafc738f0..c2a56a728f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_impure.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/sand/dust_impure", - "layer1": "gtceu:item/material_sets/sand/dust_impure_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/dust_impure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_pure.json index a83ca109d7..64be07a70f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_pure.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/sand/dust_pure", - "layer1": "gtceu:item/material_sets/sand/dust_pure_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/dust_pure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_small.json index 736d5bdee2..5b362c68f7 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_small.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/sand/dust_small", - "layer1": "gtceu:item/material_sets/sand/dust_small_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/dust_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_tiny.json index f250e1ab96..37d820d73b 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/sand/dust_tiny.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/sand/dust_tiny", - "layer1": "gtceu:item/material_sets/sand/dust_tiny_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/sand/dust_tiny_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/bolt.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/bolt.json index 53458e6ef4..0a3fb94147 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/bolt.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/bolt.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/bolt", - "layer1": "gtceu:item/material_sets/shiny/bolt_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/bolt_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/crushed_refined.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/crushed_refined.json new file mode 100644 index 0000000000..b1abb0e026 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/crushed_refined.json @@ -0,0 +1,9 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/crushed_refined", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/crushed_refined_overlay", + "layer3": "gtceu:item/material_sets/dull/crushed_refined_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust.json index 8c29ade669..7945df7d7c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/dust", - "layer1": "gtceu:item/material_sets/shiny/dust_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/dust_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_impure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_impure.json index 730d5bda2e..c8d058efc0 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_impure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_impure.json @@ -1,6 +1,7 @@ { "parent": "gtceu:item/material_sets/dull/dust_impure", "textures": { - "layer0": "gtceu:item/material_sets/shiny/dust" + "layer0": "gtceu:item/material_sets/shiny/dust", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_pure.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_pure.json index 5e81414981..54491d6db3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_pure.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_pure.json @@ -1,6 +1,9 @@ { - "parent": "gtceu:item/material_sets/dull/dust_pure", + "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/shiny/dust" + "layer0": "gtceu:item/material_sets/shiny/dust", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/dust_overlay", + "layer3": "gtceu:item/material_sets/dull/dust_pure_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_small.json index 431d8ef4d8..f1f6496800 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_small.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/dust_small", - "layer1": "gtceu:item/material_sets/shiny/dust_small_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/dust_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_tiny.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_tiny.json index f7fd6d0fe4..84f4d5d5c9 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_tiny.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/dust_tiny.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/dust_tiny", - "layer1": "gtceu:item/material_sets/shiny/dust_tiny_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/dust_tiny_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/foil.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/foil.json new file mode 100644 index 0000000000..334036179d --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/foil.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/foil", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/foil_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear.json index 4d2c2c5269..edbebd0618 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/gear", - "layer1": "gtceu:item/material_sets/shiny/gear_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/gear_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear_small.json index 497ce8e533..827e22fc95 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear_small.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/gear_small.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/gear_small", - "layer1": "gtceu:item/material_sets/shiny/gear_small_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/gear_small_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot.json index b251e3ec2c..f88c76201f 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/ingot", - "layer1": "gtceu:item/material_sets/shiny/ingot_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/ingot_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_double.json index 04de05561e..589469e92a 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_double.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/shiny/ingot", "textures": { - "layer0": "gtceu:item/material_sets/shiny/ingot_double", - "layer1": "gtceu:item/material_sets/shiny/ingot_double_overlay" + "layer3": "gtceu:item/material_sets/shiny/ingot_double_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_hot.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_hot.json new file mode 100644 index 0000000000..9dab759ec9 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ingot_hot.json @@ -0,0 +1,6 @@ +{ + "parent": "gtceu:item/material_sets/shiny/ingot", + "textures": { + "layer3": "gtceu:item/material_sets/dull/ingot_hot_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/nugget.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/nugget.json index 34525223a1..6cd86c5879 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/nugget.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/nugget.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/nugget", - "layer1": "gtceu:item/material_sets/shiny/nugget_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/nugget_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate.json index 56b7b01384..44293650ec 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/plate", - "layer1": "gtceu:item/material_sets/shiny/plate_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/plate_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_dense.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_dense.json index 68ae23513d..4949fa5166 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_dense.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_dense.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/plate_dense", - "layer1": "gtceu:item/material_sets/shiny/plate_dense_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/plate_dense_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_double.json index 21879a8e03..f194404107 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/plate_double.json @@ -1,7 +1,6 @@ { - "parent": "item/generated", + "parent": "gtceu:item/material_sets/shiny/plate", "textures": { - "layer0": "gtceu:item/material_sets/shiny/plate_double", - "layer1": "gtceu:item/material_sets/shiny/plate_double_overlay" + "layer3": "gtceu:item/material_sets/shiny/plate_double_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/raw_ore.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/raw_ore.json index 8d839b779e..e895acc8d3 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/raw_ore.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/raw_ore.json @@ -1,6 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/shiny/raw_ore" + "layer0": "gtceu:item/material_sets/shiny/raw_ore", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/raw_ore_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ring.json index 1f20ce0000..2292edf353 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ring.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/ring.json @@ -1,6 +1,8 @@ { - "parent": "gtceu:item/material_sets/dull/ring", + "parent": "item/generated", "textures": { - "layer2": "gtceu:item/material_sets/shiny/ring_overlay" + "layer0": "gtceu:item/material_sets/shiny/ring", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/ring_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod.json index f9067e7d15..8ca5f62a24 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod.json @@ -2,6 +2,7 @@ "parent": "item/handheld", "textures": { "layer0": "gtceu:item/material_sets/shiny/rod", - "layer1": "gtceu:item/material_sets/shiny/rod_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/rod_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod_long.json index d396a0e573..833701c081 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rod_long.json @@ -2,6 +2,7 @@ "parent": "item/handheld", "textures": { "layer0": "gtceu:item/material_sets/shiny/rod_long", - "layer1": "gtceu:item/material_sets/shiny/rod_long_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/rod_long_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rotor.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rotor.json new file mode 100644 index 0000000000..e3b849c59c --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/rotor.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/rotor", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/rotor_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/round.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/round.json index f3878af766..7a6e2e1fa8 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/round.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/round.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/round", - "layer1": "gtceu:item/material_sets/shiny/round_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/round_overlay" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/screw.json index 23ea7d5c39..2f315db384 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/screw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/screw.json @@ -2,6 +2,7 @@ "parent": "item/generated", "textures": { "layer0": "gtceu:item/material_sets/shiny/screw", - "layer1": "gtceu:item/material_sets/shiny/screw_overlay" + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/screw_overlay" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring.json new file mode 100644 index 0000000000..30a057faf9 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/spring", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/spring_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring_small.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring_small.json new file mode 100644 index 0000000000..a6cb7c3cd7 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/spring_small.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/spring_small", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/spring_small_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_buzz_saw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_buzz_saw.json new file mode 100644 index 0000000000..77c8729aae --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_buzz_saw.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/tool_head_buzz_saw", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_buzz_saw_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_chainsaw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_chainsaw.json new file mode 100644 index 0000000000..058069bb9f --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_chainsaw.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/tool_head_chainsaw", + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_drill.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_drill.json new file mode 100644 index 0000000000..3bb263452e --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_drill.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/tool_head_drill", + "layer1": "gtceu:item/material_sets/blank" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_screwdriver.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_screwdriver.json new file mode 100644 index 0000000000..2598bbe233 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_screwdriver.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/tool_head_screwdriver", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_screwdriver_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_wrench.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_wrench.json new file mode 100644 index 0000000000..04ad7bb7bb --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/tool_head_wrench.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/tool_head_wrench", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/tool_head_wrench_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/turbine_blade.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/turbine_blade.json new file mode 100644 index 0000000000..94409dd839 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/turbine_blade.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/turbine_blade", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/shiny/turbine_blade_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/wire_fine.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/wire_fine.json new file mode 100644 index 0000000000..db0623e535 --- /dev/null +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/shiny/wire_fine.json @@ -0,0 +1,9 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/shiny/wire_fine", + "layer1": "gtceu:item/material_sets/blank", + "layer2": "gtceu:item/material_sets/dull/wire_fine_overlay", + "layer3": "gtceu:item/material_sets/shiny/wire_fine_overlay" + } +} diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/gear.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/gear.json index f44a28aa81..8398aaff5d 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/gear.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/gear.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/wood/gear" + "layer0": "gtceu:item/material_sets/wood/gear", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate.json index 4144760c0d..7b8139ddd6 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/wood/plate" + "layer0": "gtceu:item/material_sets/wood/plate", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate_double.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate_double.json index 3bba592567..6835bf2692 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate_double.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/plate_double.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/wood/plate_double" + "layer0": "gtceu:item/material_sets/wood/plate_double", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod.json index b6bff551cc..dcfac5100c 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/wood/rod" + "layer0": "gtceu:item/material_sets/wood/rod", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod_long.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod_long.json index e0d62669d5..9bd3c9b2e6 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod_long.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/rod_long.json @@ -1,6 +1,7 @@ { "parent": "item/handheld", "textures": { - "layer0": "gtceu:item/material_sets/wood/rod_long" + "layer0": "gtceu:item/material_sets/wood/rod_long", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/screw.json b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/screw.json index 4f10634a3e..2e7273daab 100644 --- a/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/screw.json +++ b/common/src/main/resources/assets/gtceu/models/item/material_sets/wood/screw.json @@ -1,6 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gtceu:item/material_sets/wood/screw" + "layer0": "gtceu:item/material_sets/wood/screw", + "layer1": "gtceu:item/material_sets/blank" } } diff --git a/common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire.png b/common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire_end.png similarity index 100% rename from common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire.png rename to common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire_end.png diff --git a/common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire_side.png b/common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire_side.png new file mode 100644 index 0000000000..9f4a113ae5 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/block/material_sets/dull/wire_side.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/insert_first.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/insert_first.png new file mode 100644 index 0000000000..ac21c22741 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/insert_first.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_global.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_global.png new file mode 100644 index 0000000000..e6c3238105 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_global.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_prio.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_prio.png new file mode 100644 index 0000000000..bbce291f33 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/distribution_mode/round_robin_prio.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/disabled.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/disabled.png new file mode 100644 index 0000000000..7eb473b482 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/disabled.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/filtered.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/filtered.png new file mode 100644 index 0000000000..b285b1735e Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/filtered.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/unfiltered.png b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/unfiltered.png new file mode 100644 index 0000000000..6225a2c8fc Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/gui/icon/manual_io_mode/unfiltered.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/gui/widget/button_distribution_mode.png b/common/src/main/resources/assets/gtceu/textures/gui/widget/button_distribution_mode.png index 86f6a27bd5..9b56d45cc3 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/gui/widget/button_distribution_mode.png and b/common/src/main/resources/assets/gtceu/textures/gui/widget/button_distribution_mode.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/blank.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/blank.png new file mode 100644 index 0000000000..554966f4ee Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/blank.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/foil_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/foil_overlay.png new file mode 100644 index 0000000000..12ba21a2b5 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/foil_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear.png new file mode 100644 index 0000000000..08739a128e Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_overlay.png new file mode 100644 index 0000000000..78fb262e9c Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_small_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_small_overlay.png new file mode 100644 index 0000000000..914af922a6 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/gear_small_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot.png new file mode 100644 index 0000000000..94b1f273b8 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot_overlay.png index 867331e5cb..35488b4582 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/ingot_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate.png new file mode 100644 index 0000000000..0c99058ca0 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate_overlay.png index 45c01846d6..89a4537a39 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/plate_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/rotor_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/rotor_overlay.png new file mode 100644 index 0000000000..42a612c3e9 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/rotor_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/screw_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/screw_overlay.png index 82bcbdbf34..a28fa38b46 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/screw_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/screw_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_overlay.png new file mode 100644 index 0000000000..b731a7344c Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_small_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_small_overlay.png new file mode 100644 index 0000000000..0d35d612a5 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/spring_small_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/turbine_blade_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/turbine_blade_overlay.png new file mode 100644 index 0000000000..a3295c1be2 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/turbine_blade_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/wire_fine_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/wire_fine_overlay.png new file mode 100644 index 0000000000..16cfb7fdfc Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/bright/wire_fine_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed.png index a1175cc176..492d10f1bb 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_overlay.png index 6f73847d10..17f3c80efd 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined.png index 7de6c0f9c4..e37496be8d 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined_overlay.png new file mode 100644 index 0000000000..8a6377d493 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/crushed_refined_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust.png index f819a0c553..ff4ec5283a 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure.png index 53b9362cfd..029f0d6c83 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure_overlay.png index 6a7c0cfdb3..4734bebb30 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_impure_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure.png index f819a0c553..8ae25cd20d 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure_overlay.png index 169a3b26e4..2dc0332e11 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/dust_pure_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gear_small.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gear_small.png index 9a238ba8ef..906fc5c262 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gear_small.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gear_small.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem.png index cea0d15656..bb80aa9a86 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped.png index 220207aaef..bd8b30bb3d 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped_overlay.png index 25281ca0c3..d7b5d0bb78 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_chipped_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite.png index e79955d3f7..7ff1727075 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite_overlay.png index 47df8b0f2b..b95cbbfe18 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_exquisite_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed.png index ce375659c8..0fbaa1f839 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed_overlay.png index 819f20a377..6d33a99910 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawed_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless.png index 7f86f0ab67..58f879b099 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless_overlay.png index a59064c267..ca57915474 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_flawless_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_overlay.png new file mode 100644 index 0000000000..01dc6c0514 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/gem_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot.png index 720584a189..c60f3800aa 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot.png index 720584a189..c60f3800aa 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot_overlay.png index c88e243306..dba766eacf 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_hot_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_overlay.png new file mode 100644 index 0000000000..b8e6494f34 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/ingot_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate.png index 7aa493a980..4f0fce0b5c 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate_overlay.png index 61efee7bbe..74be905604 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/plate_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/raw_ore.png index b9c01319ee..e60437f8b7 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/raw_ore.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/raw_ore.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/rotor_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/rotor_overlay.png index 2ac49d285b..be3086ad9f 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/rotor_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/dull/rotor_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/emerald/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/emerald/raw_ore.png deleted file mode 100644 index 77c85dd669..0000000000 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/emerald/raw_ore.png and /dev/null differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/dust.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/dust.png index 72aa4317a4..97a07551b7 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/dust.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/dust.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/raw_ore.png index a8ae434456..e7cbd006c4 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/raw_ore.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/fine/raw_ore.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_horizontal/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_horizontal/raw_ore.png deleted file mode 100644 index 77c85dd669..0000000000 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_horizontal/raw_ore.png and /dev/null differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_vertical/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_vertical/raw_ore.png deleted file mode 100644 index 77c85dd669..0000000000 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/gem_vertical/raw_ore.png and /dev/null differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/magnetic/magnetic_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/magnetic/magnetic_overlay.png index 1e7a3a5248..2dfca10eb1 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/magnetic/magnetic_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/magnetic/magnetic_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot.png index aadddf2eb2..dce47a8ef6 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_hot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_hot.png index aadddf2eb2..dce47a8ef6 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_hot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_hot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_overlay.png new file mode 100644 index 0000000000..369ade3170 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/ingot_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate.png index 7aa493a980..65922b94e4 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate_overlay.png index 61efee7bbe..36f596511d 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/plate_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/raw_ore.png index 866de9f1f4..628f4b22ae 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/raw_ore.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/metallic/raw_ore.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/opal/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/opal/raw_ore.png deleted file mode 100644 index 77c85dd669..0000000000 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/opal/raw_ore.png and /dev/null differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust.png index 739a7cc03b..ff4ec5283a 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_impure.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_impure.png new file mode 100644 index 0000000000..029f0d6c83 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_impure.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_pure.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_pure.png new file mode 100644 index 0000000000..8ae25cd20d Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/dust_pure.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear.png index e0bb0b71a4..854c067572 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear_small.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear_small.png new file mode 100644 index 0000000000..192ff64eff Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/gear_small.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/ingot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/ingot.png new file mode 100644 index 0000000000..48d886a84f Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/ingot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate.png index 7aa493a980..bd479f5a5f 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_dense.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_dense.png index 885fbc4237..a79d788a40 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_dense.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_dense.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_overlay.png new file mode 100644 index 0000000000..6a8acdd3f4 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/rough/plate_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/crushed_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/crushed_overlay.png index 6f73847d10..6d7708d351 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/crushed_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/crushed_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/dust_impure_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/dust_impure_overlay.png index 6a7c0cfdb3..4d1b97f51c 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/dust_impure_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/sand/dust_impure_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/crushed_refined_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/crushed_refined_overlay.png new file mode 100644 index 0000000000..741e36bf4a Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/crushed_refined_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_overlay.png index 8b35c91929..95c43dd005 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_small_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_small_overlay.png index 77840f7f4e..03160ebd13 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_small_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_small_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_tiny_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_tiny_overlay.png index b1309f26a5..bb8d350bd8 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_tiny_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/dust_tiny_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil.png new file mode 100644 index 0000000000..bd906cd904 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil_overlay.png new file mode 100644 index 0000000000..3c69c90a91 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/foil_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear.png index ebfc53353b..f0908f0324 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_overlay.png index 49c5714bbf..7b177c5d0a 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small.png index 9a238ba8ef..b0f08151c3 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small_overlay.png index 9ddb738712..525829bb8c 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/gear_small_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot.png index 478e0f139e..7a5fa40655 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_hot.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_hot.png index 9991f614b5..7a5fa40655 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_hot.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_hot.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_overlay.png index 867331e5cb..461dd08564 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ingot_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate.png index 7aa493a980..9eed536ae0 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate_overlay.png index 45c01846d6..88a5276225 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/plate_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore.png index 36c28d47fd..97c9c8d28d 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore_overlay.png new file mode 100644 index 0000000000..f6e535a441 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/raw_ore_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring.png index 123267fddd..690a1d60fa 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring_overlay.png index aea12406a6..ea91ed4980 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/ring_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod.png index 0cba6b0d58..559f8a7373 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long.png index 18daf3051a..1d5492d644 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long_overlay.png index ccd77027a3..bb3a96098a 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_long_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_overlay.png index 486322a91d..fad3fc0c17 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rod_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor.png new file mode 100644 index 0000000000..ae7db5b69c Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor_overlay.png new file mode 100644 index 0000000000..1d327ec799 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/rotor_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/round.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/round.png index 7d6ca7c835..cf0f67b0d7 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/round.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/round.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw.png index 7b5ba87821..ee5132456b 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw_overlay.png index 82bcbdbf34..cb619ff461 100644 Binary files a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw_overlay.png and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/screw_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring.png new file mode 100644 index 0000000000..e0c3bbb2bd Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_overlay.png new file mode 100644 index 0000000000..82c2a3cf2f Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small.png new file mode 100644 index 0000000000..a76de0bc48 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small_overlay.png new file mode 100644 index 0000000000..4c78ed43dd Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/spring_small_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_buzz_saw.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_buzz_saw.png new file mode 100644 index 0000000000..131f1c7f36 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_buzz_saw.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_chainsaw.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_chainsaw.png new file mode 100644 index 0000000000..f3bfec3e3a Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_chainsaw.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_drill.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_drill.png new file mode 100644 index 0000000000..8e6ebb7888 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_drill.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_screwdriver.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_screwdriver.png new file mode 100644 index 0000000000..4b24df1728 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_screwdriver.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_wrench.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_wrench.png new file mode 100644 index 0000000000..d838ae1808 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/tool_head_wrench.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade.png new file mode 100644 index 0000000000..cc2b55ac29 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade_overlay.png new file mode 100644 index 0000000000..8f224cf79a Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/turbine_blade_overlay.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine.png new file mode 100644 index 0000000000..adf8526536 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine.png differ diff --git a/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine_overlay.png b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine_overlay.png new file mode 100644 index 0000000000..a49f13e636 Binary files /dev/null and b/common/src/main/resources/assets/gtceu/textures/item/material_sets/shiny/wire_fine_overlay.png differ diff --git a/common/src/main/resources/gtceu-common.mixins.json b/common/src/main/resources/gtceu-common.mixins.json index db4289e5bf..774ad030b3 100644 --- a/common/src/main/resources/gtceu-common.mixins.json +++ b/common/src/main/resources/gtceu-common.mixins.json @@ -8,6 +8,7 @@ "BlockModelMixin", "LevelRendererMixin", "ModelBakeryMixin", + "MinecraftMixin", "MultiPlayerGameModeMixin", "rei.FluidEntryRendererMixin" ], diff --git a/fabric/build.gradle b/fabric/build.gradle index 090c890153..79dfbae23f 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -55,6 +55,16 @@ configurations { compileClasspath.extendsFrom common runtimeClasspath.extendsFrom common developmentFabric.extendsFrom common + + apiElements { + outgoing { + capability("net.fabricmc.fabric-api:fabric-api-${this.libs.versions.minecraft.get()}:${this.fabric.versions.fabricApi.get()}") + capability("com.lowdragmc.ldlib:ldlib-common-${this.libs.versions.minecraft.get()}:${this.fabric.versions.ldlib.get()}") + capability("com.tterrag.registrate_fabric:Registrate:${this.fabric.versions.registrate.get()}") + capability("dev.toma.configuration:configuration-fabric-${this.libs.versions.minecraft.get()}:${this.fabric.versions.configuration.get()}") + capability("io.github.llamalad7:mixinextras-fabric:${this.fabric.versions.mixinextras.get()}") + } + } } @@ -124,6 +134,9 @@ dependencies { // KJS modImplementation fabric.kubejs + // Mixin Extras + include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${fabric.versions.mixinextras.get()}"))) + // Configuration modImplementation(fabric.configuration) include(fabric.configuration) diff --git a/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json b/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json index d0766f8220..aee7b9a374 100644 --- a/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json +++ b/fabric/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json @@ -241,15 +241,6 @@ "gtceu:vanadium_gallium_single_cable", "gtceu:yttrium_barium_cuprate_single_cable", "gtceu:graphene_single_cable", - "gtceu:manganese_phosphide_single_cable", - "gtceu:magnesium_diboride_single_cable", - "gtceu:mercury_barium_calcium_cuprate_single_cable", - "gtceu:uranium_triplatinum_single_cable", - "gtceu:samarium_iron_arsenic_oxide_single_cable", - "gtceu:indium_tin_barium_titanium_cuprate_single_cable", - "gtceu:uranium_rhodium_dinaquadide_single_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_single_cable", - "gtceu:ruthenium_trinium_americium_neutronate_single_cable", "gtceu:black_steel_single_cable", "gtceu:tungsten_steel_single_cable", "gtceu:naquadah_alloy_single_cable", @@ -283,15 +274,6 @@ "gtceu:vanadium_gallium_double_cable", "gtceu:yttrium_barium_cuprate_double_cable", "gtceu:graphene_double_cable", - "gtceu:manganese_phosphide_double_cable", - "gtceu:magnesium_diboride_double_cable", - "gtceu:mercury_barium_calcium_cuprate_double_cable", - "gtceu:uranium_triplatinum_double_cable", - "gtceu:samarium_iron_arsenic_oxide_double_cable", - "gtceu:indium_tin_barium_titanium_cuprate_double_cable", - "gtceu:uranium_rhodium_dinaquadide_double_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_double_cable", - "gtceu:ruthenium_trinium_americium_neutronate_double_cable", "gtceu:black_steel_double_cable", "gtceu:tungsten_steel_double_cable", "gtceu:naquadah_alloy_double_cable", @@ -325,15 +307,6 @@ "gtceu:vanadium_gallium_quadruple_cable", "gtceu:yttrium_barium_cuprate_quadruple_cable", "gtceu:graphene_quadruple_cable", - "gtceu:manganese_phosphide_quadruple_cable", - "gtceu:magnesium_diboride_quadruple_cable", - "gtceu:mercury_barium_calcium_cuprate_quadruple_cable", - "gtceu:uranium_triplatinum_quadruple_cable", - "gtceu:samarium_iron_arsenic_oxide_quadruple_cable", - "gtceu:indium_tin_barium_titanium_cuprate_quadruple_cable", - "gtceu:uranium_rhodium_dinaquadide_quadruple_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_quadruple_cable", - "gtceu:ruthenium_trinium_americium_neutronate_quadruple_cable", "gtceu:black_steel_quadruple_cable", "gtceu:tungsten_steel_quadruple_cable", "gtceu:naquadah_alloy_quadruple_cable", @@ -367,15 +340,6 @@ "gtceu:vanadium_gallium_octal_cable", "gtceu:yttrium_barium_cuprate_octal_cable", "gtceu:graphene_octal_cable", - "gtceu:manganese_phosphide_octal_cable", - "gtceu:magnesium_diboride_octal_cable", - "gtceu:mercury_barium_calcium_cuprate_octal_cable", - "gtceu:uranium_triplatinum_octal_cable", - "gtceu:samarium_iron_arsenic_oxide_octal_cable", - "gtceu:indium_tin_barium_titanium_cuprate_octal_cable", - "gtceu:uranium_rhodium_dinaquadide_octal_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_octal_cable", - "gtceu:ruthenium_trinium_americium_neutronate_octal_cable", "gtceu:black_steel_octal_cable", "gtceu:tungsten_steel_octal_cable", "gtceu:naquadah_alloy_octal_cable", @@ -409,15 +373,6 @@ "gtceu:vanadium_gallium_hex_cable", "gtceu:yttrium_barium_cuprate_hex_cable", "gtceu:graphene_hex_cable", - "gtceu:manganese_phosphide_hex_cable", - "gtceu:magnesium_diboride_hex_cable", - "gtceu:mercury_barium_calcium_cuprate_hex_cable", - "gtceu:uranium_triplatinum_hex_cable", - "gtceu:samarium_iron_arsenic_oxide_hex_cable", - "gtceu:indium_tin_barium_titanium_cuprate_hex_cable", - "gtceu:uranium_rhodium_dinaquadide_hex_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_hex_cable", - "gtceu:ruthenium_trinium_americium_neutronate_hex_cable", "gtceu:black_steel_hex_cable", "gtceu:tungsten_steel_hex_cable", "gtceu:naquadah_alloy_hex_cable", diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json b/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json index 6f6f08223b..a21a778afb 100644 --- a/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -69,13 +69,6 @@ "behaviour.wrench": "ʞɔıןɔʇɥbıᴚ uo sʞɔoןᗺ sǝʇɐʇoᴚ", "block.filter.tooltip": "ʇuǝɯuoɹıʌuǝ ㄥ§ǝǝɹℲ-ǝןɔıʇɹɐԀɐ§ ɐ sǝʇɐǝɹƆ", "block.filter_sterile.tooltip": "ʇuǝɯuoɹıʌuǝ ㄥ§pǝzıןıɹǝʇSɐ§ ɐ sǝʇɐǝɹƆ", - "block.fusion_casing": "buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_casing_mk2": "II ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_casing_mk3": "III ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_coil": "ʞɔoןᗺ ןıoƆ uoısnℲ", - "block.gtceu.active_casing_assembly_line": "buısɐƆ ǝuıꞀ ʎןqɯǝssⱯ", - "block.gtceu.active_casing_engine_intake": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ", - "block.gtceu.active_casing_extreme_engine_intake": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ ǝɯǝɹʇxƎ", "block.gtceu.active_transformer": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ", "block.gtceu.alloy_blast_smelter": "ɹǝʇןǝɯS ʇsɐןᗺ ʎoןןⱯ", "block.gtceu.aluminium_crate": "ǝʇɐɹƆ ɯnıuıɯnןⱯ", @@ -83,48 +76,22 @@ "block.gtceu.assembly_line": "ǝuıꞀ ʎןqɯǝssⱯ", "block.gtceu.assembly_line_casing": "buısɐƆ ǝuıꞀ ʎןqɯǝssⱯ", "block.gtceu.assembly_line_grating": "buıʇɐɹ⅁ ǝuıꞀ ʎןqɯǝssⱯ", - "block.gtceu.assembly_line_unit": "ʇıu∩ ǝuıꞀ ʎןqɯǝssⱯ", + "block.gtceu.assembly_line_unit": "buısɐƆ ןoɹʇuoƆ ʎןqɯǝssⱯ", "block.gtceu.atomic_casing": "buısɐƆ ɔıɯoʇⱯ", "block.gtceu.auto_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW oʇnⱯ", "block.gtceu.bronze_brick_casing": "buısɐƆ ʞɔıɹᗺ ǝzuoɹᗺ", "block.gtceu.bronze_crate": "ǝʇɐɹƆ ǝzuoɹᗺ", "block.gtceu.bronze_drum": "ɯnɹᗡ ǝzuoɹᗺ", - "block.gtceu.bronze_firebox": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ", "block.gtceu.bronze_firebox_casing": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ", - "block.gtceu.bronze_gearbox": "xoqɹɐǝ⅁ ǝzuoɹᗺ", + "block.gtceu.bronze_gearbox": "buısɐƆ xoqɹɐǝ⅁ ǝzuoɹᗺ", "block.gtceu.bronze_large_boiler": "ɹǝןıoᗺ ǝzuoɹᗺ ǝbɹɐꞀ", "block.gtceu.bronze_machine_casing": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ", "block.gtceu.bronze_pipe_casing": "buısɐƆ ǝdıԀ ǝzuoɹᗺ", - "block.gtceu.casing_aluminium_frostproof": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ɟooɹԀ ʇsoɹℲ", - "block.gtceu.casing_assembly_control": "buısɐƆ ןoɹʇuoƆ ʎןqɯǝssⱯ", "block.gtceu.casing_bronze_bricks": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ", - "block.gtceu.casing_bronze_gearbox": "buısɐƆ xoqɹɐǝ⅁ ǝzuoɹᗺ", - "block.gtceu.casing_bronze_pipe": "buısɐƆ ǝdıԀ ǝzuoɹᗺ", "block.gtceu.casing_coke_bricks": "sʞɔıɹᗺ uǝʌO ǝʞoƆ", "block.gtceu.casing_grate": "buısɐƆ ǝuıɥɔɐW ǝʇɐɹ⅁", - "block.gtceu.casing_hsse_sturdy": "buısɐƆ ǝuıɥɔɐW Ǝ-SSH ʎpɹnʇS", - "block.gtceu.casing_invar_heatproof": "buısɐƆ ǝuıɥɔɐW ɹɐʌuI ɟooɹԀ ʇɐǝH", - "block.gtceu.casing_laminated_glass": "ssɐן⅁ pǝʇɐuıɯɐꞀ", - "block.gtceu.casing_polytetrafluoroethylene_pipe": "buısɐƆ ǝdıԀ ƎℲ⟘Ԁ", "block.gtceu.casing_primitive_bricks": "sʞɔıɹqǝɹıℲ", - "block.gtceu.casing_ptfe_inert": "buısɐƆ ǝuıɥɔɐW ƎℲ⟘Ԁ ʇɹǝuI ʎןןɐɔıɯǝɥƆ", - "block.gtceu.casing_pump_deck": "ʞɔǝᗡ dɯnԀ", - "block.gtceu.casing_stainless_clean": "buısɐƆ ןǝǝʇS ssǝןuıɐʇS uɐǝןƆ", - "block.gtceu.casing_stainless_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.casing_stainless_turbine": "buısɐƆ ǝuıqɹn⟘ ssǝןuıɐʇS", - "block.gtceu.casing_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS", - "block.gtceu.casing_steel_pipe": "buısɐƆ ǝdıԀ ןǝǝʇS", - "block.gtceu.casing_steel_solid": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS pıןoS", - "block.gtceu.casing_steel_turbine": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS", - "block.gtceu.casing_titanium_gearbox": "buısɐƆ xoqɹɐǝ⅁ ɯnıuɐʇı⟘", - "block.gtceu.casing_titanium_pipe": "buısɐƆ ǝdıԀ ɯnıuɐʇı⟘", - "block.gtceu.casing_titanium_stable": "buısɐƆ ǝuıɥɔɐW ɯnıuɐʇı⟘ ǝןqɐʇS", - "block.gtceu.casing_titanium_turbine": "buısɐƆ ǝuıqɹn⟘ ɯnıuɐʇı⟘", - "block.gtceu.casing_tungstensteel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.casing_tungstensteel_pipe": "buısɐƆ ǝdıԀ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.casing_tungstensteel_robust": "buısɐƆ ǝuıɥɔɐW ןǝǝʇsuǝʇsbun⟘ ʇsnqoᴚ", - "block.gtceu.casing_tungstensteel_turbine": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.clean_machine_casing": "buısɐƆ ǝuıɥɔɐW uɐǝןƆ", + "block.gtceu.clean_machine_casing": "buısɐƆ ןǝǝʇS ssǝןuıɐʇS uɐǝןƆ", "block.gtceu.cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ", "block.gtceu.cleanroom": "ɯooɹuɐǝןƆ", "block.gtceu.cleanroom_glass": "ssɐן⅁ ɯooɹuɐǝןƆ", @@ -225,16 +192,16 @@ "block.gtceu.extreme_engine_intake_casing": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ ǝɯǝɹʇxƎ", "block.gtceu.filter_casing": "buısɐƆ ɹǝʇןıℲ", "block.gtceu.firebricks": "sʞɔıɹqǝɹıℲ", - "block.gtceu.frostproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɟooɹdʇsoɹℲ", - "block.gtceu.fusion_casing": "buısɐƆ uoısnℲ", - "block.gtceu.fusion_casing_mk2": "ᄅʞW buısɐƆ uoısnℲ", - "block.gtceu.fusion_casing_mk3": "ƐʞW buısɐƆ uoısnℲ", - "block.gtceu.fusion_coil": "ןıoƆ uoısnℲ", + "block.gtceu.frostproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ɟooɹԀ ʇsoɹℲ", + "block.gtceu.fusion_casing": "buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_casing_mk2": "II ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_casing_mk3": "III ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_coil": "ʞɔoןᗺ ןıoƆ uoısnℲ", "block.gtceu.fusion_glass": "ssɐן⅁ uoısnℲ", - "block.gtceu.gas_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ sɐ⅁", + "block.gtceu.gas_large_turbine": "ǝuıqɹn⟘ sɐ⅁ ǝbɹɐꞀ", "block.gtceu.gold_drum": "ɯnɹᗡ pןo⅁", "block.gtceu.heat_vent": "ʇuǝΛ ʇɐǝH", - "block.gtceu.heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɟooɹdʇɐǝH", + "block.gtceu.heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɹɐʌuI ɟooɹԀ ʇɐǝH", "block.gtceu.high_power_casing": "buısɐƆ ɹǝʍoԀ ɥbıH", "block.gtceu.high_temperature_smelting_casing": "buısɐƆ buıʇןǝɯS ǝɹnʇɐɹǝdɯǝ⟘ ɥbıH", "block.gtceu.hp_steam_alloy_smelter": "ɹǝʇןǝɯS ʎoןןⱯ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", @@ -246,7 +213,7 @@ "block.gtceu.hp_steam_macerator": "ɹoʇɐɹǝɔɐW ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", "block.gtceu.hp_steam_rock_crusher": "ɹǝɥsnɹƆ ʞɔoᴚ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", "block.gtceu.hp_steam_solid_boiler": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", - "block.gtceu.hssg_coil_block": "ʞɔoןᗺ ןıoƆ bssH", + "block.gtceu.hssg_coil_block": "ʞɔoןᗺ ןıoƆ ⅁-SSH", "block.gtceu.hv_16a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐ9Ɩ ΛH", "block.gtceu.hv_1a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ⱯƖ ΛH", "block.gtceu.hv_4a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐㄣ ΛH", @@ -329,7 +296,7 @@ "block.gtceu.hv_wiremill": "ɹ§II ןןıɯǝɹıM pǝɔuɐʌpⱯ9§", "block.gtceu.implosion_compressor": "ɹossǝɹdɯoƆ uoısoןdɯI", "block.gtceu.industrial_steam_casing": "buısɐƆ ɯɐǝʇS ןɐıɹʇsnpuI", - "block.gtceu.inert_machine_casing": "buısɐƆ ǝuıɥɔɐW ʇɹǝuI", + "block.gtceu.inert_machine_casing": "buısɐƆ ǝuıɥɔɐW ƎℲ⟘Ԁ ʇɹǝuI ʎןןɐɔıɯǝɥƆ", "block.gtceu.infinite_energy": "ʎbɹǝuƎ ǝʇıuıɟuI", "block.gtceu.iv_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌI", "block.gtceu.iv_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌI", @@ -715,6 +682,9 @@ "block.gtceu.naquadah_coil_block": "ʞɔoןᗺ ןıoƆ ɥɐpɐnbɐN", "block.gtceu.nichrome_coil_block": "ʞɔoןᗺ ןıoƆ ǝɯoɹɥɔıN", "block.gtceu.nonconducting_casing": "buısɐƆ buıʇɔnpuoɔuoN", + "block.gtceu.oil_heavy": "ןıO ʎʌɐǝH", + "block.gtceu.oil_light": "ןıO ʇɥbıꞀ", + "block.gtceu.oil_medium": "ןıO ʍɐᴚ", "block.gtceu.opv_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌdO", "block.gtceu.opv_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌdO", "block.gtceu.opv_16a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐ9Ɩ ΛdO", @@ -782,15 +752,15 @@ "block.gtceu.opv_thermal_centrifuge": "ɹ§ ǝbnɟıɹʇuǝƆ ןɐɯɹǝɥ⟘ ʎɹɐpuǝbǝꞀ6§", "block.gtceu.opv_wiremill": "ɹ§ ןןıɯǝɹıM ʎɹɐpuǝbǝꞀ6§", "block.gtceu.plascrete": "ǝʇǝɹɔsɐןԀ", - "block.gtceu.plasma_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ ɐɯsɐןԀ", + "block.gtceu.plasma_large_turbine": "ǝuıqɹn⟘ ɐɯsɐןԀ ǝbɹɐꞀ", "block.gtceu.primitive_blast_furnace": "ǝɔɐuɹnℲ ʇsɐןᗺ ǝʌıʇıɯıɹԀ", "block.gtceu.primitive_pump": "dɯnԀ ǝʌıʇıɯıɹԀ", - "block.gtceu.ptfe_pipe_casing": "buısɐƆ ǝdıԀ ǝɟʇd", + "block.gtceu.ptfe_pipe_casing": "buısɐƆ ǝdıԀ ƎℲ⟘Ԁ", "block.gtceu.pump_deck": "ʞɔǝᗡ dɯnԀ", "block.gtceu.pump_hatch": "ɥɔʇɐH dɯnԀ", "block.gtceu.pyrolyse_oven": "uǝʌO ǝsʎןoɹʎԀ", "block.gtceu.reaction_safe_mixing_casing": "buısɐƆ buıxıW ǝɟɐS-uoıʇɔɐǝᴚ", - "block.gtceu.robust_machine_casing": "buısɐƆ ǝuıɥɔɐW ʇsnqoᴚ", + "block.gtceu.robust_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇsuǝʇsbun⟘ ʇsnqoᴚ", "block.gtceu.rubber_leaves": "sǝʌɐǝꞀ ɹǝqqnᴚ", "block.gtceu.rubber_log": "boꞀ ɹǝqqnᴚ", "block.gtceu.rubber_planks": "sʞuɐןԀ ɹǝqqnᴚ", @@ -799,11 +769,11 @@ "block.gtceu.shock_proof_cutting_casing": "buısɐƆ buıʇʇnƆ ɟooɹԀ ʞɔoɥS", "block.gtceu.slicing_blades": "sǝpɐןᗺ buıɔıןS", "block.gtceu.solid_machine_casing": "buısɐƆ ǝuıɥɔɐW pıןoS", - "block.gtceu.stable_machine_casing": "buısɐƆ ǝuıɥɔɐW ǝןqɐʇS", + "block.gtceu.stable_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯnıuɐʇı⟘ ǝןqɐʇS", "block.gtceu.stainless_steel_crate": "ǝʇɐɹƆ ןǝǝʇS ssǝןuıɐʇS", "block.gtceu.stainless_steel_drum": "ɯnɹᗡ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.stainless_steel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.stainless_steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS ssǝןuıɐʇS", + "block.gtceu.stainless_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", + "block.gtceu.stainless_steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ssǝןuıɐʇS", "block.gtceu.steam_casing_bricked_bronze": "ןןnH ǝzuoɹᗺ pǝʞɔıɹᗺ", "block.gtceu.steam_casing_bricked_bronze.tooltip": "sǝuıɥɔɐW ɯɐǝʇS ʇsɹıɟ ɹnoʎ ɹoℲㄥ§", "block.gtceu.steam_casing_bricked_steel": "ןןnH uoɹI ʇɥbnoɹM pǝʞɔıɹᗺ", @@ -815,7 +785,7 @@ "block.gtceu.steam_grinder": "ɹǝpuıɹ⅁ ɯɐǝʇS", "block.gtceu.steam_input_bus": ")ɯɐǝʇS( snᗺ ʇnduI", "block.gtceu.steam_input_hatch": "ɥɔʇɐH ʇnduI ɯɐǝʇS", - "block.gtceu.steam_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ ɯɐǝʇS", + "block.gtceu.steam_large_turbine": "ǝuıqɹn⟘ ɯɐǝʇS ǝbɹɐꞀ", "block.gtceu.steam_liquid_boiler.bronze": "ɹǝןıoᗺ pınbıꞀ ɯɐǝʇS ןןɐɯS", "block.gtceu.steam_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯɐǝʇS", "block.gtceu.steam_miner": "ɹǝuıW ɯɐǝʇS", @@ -825,23 +795,21 @@ "block.gtceu.steel_brick_casing": "buısɐƆ ʞɔıɹᗺ ןǝǝʇS", "block.gtceu.steel_crate": "ǝʇɐɹƆ ןǝǝʇS", "block.gtceu.steel_drum": "ɯnɹᗡ ןǝǝʇS", - "block.gtceu.steel_firebox": "buısɐƆ xoqǝɹıℲ ןǝǝʇS", "block.gtceu.steel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇS", - "block.gtceu.steel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇS", + "block.gtceu.steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS", "block.gtceu.steel_large_boiler": "ɹǝןıoᗺ ןǝǝʇS ǝbɹɐꞀ", - "block.gtceu.steel_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS", + "block.gtceu.steel_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS pıןoS", "block.gtceu.steel_pipe_casing": "buısɐƆ ǝdıԀ ןǝǝʇS", "block.gtceu.steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS", "block.gtceu.sterilizing_filter_casing": "buısɐƆ ɹǝʇןıℲ buızıןıɹǝʇS", "block.gtceu.stress_proof_casing": "buısɐƆ ɟooɹԀ ssǝɹʇS", - "block.gtceu.sturdy_machine_casing": "buısɐƆ ǝuıɥɔɐW ʎpɹnʇS", - "block.gtceu.superconducting_coil": "ןıoƆ buıʇɔnpuoɔɹǝdnS", + "block.gtceu.sturdy_machine_casing": "buısɐƆ ǝuıɥɔɐW Ǝ-SSH ʎpɹnʇS", + "block.gtceu.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS", "block.gtceu.tempered_glass": "ssɐן⅁ pǝɹǝdɯǝ⟘", "block.gtceu.titanium_crate": "ǝʇɐɹƆ ɯnıuɐʇı⟘", "block.gtceu.titanium_drum": "ɯnɹᗡ ɯnıuɐʇı⟘", - "block.gtceu.titanium_firebox": "buısɐƆ xoqǝɹıℲ ɯnıuɐʇı⟘", "block.gtceu.titanium_firebox_casing": "buısɐƆ xoqǝɹıℲ ɯnıuɐʇı⟘", - "block.gtceu.titanium_gearbox": "xoqɹɐǝ⅁ ɯnıuɐʇı⟘", + "block.gtceu.titanium_gearbox": "buısɐƆ xoqɹɐǝ⅁ ɯnıuɐʇı⟘", "block.gtceu.titanium_large_boiler": "ɹǝןıoᗺ ɯnıuɐʇı⟘ ǝbɹɐꞀ", "block.gtceu.titanium_pipe_casing": "buısɐƆ ǝdıԀ ɯnıuɐʇı⟘", "block.gtceu.titanium_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ɯnıuɐʇı⟘", @@ -851,9 +819,8 @@ "block.gtceu.tungsten_steel_crate": "ǝʇɐɹƆ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungsten_steel_drum": "ɯnɹᗡ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_coil_block": "ʞɔoןᗺ ןıoƆ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.tungstensteel_firebox": "buısɐƆ xoqǝɹıℲ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.tungstensteel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", + "block.gtceu.tungstensteel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_large_boiler": "ɹǝןıoᗺ ןǝǝʇsuǝʇsbun⟘ ǝbɹɐꞀ", "block.gtceu.tungstensteel_pipe_casing": "buısɐƆ ǝdıԀ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇsuǝʇsbun⟘", @@ -1236,14 +1203,6 @@ "block.gtceu.wire_coil.tooltip_pyro": ":uǝʌO ǝsʎןoɹʎԀ8§", "block.gtceu.wire_coil.tooltip_smelter": ":ɹǝʇןǝɯS ıʇןnW8§", "block.gtceu.wire_coil.tooltip_speed_pyro": "%s%%ɟ§ :pǝǝdS buıssǝɔoɹԀq§ ", - "block.gtceu.wire_coil_cupronickel": "ʞɔoןᗺ ןıoƆ ןǝʞɔıuoɹdnƆ", - "block.gtceu.wire_coil_hss_g": "ʞɔoןᗺ ןıoƆ ⅁-SSH", - "block.gtceu.wire_coil_kanthal": "ʞɔoןᗺ ןıoƆ ןɐɥʇuɐʞ", - "block.gtceu.wire_coil_naquadah": "ʞɔoןᗺ ןıoƆ ɥɐpɐnbɐN", - "block.gtceu.wire_coil_nichrome": "ʞɔoןᗺ ןıoƆ ǝɯoɹɥɔıN", - "block.gtceu.wire_coil_trinium": "ʞɔoןᗺ ןıoƆ ɯnıuıɹ⟘", - "block.gtceu.wire_coil_tritanium": "ʞɔoןᗺ ןıoƆ ɯnıuɐʇıɹ⟘", - "block.gtceu.wire_coil_tungstensteel": "ʞɔoןᗺ ןıoƆ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.wood_crate": "ǝʇɐɹƆ uǝpooM", "block.gtceu.wood_drum": "ןǝɹɹɐᗺ uǝpooM", "block.gtceu.zpm_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ɯdZ", @@ -1324,7 +1283,6 @@ "block.gtceu.zpm_transformer_2a": "ɹǝɯɹoɟsuɐɹ⟘ )xᄅ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§", - "block.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS", "compass.node.gtceu.batteries/energy_cluster": "ɹǝʇsnןƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_crystal": "ןɐʇsʎɹƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_module": "ǝןnpoW ʎbɹǝuƎ", @@ -1790,6 +1748,7 @@ "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.dumpAssets": "sʇǝssⱯdɯnp", "config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp", "config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ", "config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ", @@ -1891,15 +1850,14 @@ "cover.conveyor.blocks_input.disabled.1": "pǝןqɐsıᗡɔ§", "cover.conveyor.blocks_input.enabled.0": "˙ǝdıd oʇuı ʎɹoʇuǝʌuı ǝɥʇ ɯoɹɟ sɯǝʇı ןןnd oʇ ʇǝs sı ɹǝʌoɔ uǝɥʍ pǝʇɹǝsuı ǝq ʇou ןןıʍ sɯǝʇı 'pǝןqɐuǝ ɟI", "cover.conveyor.blocks_input.enabled.1": "pǝןqɐuƎɐ§", - "cover.conveyor.distribution.first_insert.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.first_insert.1": "ɹ§ʇɹǝsuI ʇsɹıℲq§", - "cover.conveyor.distribution.first_insert.2": "spuıɟ ʇı ʎɹoʇuǝʌuı ʇsɹıɟ ǝɥʇ oʇuı ʇɹǝsuı ןןıMㄥ§", - "cover.conveyor.distribution.round_robin.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.round_robin.1": "ʎʇıɹoıɹԀ ɥʇıʍ ɹ§uıqoᴚ punoᴚq§", - "cover.conveyor.distribution.round_robin.2": "sǝıɹoʇuǝʌuı oʇ ʎןןɐnbǝ sɯǝʇı ʇıןds oʇ sǝıɹ⟘ㄥ§", - "cover.conveyor.distribution.round_robin_enhanced.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.round_robin_enhanced.1": "ɹ§uıqoᴚ punoᴚ pǝɔuɐɥuƎq§", - "cover.conveyor.distribution.round_robin_enhanced.2": "sǝıɹoʇuǝʌuı ןןɐ oʇ ʎןןɐnbǝ sɯǝʇı sʇıןdSㄥ§", + "cover.conveyor.distribution.insert_first.0": "ʎʇıɹoıɹԀq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.insert_first.1": "˙puıɟ uɐɔ ʇı ʎʇıɹoıɹd ʇsǝɥbıɥ ǝɥʇ ɥʇıʍ ʎɹoʇuǝʌuı ʇsɹıɟ ǝɥʇ oʇuı ʇɹǝsuı ןןıMㄥ§", + "cover.conveyor.distribution.insert_first.2": "˙ɥʇɐd ɐ ɟo ʎʇıɹoıɹd ǝɥʇ ɹǝʍoן sǝdıd ɯǝʇı ǝʌıʇɔıɹʇsǝᴚㄥ§", + "cover.conveyor.distribution.round_robin_global.0": "uıqoᴚ punoᴚq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.round_robin_global.1": "sǝıɹoʇuǝʌuı pǝʇɔǝuuoɔ ssoɹɔɐ ʎןןɐnbǝ sɯǝʇı sʇıןdSㄥ§", + "cover.conveyor.distribution.round_robin_prio.0": "ʎʇıɹoıɹԀ ɥʇıʍ uıqoᴚ punoᴚq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.round_robin_prio.1": "˙ʇsɹıɟ sǝıʇıɹoıɹd ɹǝɥbıɥ sɹǝpısuoɔ puɐ sǝıɹoʇuǝʌuı pǝʇɔǝuuoɔ ssoɹɔɐ sɯǝʇı ʇıןds oʇ sǝıɹ⟘ㄥ§", + "cover.conveyor.distribution.round_robin_prio.2": "˙ɥʇɐd ɐ ɟo ʎʇıɹoıɹd ǝɥʇ ɹǝʍoן sǝdıd ɯǝʇı ǝʌıʇɔıɹʇsǝᴚㄥ§", "cover.conveyor.item_filter.title": "ɹǝʇןıℲ ɯǝʇI", "cover.conveyor.mode": "%s :ǝpoW", "cover.conveyor.mode.export": "ʇɹodxƎ :ǝpoW", @@ -1998,9 +1956,9 @@ "cover.universal.manual_import_export.mode.description.0": " ˙ɹǝʇןıɟ sʇı puɐ ɹǝʌoɔ ǝɥʇ ʎq pǝıɟıɔǝds sɐ ǝʌoɯ ʎןuo ןןıʍ spınןɟ/sɯǝʇI - ɹ§pǝןqɐsıᗡǝ§", "cover.universal.manual_import_export.mode.description.1": " ˙)ʎuɐ ɟı( sǝɥɔʇɐɯ ɹǝʇןıɟ sʇı sɐ buoן sɐ 'ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʇɹǝsuı puɐ pǝʇɔɐɹʇxǝ ǝq uɐɔ spınןɟ/sɯǝʇI - ɹ§pǝɹǝʇןıℲ ʍoןןⱯǝ§", "cover.universal.manual_import_export.mode.description.2": "ɹǝʌoɔ sıɥʇ ʎq pǝʇɔɐɹʇxǝ ɹo pǝʇɹǝsuı sɯǝʇı ǝɥʇ oʇ sǝıןddɐ ɹǝʇןıℲ ˙ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʌoɯ ǝq uɐɔ spınןɟ/sɯǝʇI - ɹ§pǝɹǝʇןıɟu∩ ʍoןןⱯǝ§", - "cover.universal.manual_import_export.mode.disabled": "pǝןqɐsıᗡ :O/I ןɐnuɐW", - "cover.universal.manual_import_export.mode.filtered": "pǝɹǝʇןıℲ :O/I ןɐnuɐW", - "cover.universal.manual_import_export.mode.unfiltered": "pǝɹǝʇןıɟu∩ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.disabled": "˙ɹǝʇןıɟ sʇı puɐ ɹǝʌoɔ ǝɥʇ ʎq pǝıɟıɔǝds sɐ ǝʌoɯ ʎןuo ןןıʍ spınןℲ / sɯǝʇIㄥ§\npǝןqɐsıᗡq§ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.filtered": ")ʎuɐ ɟı( sǝɥɔʇɐɯ ɹǝʇןıɟ sʇı sɐ buoן sɐ 'ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʇɹǝsuı puɐ pǝʇɔɐɹʇxǝ ǝq uɐɔ spınןℲ / sɯǝʇIㄥ§\npǝɹǝʇןıℲq§ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.unfiltered": "˙ɟןǝsʇı ɹǝʌoɔ sıɥʇ ʎq pǝʇɔɐɹʇxǝ ɹo pǝʇɹǝsuı sı ʇɐɥʍ oʇ sǝıןddɐ ʎןuo ɹǝʇןıɟ ǝɥ⟘ ˙ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʌoɯ ǝq uɐɔ spınןℲ / sɯǝʇIㄥ§\npǝɹǝʇןıɟu∩q§ :O/I ןɐnuɐW", "cover.voiding.label.disabled": "pǝןqɐsıᗡ", "cover.voiding.label.enabled": "pǝןqɐuƎ", "cover.voiding.message.disabled": "pǝןqɐsıᗡ ɹǝʌoƆ buıpıoΛ", @@ -3161,8 +3119,8 @@ "item.bone_dust": "ןɐǝW ǝuoᗺ", "item.bone_small_dust": "ןɐǝW ǝuoᗺ ɟo ǝןıԀ ןןɐɯS", "item.bone_tiny_dust": "ןɐǝW ǝuoᗺ ɟo ǝןıԀ ʎuı⟘", + "item.borosilicate_glass_fine_wire": "sɹǝqıℲ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", "item.borosilicate_glass_ingot": "ɹɐᗺ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", - "item.borosilicate_glass_wireFine": "sɹǝqıℲ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", "item.cassiterite_sand_crushed": "puɐS ǝʇıɹǝʇıssɐƆ punoɹ⅁", "item.cassiterite_sand_dust": "puɐS ǝʇıɹǝʇıssɐƆ", "item.cassiterite_sand_impure_dust": "puɐS ǝʇıɹǝʇıssɐƆ ɟo ǝןıԀ ǝɹndɯI", @@ -4046,7 +4004,7 @@ "item.sugar_gem": "ǝqnƆ ɹɐbnS", "item.sugar_small_dust": "ɹɐbnS ɟo ǝןıԀ ןןɐɯS", "item.sugar_tiny_dust": "ɹɐbnS ɟo ǝןıԀ ʎuı⟘", - "item.talc_crushed": "ɔןɐ⟘ punoɹ⅁", + "item.talc_crushed_ore": "ɔןɐ⟘ punoɹ⅁", "item.talc_dust": "ɔןɐ⟘", "item.talc_impure_dust": "ɔןɐ⟘ ɟo ǝןıԀ ǝɹndɯI", "item.talc_pure_dust": "ɔןɐ⟘ ɟo ǝןıԀ pǝıɟıɹnԀ", @@ -4056,9 +4014,9 @@ "item.talc_tiny_dust": "ɔןɐ⟘ ɟo ǝןıԀ ʎuı⟘", "item.treated_wood_bolt": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ ʇɹoɥS", "item.treated_wood_dust": "dןnԀ pooM pǝʇɐǝɹ⟘", + "item.treated_wood_long_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ buoꞀ", "item.treated_wood_plate": "ʞuɐןԀ pooM pǝʇɐǝɹ⟘", "item.treated_wood_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘", - "item.treated_wood_rodLong": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ buoꞀ", "item.treated_wood_small_dust": "dןnԀ pooM pǝʇɐǝɹ⟘ ɟo ǝןıԀ ןןɐɯS", "item.treated_wood_tiny_dust": "dןnԀ pooM pǝʇɐǝɹ⟘ ɟo ǝןıԀ ʎuı⟘", "item.wheat_dust": "ɹnoןℲ", @@ -4066,8 +4024,8 @@ "item.wheat_tiny_dust": "ɹnoןℲ ɟo ǝןıԀ ʎuı⟘", "item.wood_bolt": "ʞɔıʇS pooM ʇɹoɥS", "item.wood_dust": "dןnԀ pooM", + "item.wood_long_rod": "ʞɔıʇS pooM buoꞀ", "item.wood_plate": "ʞuɐןԀ pooM", - "item.wood_rodLong": "ʞɔıʇS pooM buoꞀ", "item.wood_small_dust": "dןnԀ pooM ɟo ǝןıԀ ןןɐɯS", "item.wood_tiny_dust": "dןnԀ pooM ɟo ǝןıԀ ʎuı⟘", "itemGroup.gtceu.decoration": "suoıʇɐɹoɔǝᗡ ɥɔǝ⟘bǝɹ⅁", @@ -4130,6 +4088,7 @@ "material.bio_diesel": "ןǝsǝıᗡ oıᗺ", "material.biomass": "ssɐɯoıᗺ", "material.biotite": "ǝʇıʇoıᗺ", + "material.biphenyl": "ןʎuǝɥdıᗺ", "material.bismuth": "ɥʇnɯsıᗺ", "material.bismuth_bronze": "ǝzuoɹᗺ ɥʇnɯsıᗺ", "material.bisphenol_a": "Ɐ ןouǝɥdsıᗺ", @@ -4305,7 +4264,7 @@ "material.gypsum": "ɯnsdʎ⅁", "material.hafnium": "ɯnıuɟɐH", "material.hassium": "ɯnıssɐH", - "material.hastelloy_c_276": "9ㄥᄅ Ɔ ʎoןןǝʇsɐH", + "material.hastelloy_c_276": "9ㄥᄅ-Ɔ ʎoןןǝʇsɐH", "material.hastelloy_x": "X ʎoןןǝʇsɐH", "material.heavy_fuel": "ןǝnℲ ʎʌɐǝH", "material.helium": "ɯnıןǝH", @@ -4313,17 +4272,17 @@ "material.hematite": "ǝʇıʇɐɯǝH", "material.high_octane_gasoline": "ǝuıןosɐ⅁ ǝuɐʇɔO ɥbıH", "material.holmium": "ɯnıɯןoH", - "material.hsla_steel": "ןǝǝʇS-ⱯꞀSH", + "material.hsla_steel": "ןǝǝʇS ɐןsH", "material.hsse": "Ǝ-SSH", "material.hssg": "⅁-SSH", "material.hsss": "S-SSH", - "material.hydro_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ oɹpʎH", + "material.hydro_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ-oɹpʎH", "material.hydrochloric_acid": "pıɔⱯ ɔıɹoןɥɔoɹpʎH", "material.hydrofluoric_acid": "pıɔⱯ ɔıɹonןɟoɹpʎH", "material.hydrogen": "uǝboɹpʎH", @@ -4333,7 +4292,7 @@ "material.ilmenite": "ǝʇıuǝɯןI", "material.impure_enriched_naquadah_solution": "uoıʇnןoS ɥɐpɐnbɐN pǝɥɔıɹuƎ ǝɹndɯI", "material.impure_naquadria_solution": "uoıʇnןoS ɐıɹpɐnbɐN ǝɹndɯI", - "material.incoloy_ma_956": "9ϛ6 ɐW ʎoןoɔuI", + "material.incoloy_ma_956": "9ϛ6-ⱯW ʎoןoɔuI", "material.indium": "ɯnıpuI", "material.indium_concentrate": "ǝʇɐɹʇuǝɔuoƆ ɯnıpuI", "material.indium_gallium_phosphide": "ǝpıɥdsoɥԀ ɯnıןןɐ⅁ ɯnıpuI", @@ -4363,14 +4322,14 @@ "material.light_blue_dye": "ǝʎᗡ ǝnןᗺ ʇɥbıꞀ", "material.light_fuel": "ןǝnℲ ʇɥbıꞀ", "material.light_gray_dye": "ǝʎᗡ ʎɐɹ⅁ ʇɥbıꞀ", - "material.lightly_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", "material.lime_dye": "ǝʎᗡ ǝɯıꞀ", "material.liquid_air": "ɹıⱯ pınbıꞀ", "material.liquid_ender_air": "ɹıⱯ ɹǝpuƎ pınbıꞀ", @@ -4471,6 +4430,7 @@ "material.palladium": "ɯnıpɐןןɐԀ", "material.palladium_raw": "ʍɐᴚ ɯnıpɐןןɐԀ", "material.paper": "ɹǝdɐԀ", + "material.pcb_coolant": "ʇuɐןooƆ ᗺƆԀ", "material.pentlandite": "ǝʇıpuɐןʇuǝԀ", "material.perlite": "ǝʇıןɹǝԀ", "material.phenol": "ןouǝɥԀ", @@ -4491,6 +4451,7 @@ "material.polonium": "ɯnıuoןoԀ", "material.polybenzimidazole": "ǝןozɐpıɯızuǝqʎןoԀ", "material.polycaprolactam": "ɯɐʇɔɐןoɹdɐɔʎןoԀ", + "material.polychlorinated_biphenyl": "ןʎuǝɥdıᗺ pǝʇɐuıɹoןɥɔʎןoԀ", "material.polydimethylsiloxane": "ǝuɐxoןısןʎɥʇǝɯıpʎןoԀ", "material.polyethylene": "ǝuǝןʎɥʇǝʎןoԀ", "material.polyphenylene_sulfide": "ǝpıɟןnS ǝuǝןʎuǝɥdʎןoԀ", @@ -4564,14 +4525,14 @@ "material.seaborgium": "ɯnıbɹoqɐǝS", "material.seed_oil": "ןıO pǝǝS", "material.selenium": "ɯnıuǝןǝS", - "material.severely_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", "material.silicon": "uoɔıןıS", "material.silicon_dioxide": "ǝpıxoıᗡ uoɔıןıS", "material.silicone_rubber": "ɹǝqqnᴚ ǝuoɔıןıS", @@ -4592,15 +4553,15 @@ "material.spodumene": "ǝuǝɯnpodS", "material.stainless_steel": "ןǝǝʇS ssǝןuıɐʇS", "material.steam": "ɯɐǝʇS", - "material.steam_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ ɯɐǝʇS", + "material.steam_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ-ɯɐǝʇS", "material.steel": "ןǝǝʇS", - "material.stellite_100": "00Ɩ ǝʇıןןǝʇS", + "material.stellite_100": "00Ɩ-ǝʇıןןǝʇS", "material.sterilized_growth_medium": "ɯnıpǝW ɥʇʍoɹ⅁ pǝzıןıɹǝʇS", "material.sterling_silver": "ɹǝʌןıS buıןɹǝʇS", "material.stibnite": "ǝʇıuqıʇS", @@ -4687,7 +4648,7 @@ "material.yttrium": "ɯnıɹʇʇʎ", "material.yttrium_barium_cuprate": "ǝʇɐɹdnƆ ɯnıɹɐᗺ ɯnıɹʇʇʎ", "material.zeolite": "ǝʇıןoǝZ", - "material.zeron_100": "00Ɩ uoɹǝZ", + "material.zeron_100": "00Ɩ-uoɹǝZ", "material.zinc": "ɔuıZ", "material.zinc_sulfide": "ǝpıɟןnS ɔuıZ", "material.zincite": "ǝʇıɔuıZ", @@ -4911,15 +4872,5 @@ "tile.gtceu.petrified_foam.name": "ɯɐoℲ pǝıɟıɹʇǝԀ", "tile.gtceu.reinforced_foam.name": "ɯɐoℲ pǝɔɹoɟuıǝᴚ", "tile.gtceu.reinforced_stone.name": "ǝuoʇS pǝɔɹoɟuıǝᴚ", - "tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS", - "tile.stone_bricks_square.concrete_dark.name": "sʞɔıɹᗺ ǝʇǝɹɔuoƆ ʞɹɐᗡ ǝɹɐnbS", - "tile.wire_coil.tooltip_cracking": ":ʇıu∩ buıʞɔɐɹƆ8§", - "tile.wire_coil.tooltip_energy_cracking": "%s%%ɟ§ :ǝbɐs∩ ʎbɹǝuƎɐ§ ", - "tile.wire_coil.tooltip_energy_smelter": "ǝdıɔǝɹ ɹǝd8§ ʇ/∩Ǝ %sɟ§ :ǝbɐs∩ ʎbɹǝuƎɐ§ ", - "tile.wire_coil.tooltip_extended_info": "oɟuI snuoᗺ ןıoƆ ʍoɥs oʇ ⟘ℲIHS pןoH", - "tile.wire_coil.tooltip_heat": "ʞ %dɟ§ :ʎʇıɔɐdɐƆ ʇɐǝH ǝsɐᗺɔ§", - "tile.wire_coil.tooltip_parallel_smelter": "%sɟ§ :ןǝןןɐɹɐԀ xɐWϛ§ ", - "tile.wire_coil.tooltip_pyro": ":uǝʌO ǝsʎןoɹʎԀ8§", - "tile.wire_coil.tooltip_smelter": ":ɹǝʇןǝɯS ıʇןnW8§", - "tile.wire_coil.tooltip_speed_pyro": "%s%%ɟ§ :pǝǝdS buıssǝɔoɹԀq§ " + "tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS" } \ No newline at end of file diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_us.json b/fabric/src/generated/resources/assets/gtceu/lang/en_us.json index 58d4ab8642..213a5d5caa 100644 --- a/fabric/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/fabric/src/generated/resources/assets/gtceu/lang/en_us.json @@ -69,13 +69,6 @@ "behaviour.wrench": "Rotates Blocks on Rightclick", "block.filter.tooltip": "Creates a §aParticle-Free§7 environment", "block.filter_sterile.tooltip": "Creates a §aSterilized§7 environment", - "block.fusion_casing": "Fusion Machine Casing", - "block.fusion_casing_mk2": "Fusion Machine Casing MK II", - "block.fusion_casing_mk3": "Fusion Machine Casing MK III", - "block.fusion_coil": "Fusion Coil Block", - "block.gtceu.active_casing_assembly_line": "Assembly Line Casing", - "block.gtceu.active_casing_engine_intake": "Engine Intake Casing", - "block.gtceu.active_casing_extreme_engine_intake": "Extreme Engine Intake Casing", "block.gtceu.active_transformer": "Active Transformer", "block.gtceu.alloy_blast_smelter": "Alloy Blast Smelter", "block.gtceu.aluminium_crate": "Aluminium Crate", @@ -83,48 +76,22 @@ "block.gtceu.assembly_line": "Assembly Line", "block.gtceu.assembly_line_casing": "Assembly Line Casing", "block.gtceu.assembly_line_grating": "Assembly Line Grating", - "block.gtceu.assembly_line_unit": "Assembly Line Unit", + "block.gtceu.assembly_line_unit": "Assembly Control Casing", "block.gtceu.atomic_casing": "Atomic Casing", "block.gtceu.auto_maintenance_hatch": "Auto Maintenance Hatch", "block.gtceu.bronze_brick_casing": "Bronze Brick Casing", "block.gtceu.bronze_crate": "Bronze Crate", "block.gtceu.bronze_drum": "Bronze Drum", - "block.gtceu.bronze_firebox": "Bronze Firebox Casing", "block.gtceu.bronze_firebox_casing": "Bronze Firebox Casing", - "block.gtceu.bronze_gearbox": "Bronze Gearbox", + "block.gtceu.bronze_gearbox": "Bronze Gearbox Casing", "block.gtceu.bronze_large_boiler": "Large Bronze Boiler", "block.gtceu.bronze_machine_casing": "Bronze Machine Casing", "block.gtceu.bronze_pipe_casing": "Bronze Pipe Casing", - "block.gtceu.casing_aluminium_frostproof": "Frost Proof Aluminium Machine Casing", - "block.gtceu.casing_assembly_control": "Assembly Control Casing", "block.gtceu.casing_bronze_bricks": "Bronze Machine Casing", - "block.gtceu.casing_bronze_gearbox": "Bronze Gearbox Casing", - "block.gtceu.casing_bronze_pipe": "Bronze Pipe Casing", "block.gtceu.casing_coke_bricks": "Coke Oven Bricks", "block.gtceu.casing_grate": "Grate Machine Casing", - "block.gtceu.casing_hsse_sturdy": "Sturdy HSS-E Machine Casing", - "block.gtceu.casing_invar_heatproof": "Heat Proof Invar Machine Casing", - "block.gtceu.casing_laminated_glass": "Laminated Glass", - "block.gtceu.casing_polytetrafluoroethylene_pipe": "PTFE Pipe Casing", "block.gtceu.casing_primitive_bricks": "Firebricks", - "block.gtceu.casing_ptfe_inert": "Chemically Inert PTFE Machine Casing", - "block.gtceu.casing_pump_deck": "Pump Deck", - "block.gtceu.casing_stainless_clean": "Clean Stainless Steel Casing", - "block.gtceu.casing_stainless_steel_gearbox": "Stainless Steel Gearbox Casing", - "block.gtceu.casing_stainless_turbine": "Stainless Turbine Casing", - "block.gtceu.casing_steel_gearbox": "Steel Gearbox Casing", - "block.gtceu.casing_steel_pipe": "Steel Pipe Casing", - "block.gtceu.casing_steel_solid": "Solid Steel Machine Casing", - "block.gtceu.casing_steel_turbine": "Steel Turbine Casing", - "block.gtceu.casing_titanium_gearbox": "Titanium Gearbox Casing", - "block.gtceu.casing_titanium_pipe": "Titanium Pipe Casing", - "block.gtceu.casing_titanium_stable": "Stable Titanium Machine Casing", - "block.gtceu.casing_titanium_turbine": "Titanium Turbine Casing", - "block.gtceu.casing_tungstensteel_gearbox": "Tungstensteel Gearbox Casing", - "block.gtceu.casing_tungstensteel_pipe": "Tungstensteel Pipe Casing", - "block.gtceu.casing_tungstensteel_robust": "Robust Tungstensteel Machine Casing", - "block.gtceu.casing_tungstensteel_turbine": "Tungstensteel Turbine Casing", - "block.gtceu.clean_machine_casing": "Clean Machine Casing", + "block.gtceu.clean_machine_casing": "Clean Stainless Steel Casing", "block.gtceu.cleaning_maintenance_hatch": "Cleaning Maintenance Hatch", "block.gtceu.cleanroom": "Cleanroom", "block.gtceu.cleanroom_glass": "Cleanroom Glass", @@ -225,16 +192,16 @@ "block.gtceu.extreme_engine_intake_casing": "Extreme Engine Intake Casing", "block.gtceu.filter_casing": "Filter Casing", "block.gtceu.firebricks": "Firebricks", - "block.gtceu.frostproof_machine_casing": "Frostproof Machine Casing", - "block.gtceu.fusion_casing": "Fusion Casing", - "block.gtceu.fusion_casing_mk2": "Fusion Casing Mk2", - "block.gtceu.fusion_casing_mk3": "Fusion Casing Mk3", - "block.gtceu.fusion_coil": "Fusion Coil", + "block.gtceu.frostproof_machine_casing": "Frost Proof Aluminium Machine Casing", + "block.gtceu.fusion_casing": "Fusion Machine Casing", + "block.gtceu.fusion_casing_mk2": "Fusion Machine Casing MK II", + "block.gtceu.fusion_casing_mk3": "Fusion Machine Casing MK III", + "block.gtceu.fusion_coil": "Fusion Coil Block", "block.gtceu.fusion_glass": "Fusion Glass", - "block.gtceu.gas_large_turbine": "Gas Large Turbine", + "block.gtceu.gas_large_turbine": "Large Gas Turbine", "block.gtceu.gold_drum": "Gold Drum", "block.gtceu.heat_vent": "Heat Vent", - "block.gtceu.heatproof_machine_casing": "Heatproof Machine Casing", + "block.gtceu.heatproof_machine_casing": "Heat Proof Invar Machine Casing", "block.gtceu.high_power_casing": "High Power Casing", "block.gtceu.high_temperature_smelting_casing": "High Temperature Smelting Casing", "block.gtceu.hp_steam_alloy_smelter": "High Pressure Steam Alloy Smelter", @@ -246,7 +213,7 @@ "block.gtceu.hp_steam_macerator": "High Pressure Steam Macerator", "block.gtceu.hp_steam_rock_crusher": "High Pressure Steam Rock Crusher", "block.gtceu.hp_steam_solid_boiler": "High Pressure Steam Solid Boiler", - "block.gtceu.hssg_coil_block": "Hssg Coil Block", + "block.gtceu.hssg_coil_block": "HSS-G Coil Block", "block.gtceu.hv_16a_energy_converter": "HV 16A Energy Converter", "block.gtceu.hv_1a_energy_converter": "HV 1A Energy Converter", "block.gtceu.hv_4a_energy_converter": "HV 4A Energy Converter", @@ -329,7 +296,7 @@ "block.gtceu.hv_wiremill": "§6Advanced Wiremill II§r", "block.gtceu.implosion_compressor": "Implosion Compressor", "block.gtceu.industrial_steam_casing": "Industrial Steam Casing", - "block.gtceu.inert_machine_casing": "Inert Machine Casing", + "block.gtceu.inert_machine_casing": "Chemically Inert PTFE Machine Casing", "block.gtceu.infinite_energy": "Infinite Energy", "block.gtceu.iv_1024a_laser_source_hatch": "Iv 1024a Laser Source Hatch", "block.gtceu.iv_1024a_laser_target_hatch": "Iv 1024a Laser Target Hatch", @@ -715,6 +682,9 @@ "block.gtceu.naquadah_coil_block": "Naquadah Coil Block", "block.gtceu.nichrome_coil_block": "Nichrome Coil Block", "block.gtceu.nonconducting_casing": "Nonconducting Casing", + "block.gtceu.oil_heavy": "Heavy Oil", + "block.gtceu.oil_light": "Light Oil", + "block.gtceu.oil_medium": "Raw Oil", "block.gtceu.opv_1024a_laser_source_hatch": "Opv 1024a Laser Source Hatch", "block.gtceu.opv_1024a_laser_target_hatch": "Opv 1024a Laser Target Hatch", "block.gtceu.opv_16a_energy_converter": "OpV 16A Energy Converter", @@ -782,15 +752,15 @@ "block.gtceu.opv_thermal_centrifuge": "§9Legendary Thermal Centrifuge §r", "block.gtceu.opv_wiremill": "§9Legendary Wiremill §r", "block.gtceu.plascrete": "Plascrete", - "block.gtceu.plasma_large_turbine": "Plasma Large Turbine", + "block.gtceu.plasma_large_turbine": "Large Plasma Turbine", "block.gtceu.primitive_blast_furnace": "Primitive Blast Furnace", "block.gtceu.primitive_pump": "Primitive Pump", - "block.gtceu.ptfe_pipe_casing": "ptfe Pipe Casing", + "block.gtceu.ptfe_pipe_casing": "PTFE Pipe Casing", "block.gtceu.pump_deck": "Pump Deck", "block.gtceu.pump_hatch": "Pump Hatch", "block.gtceu.pyrolyse_oven": "Pyrolyse Oven", "block.gtceu.reaction_safe_mixing_casing": "Reaction-Safe Mixing Casing", - "block.gtceu.robust_machine_casing": "Robust Machine Casing", + "block.gtceu.robust_machine_casing": "Robust Tungstensteel Machine Casing", "block.gtceu.rubber_leaves": "Rubber Leaves", "block.gtceu.rubber_log": "Rubber Log", "block.gtceu.rubber_planks": "Rubber Planks", @@ -799,11 +769,11 @@ "block.gtceu.shock_proof_cutting_casing": "Shock Proof Cutting Casing", "block.gtceu.slicing_blades": "Slicing Blades", "block.gtceu.solid_machine_casing": "Solid Machine Casing", - "block.gtceu.stable_machine_casing": "Stable Machine Casing", + "block.gtceu.stable_machine_casing": "Stable Titanium Machine Casing", "block.gtceu.stainless_steel_crate": "Stainless Steel Crate", "block.gtceu.stainless_steel_drum": "Stainless Steel Drum", - "block.gtceu.stainless_steel_gearbox": "Stainless Steel Gearbox", - "block.gtceu.stainless_steel_turbine_casing": "Stainless Steel Turbine Casing", + "block.gtceu.stainless_steel_gearbox": "Stainless Steel Gearbox Casing", + "block.gtceu.stainless_steel_turbine_casing": "Stainless Turbine Casing", "block.gtceu.steam_casing_bricked_bronze": "Bricked Bronze Hull", "block.gtceu.steam_casing_bricked_bronze.tooltip": "§7For your first Steam Machines", "block.gtceu.steam_casing_bricked_steel": "Bricked Wrought Iron Hull", @@ -815,7 +785,7 @@ "block.gtceu.steam_grinder": "Steam Grinder", "block.gtceu.steam_input_bus": "Input Bus (Steam)", "block.gtceu.steam_input_hatch": "Steam Input Hatch", - "block.gtceu.steam_large_turbine": "Steam Large Turbine", + "block.gtceu.steam_large_turbine": "Large Steam Turbine", "block.gtceu.steam_liquid_boiler.bronze": "Small Steam Liquid Boiler", "block.gtceu.steam_machine_casing": "Steam Machine Casing", "block.gtceu.steam_miner": "Steam Miner", @@ -825,23 +795,21 @@ "block.gtceu.steel_brick_casing": "Steel Brick Casing", "block.gtceu.steel_crate": "Steel Crate", "block.gtceu.steel_drum": "Steel Drum", - "block.gtceu.steel_firebox": "Steel Firebox Casing", "block.gtceu.steel_firebox_casing": "Steel Firebox Casing", - "block.gtceu.steel_gearbox": "Steel Gearbox", + "block.gtceu.steel_gearbox": "Steel Gearbox Casing", "block.gtceu.steel_large_boiler": "Large Steel Boiler", - "block.gtceu.steel_machine_casing": "Steel Machine Casing", + "block.gtceu.steel_machine_casing": "Solid Steel Machine Casing", "block.gtceu.steel_pipe_casing": "Steel Pipe Casing", "block.gtceu.steel_turbine_casing": "Steel Turbine Casing", "block.gtceu.sterilizing_filter_casing": "Sterilizing Filter Casing", "block.gtceu.stress_proof_casing": "Stress Proof Casing", - "block.gtceu.sturdy_machine_casing": "Sturdy Machine Casing", - "block.gtceu.superconducting_coil": "Superconducting Coil", + "block.gtceu.sturdy_machine_casing": "Sturdy HSS-E Machine Casing", + "block.gtceu.superconducting_coil": "Superconducting Coil Block", "block.gtceu.tempered_glass": "Tempered Glass", "block.gtceu.titanium_crate": "Titanium Crate", "block.gtceu.titanium_drum": "Titanium Drum", - "block.gtceu.titanium_firebox": "Titanium Firebox Casing", "block.gtceu.titanium_firebox_casing": "Titanium Firebox Casing", - "block.gtceu.titanium_gearbox": "Titanium Gearbox", + "block.gtceu.titanium_gearbox": "Titanium Gearbox Casing", "block.gtceu.titanium_large_boiler": "Large Titanium Boiler", "block.gtceu.titanium_pipe_casing": "Titanium Pipe Casing", "block.gtceu.titanium_turbine_casing": "Titanium Turbine Casing", @@ -851,9 +819,8 @@ "block.gtceu.tungsten_steel_crate": "Tungstensteel Crate", "block.gtceu.tungsten_steel_drum": "Tungstensteel Drum", "block.gtceu.tungstensteel_coil_block": "Tungstensteel Coil Block", - "block.gtceu.tungstensteel_firebox": "Tungstensteel Firebox Casing", "block.gtceu.tungstensteel_firebox_casing": "Tungstensteel Firebox Casing", - "block.gtceu.tungstensteel_gearbox": "Tungstensteel Gearbox", + "block.gtceu.tungstensteel_gearbox": "Tungstensteel Gearbox Casing", "block.gtceu.tungstensteel_large_boiler": "Large Tungstensteel Boiler", "block.gtceu.tungstensteel_pipe_casing": "Tungstensteel Pipe Casing", "block.gtceu.tungstensteel_turbine_casing": "Tungstensteel Turbine Casing", @@ -1236,14 +1203,6 @@ "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven:", "block.gtceu.wire_coil.tooltip_smelter": "§8Multi Smelter:", "block.gtceu.wire_coil.tooltip_speed_pyro": " §bProcessing Speed: §f%s%%", - "block.gtceu.wire_coil_cupronickel": "Cupronickel Coil Block", - "block.gtceu.wire_coil_hss_g": "HSS-G Coil Block", - "block.gtceu.wire_coil_kanthal": "Kanthal Coil Block", - "block.gtceu.wire_coil_naquadah": "Naquadah Coil Block", - "block.gtceu.wire_coil_nichrome": "Nichrome Coil Block", - "block.gtceu.wire_coil_trinium": "Trinium Coil Block", - "block.gtceu.wire_coil_tritanium": "Tritanium Coil Block", - "block.gtceu.wire_coil_tungstensteel": "Tungstensteel Coil Block", "block.gtceu.wood_crate": "Wooden Crate", "block.gtceu.wood_drum": "Wooden Barrel", "block.gtceu.zpm_1024a_laser_source_hatch": "Zpm 1024a Laser Source Hatch", @@ -1324,7 +1283,6 @@ "block.gtceu.zpm_transformer_2a": "ZPM Voltage Hi-Amp (2x) Transformer", "block.gtceu.zpm_transformer_4a": "ZPM Voltage Hi-Amp (4x) Transformer", "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r", - "block.superconducting_coil": "Superconducting Coil Block", "compass.node.gtceu.batteries/energy_cluster": "Energy Cluster", "compass.node.gtceu.batteries/energy_crystal": "Energy Crystal", "compass.node.gtceu.batteries/energy_module": "Energy Module", @@ -1790,6 +1748,7 @@ "config.gtceu.option.doProcessingArray": "doProcessingArray", "config.gtceu.option.doTerrainExplosion": "doTerrainExplosion", "config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain", + "config.gtceu.option.dumpAssets": "dumpAssets", "config.gtceu.option.dumpRecipes": "dumpRecipes", "config.gtceu.option.enableCleanroom": "enableCleanroom", "config.gtceu.option.enableMaintenance": "enableMaintenance", @@ -1891,15 +1850,14 @@ "cover.conveyor.blocks_input.disabled.1": "§cDisabled", "cover.conveyor.blocks_input.enabled.0": "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.", "cover.conveyor.blocks_input.enabled.1": "§aEnabled", - "cover.conveyor.distribution.first_insert.0": "Distribution Mode", - "cover.conveyor.distribution.first_insert.1": "§bFirst Insert§r", - "cover.conveyor.distribution.first_insert.2": "§7Will insert into the first inventory it finds", - "cover.conveyor.distribution.round_robin.0": "Distribution Mode", - "cover.conveyor.distribution.round_robin.1": "§bRound Robin§r with Priority", - "cover.conveyor.distribution.round_robin.2": "§7Tries to split items equally to inventories", - "cover.conveyor.distribution.round_robin_enhanced.0": "Distribution Mode", - "cover.conveyor.distribution.round_robin_enhanced.1": "§bEnhanced Round Robin§r", - "cover.conveyor.distribution.round_robin_enhanced.2": "§7Splits items equally to all inventories", + "cover.conveyor.distribution.insert_first.0": "Distribution Mode: §bPriority", + "cover.conveyor.distribution.insert_first.1": "§7Will insert into the first inventory with the highest priority it can find.", + "cover.conveyor.distribution.insert_first.2": "§7Restrictive item pipes lower the priority of a path.", + "cover.conveyor.distribution.round_robin_global.0": "Distribution Mode: §bRound Robin", + "cover.conveyor.distribution.round_robin_global.1": "§7Splits items equally across connected inventories", + "cover.conveyor.distribution.round_robin_prio.0": "Distribution Mode: §bRound Robin with Priority", + "cover.conveyor.distribution.round_robin_prio.1": "§7Tries to split items across connected inventories and considers higher priorities first.", + "cover.conveyor.distribution.round_robin_prio.2": "§7Restrictive item pipes lower the priority of a path.", "cover.conveyor.item_filter.title": "Item Filter", "cover.conveyor.mode": "Mode: %s", "cover.conveyor.mode.export": "Mode: Export", @@ -1998,9 +1956,9 @@ "cover.universal.manual_import_export.mode.description.0": "§eDisabled§r - Items/fluids will only move as specified by the cover and its filter. ", "cover.universal.manual_import_export.mode.description.1": "§eAllow Filtered§r - Items/fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any). ", "cover.universal.manual_import_export.mode.description.2": "§eAllow Unfiltered§r - Items/fluids can be moved independently of the cover mode. Filter applies to the items inserted or extracted by this cover", - "cover.universal.manual_import_export.mode.disabled": "Manual I/O: Disabled", - "cover.universal.manual_import_export.mode.filtered": "Manual I/O: Filtered", - "cover.universal.manual_import_export.mode.unfiltered": "Manual I/O: Unfiltered", + "cover.universal.manual_import_export.mode.disabled": "Manual I/O: §bDisabled\n§7Items / Fluids will only move as specified by the cover and its filter.", + "cover.universal.manual_import_export.mode.filtered": "Manual I/O: §bFiltered\n§7Items / Fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any)", + "cover.universal.manual_import_export.mode.unfiltered": "Manual I/O: §bUnfiltered\n§7Items / Fluids can be moved independently of the cover mode. The filter only applies to what is inserted or extracted by this cover itself.", "cover.voiding.label.disabled": "Disabled", "cover.voiding.label.enabled": "Enabled", "cover.voiding.message.disabled": "Voiding Cover Disabled", @@ -3161,8 +3119,8 @@ "item.bone_dust": "Bone Meal", "item.bone_small_dust": "Small Pile of Bone Meal", "item.bone_tiny_dust": "Tiny Pile of Bone Meal", + "item.borosilicate_glass_fine_wire": "Borosilicate Glass Fibers", "item.borosilicate_glass_ingot": "Borosilicate Glass Bar", - "item.borosilicate_glass_wireFine": "Borosilicate Glass Fibers", "item.cassiterite_sand_crushed": "Ground Cassiterite Sand", "item.cassiterite_sand_dust": "Cassiterite Sand", "item.cassiterite_sand_impure_dust": "Impure Pile of Cassiterite Sand", @@ -4046,7 +4004,7 @@ "item.sugar_gem": "Sugar Cube", "item.sugar_small_dust": "Small Pile of Sugar", "item.sugar_tiny_dust": "Tiny Pile of Sugar", - "item.talc_crushed": "Ground Talc", + "item.talc_crushed_ore": "Ground Talc", "item.talc_dust": "Talc", "item.talc_impure_dust": "Impure Pile of Talc", "item.talc_pure_dust": "Purified Pile of Talc", @@ -4056,9 +4014,9 @@ "item.talc_tiny_dust": "Tiny Pile of Talc", "item.treated_wood_bolt": "Short Treated Wood Stick", "item.treated_wood_dust": "Treated Wood Pulp", + "item.treated_wood_long_rod": "Long Treated Wood Stick", "item.treated_wood_plate": "Treated Wood Plank", "item.treated_wood_rod": "Treated Wood Stick", - "item.treated_wood_rodLong": "Long Treated Wood Stick", "item.treated_wood_small_dust": "Small Pile of Treated Wood Pulp", "item.treated_wood_tiny_dust": "Tiny Pile of Treated Wood Pulp", "item.wheat_dust": "Flour", @@ -4066,8 +4024,8 @@ "item.wheat_tiny_dust": "Tiny Pile of Flour", "item.wood_bolt": "Short Wood Stick", "item.wood_dust": "Wood Pulp", + "item.wood_long_rod": "Long Wood Stick", "item.wood_plate": "Wood Plank", - "item.wood_rodLong": "Long Wood Stick", "item.wood_small_dust": "Small Pile of Wood Pulp", "item.wood_tiny_dust": "Tiny Pile of Wood Pulp", "itemGroup.gtceu.decoration": "GregTech Decorations", @@ -4130,6 +4088,7 @@ "material.bio_diesel": "Bio Diesel", "material.biomass": "Biomass", "material.biotite": "Biotite", + "material.biphenyl": "Biphenyl", "material.bismuth": "Bismuth", "material.bismuth_bronze": "Bismuth Bronze", "material.bisphenol_a": "Bisphenol A", @@ -4305,7 +4264,7 @@ "material.gypsum": "Gypsum", "material.hafnium": "Hafnium", "material.hassium": "Hassium", - "material.hastelloy_c_276": "Hastelloy C 276", + "material.hastelloy_c_276": "Hastelloy C-276", "material.hastelloy_x": "Hastelloy X", "material.heavy_fuel": "Heavy Fuel", "material.helium": "Helium", @@ -4313,17 +4272,17 @@ "material.hematite": "Hematite", "material.high_octane_gasoline": "High Octane Gasoline", "material.holmium": "Holmium", - "material.hsla_steel": "HSLA-Steel", + "material.hsla_steel": "Hsla Steel", "material.hsse": "HSS-E", "material.hssg": "HSS-G", "material.hsss": "HSS-S", - "material.hydro_cracked_butadiene": "Hydro Cracked Butadiene", - "material.hydro_cracked_butane": "Hydro Cracked Butane", - "material.hydro_cracked_butene": "Hydro Cracked Butene", - "material.hydro_cracked_ethane": "Hydro Cracked Ethane", - "material.hydro_cracked_ethylene": "Hydro Cracked Ethylene", - "material.hydro_cracked_propane": "Hydro Cracked Propane", - "material.hydro_cracked_propene": "Hydro Cracked Propene", + "material.hydro_cracked_butadiene": "Hydro-Cracked Butadiene", + "material.hydro_cracked_butane": "Hydro-Cracked Butane", + "material.hydro_cracked_butene": "Hydro-Cracked Butene", + "material.hydro_cracked_ethane": "Hydro-Cracked Ethane", + "material.hydro_cracked_ethylene": "Hydro-Cracked Ethylene", + "material.hydro_cracked_propane": "Hydro-Cracked Propane", + "material.hydro_cracked_propene": "Hydro-Cracked Propene", "material.hydrochloric_acid": "Hydrochloric Acid", "material.hydrofluoric_acid": "Hydrofluoric Acid", "material.hydrogen": "Hydrogen", @@ -4333,7 +4292,7 @@ "material.ilmenite": "Ilmenite", "material.impure_enriched_naquadah_solution": "Impure Enriched Naquadah Solution", "material.impure_naquadria_solution": "Impure Naquadria Solution", - "material.incoloy_ma_956": "Incoloy Ma 956", + "material.incoloy_ma_956": "Incoloy MA-956", "material.indium": "Indium", "material.indium_concentrate": "Indium Concentrate", "material.indium_gallium_phosphide": "Indium Gallium Phosphide", @@ -4363,14 +4322,14 @@ "material.light_blue_dye": "Light Blue Dye", "material.light_fuel": "Light Fuel", "material.light_gray_dye": "Light Gray Dye", - "material.lightly_hydro_cracked_gas": "Lightly Hydro Cracked Gas", - "material.lightly_hydro_cracked_heavy_fuel": "Lightly Hydro Cracked Heavy Fuel", - "material.lightly_hydro_cracked_light_fuel": "Lightly Hydro Cracked Light Fuel", - "material.lightly_hydro_cracked_naphtha": "Lightly Hydro Cracked Naphtha", - "material.lightly_steam_cracked_gas": "Lightly Steam Cracked Gas", - "material.lightly_steam_cracked_heavy_fuel": "Lightly Steam Cracked Heavy Fuel", - "material.lightly_steam_cracked_light_fuel": "Lightly Steam Cracked Light Fuel", - "material.lightly_steam_cracked_naphtha": "Lightly Steam Cracked Naphtha", + "material.lightly_hydro_cracked_gas": "Lightly Hydro-Cracked Gas", + "material.lightly_hydro_cracked_heavy_fuel": "Lightly Hydro-Cracked Heavy Fuel", + "material.lightly_hydro_cracked_light_fuel": "Lightly Hydro-Cracked Light Fuel", + "material.lightly_hydro_cracked_naphtha": "Lightly Hydro-Cracked Naphtha", + "material.lightly_steam_cracked_gas": "Lightly Steam-Cracked Gas", + "material.lightly_steam_cracked_heavy_fuel": "Lightly Steam-Cracked Heavy Fuel", + "material.lightly_steam_cracked_light_fuel": "Lightly Steam-Cracked Light Fuel", + "material.lightly_steam_cracked_naphtha": "Lightly Steam-Cracked Naphtha", "material.lime_dye": "Lime Dye", "material.liquid_air": "Liquid Air", "material.liquid_ender_air": "Liquid Ender Air", @@ -4471,6 +4430,7 @@ "material.palladium": "Palladium", "material.palladium_raw": "Palladium Raw", "material.paper": "Paper", + "material.pcb_coolant": "PCB Coolant", "material.pentlandite": "Pentlandite", "material.perlite": "Perlite", "material.phenol": "Phenol", @@ -4491,6 +4451,7 @@ "material.polonium": "Polonium", "material.polybenzimidazole": "Polybenzimidazole", "material.polycaprolactam": "Polycaprolactam", + "material.polychlorinated_biphenyl": "Polychlorinated Biphenyl", "material.polydimethylsiloxane": "Polydimethylsiloxane", "material.polyethylene": "Polyethylene", "material.polyphenylene_sulfide": "Polyphenylene Sulfide", @@ -4564,14 +4525,14 @@ "material.seaborgium": "Seaborgium", "material.seed_oil": "Seed Oil", "material.selenium": "Selenium", - "material.severely_hydro_cracked_gas": "Severely Hydro Cracked Gas", - "material.severely_hydro_cracked_heavy_fuel": "Severely Hydro Cracked Heavy Fuel", - "material.severely_hydro_cracked_light_fuel": "Severely Hydro Cracked Light Fuel", - "material.severely_hydro_cracked_naphtha": "Severely Hydro Cracked Naphtha", - "material.severely_steam_cracked_gas": "Severely Steam Cracked Gas", - "material.severely_steam_cracked_heavy_fuel": "Severely Steam Cracked Heavy Fuel", - "material.severely_steam_cracked_light_fuel": "Severely Steam Cracked Light Fuel", - "material.severely_steam_cracked_naphtha": "Severely Steam Cracked Naphtha", + "material.severely_hydro_cracked_gas": "Severely Hydro-Cracked Gas", + "material.severely_hydro_cracked_heavy_fuel": "Severely Hydro-Cracked Heavy Fuel", + "material.severely_hydro_cracked_light_fuel": "Severely Hydro-Cracked Light Fuel", + "material.severely_hydro_cracked_naphtha": "Severely Hydro-Cracked Naphtha", + "material.severely_steam_cracked_gas": "Severely Steam-Cracked Gas", + "material.severely_steam_cracked_heavy_fuel": "Severely Steam-Cracked Heavy Fuel", + "material.severely_steam_cracked_light_fuel": "Severely Steam-Cracked Light Fuel", + "material.severely_steam_cracked_naphtha": "Severely Steam-Cracked Naphtha", "material.silicon": "Silicon", "material.silicon_dioxide": "Silicon Dioxide", "material.silicone_rubber": "Silicone Rubber", @@ -4592,15 +4553,15 @@ "material.spodumene": "Spodumene", "material.stainless_steel": "Stainless Steel", "material.steam": "Steam", - "material.steam_cracked_butadiene": "Steam Cracked Butadiene", - "material.steam_cracked_butane": "Steam Cracked Butane", - "material.steam_cracked_butene": "Steam Cracked Butene", - "material.steam_cracked_ethane": "Steam Cracked Ethane", - "material.steam_cracked_ethylene": "Steam Cracked Ethylene", - "material.steam_cracked_propane": "Steam Cracked Propane", - "material.steam_cracked_propene": "Steam Cracked Propene", + "material.steam_cracked_butadiene": "Steam-Cracked Butadiene", + "material.steam_cracked_butane": "Steam-Cracked Butane", + "material.steam_cracked_butene": "Steam-Cracked Butene", + "material.steam_cracked_ethane": "Steam-Cracked Ethane", + "material.steam_cracked_ethylene": "Steam-Cracked Ethylene", + "material.steam_cracked_propane": "Steam-Cracked Propane", + "material.steam_cracked_propene": "Steam-Cracked Propene", "material.steel": "Steel", - "material.stellite_100": "Stellite 100", + "material.stellite_100": "Stellite-100", "material.sterilized_growth_medium": "Sterilized Growth Medium", "material.sterling_silver": "Sterling Silver", "material.stibnite": "Stibnite", @@ -4687,7 +4648,7 @@ "material.yttrium": "Yttrium", "material.yttrium_barium_cuprate": "Yttrium Barium Cuprate", "material.zeolite": "Zeolite", - "material.zeron_100": "Zeron 100", + "material.zeron_100": "Zeron-100", "material.zinc": "Zinc", "material.zinc_sulfide": "Zinc Sulfide", "material.zincite": "Zincite", @@ -4911,15 +4872,5 @@ "tile.gtceu.petrified_foam.name": "Petrified Foam", "tile.gtceu.reinforced_foam.name": "Reinforced Foam", "tile.gtceu.reinforced_stone.name": "Reinforced Stone", - "tile.gtceu.seal.name": "Sealed Block", - "tile.stone_bricks_square.concrete_dark.name": "Square Dark Concrete Bricks", - "tile.wire_coil.tooltip_cracking": "§8Cracking Unit:", - "tile.wire_coil.tooltip_energy_cracking": " §aEnergy Usage: §f%s%%", - "tile.wire_coil.tooltip_energy_smelter": " §aEnergy Usage: §f%s EU/t §8per recipe", - "tile.wire_coil.tooltip_extended_info": "Hold SHIFT to show Coil Bonus Info", - "tile.wire_coil.tooltip_heat": "§cBase Heat Capacity: §f%d K", - "tile.wire_coil.tooltip_parallel_smelter": " §5Max Parallel: §f%s", - "tile.wire_coil.tooltip_pyro": "§8Pyrolyse Oven:", - "tile.wire_coil.tooltip_smelter": "§8Multi Smelter:", - "tile.wire_coil.tooltip_speed_pyro": " §bProcessing Speed: §f%s%%" + "tile.gtceu.seal.name": "Sealed Block" } \ No newline at end of file diff --git a/fabric/src/main/java/com/gregtechceu/gtceu/api/blockentity/fabric/MetaMachineBlockEntityImpl.java b/fabric/src/main/java/com/gregtechceu/gtceu/api/blockentity/fabric/MetaMachineBlockEntityImpl.java index 7cdd74de90..31d030274c 100644 --- a/fabric/src/main/java/com/gregtechceu/gtceu/api/blockentity/fabric/MetaMachineBlockEntityImpl.java +++ b/fabric/src/main/java/com/gregtechceu/gtceu/api/blockentity/fabric/MetaMachineBlockEntityImpl.java @@ -108,7 +108,7 @@ public static void onBlockEntityRegister(BlockEntityType type) { return ItemTransferHelperImpl.toItemVariantStorage(new LDItemEndpointMachine.ItemHandlerWrapper(transfer)); } } - var transfer = ((IMachineBlockEntity)blockEntity).getMetaMachine().getItemTransferCap(side); + var transfer = ((IMachineBlockEntity)blockEntity).getMetaMachine().getItemTransferCap(side, true); return transfer == null ? null : ItemTransferHelperImpl.toItemVariantStorage(transfer); }, type); FluidStorage.SIDED.registerForBlockEntity((blockEntity, side) -> { @@ -122,7 +122,7 @@ public static void onBlockEntityRegister(BlockEntityType type) { return FluidTransferHelperImpl.toFluidVariantStorage(new LDFluidEndpointMachine.FluidHandlerWrapper(transfer)); } } - var transfer = ((IMachineBlockEntity)blockEntity).getMetaMachine().getFluidTransferCap(side); + var transfer = ((IMachineBlockEntity)blockEntity).getMetaMachine().getFluidTransferCap(side, true); return transfer == null ? null : FluidTransferHelperImpl.toFluidVariantStorage(transfer); }, type); GTCapability.CAPABILITY_LASER.registerForBlockEntity((blockEntity, side) -> { diff --git a/fabric/src/main/java/com/gregtechceu/gtceu/api/item/fabric/GTBucketItem.java b/fabric/src/main/java/com/gregtechceu/gtceu/api/item/fabric/GTBucketItem.java index b3b8e7b32e..906508db2c 100644 --- a/fabric/src/main/java/com/gregtechceu/gtceu/api/item/fabric/GTBucketItem.java +++ b/fabric/src/main/java/com/gregtechceu/gtceu/api/item/fabric/GTBucketItem.java @@ -3,12 +3,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.fluids.GTFluid; -import com.gregtechceu.gtceu.client.renderer.item.GTBucketItemRenderer; -import com.lowdragmc.lowdraglib.Platform; -import com.lowdragmc.lowdraglib.client.renderer.IItemRendererProvider; -import com.lowdragmc.lowdraglib.client.renderer.IRenderer; -import com.lowdragmc.lowdraglib.side.fluid.FluidHelper; -import com.lowdragmc.lowdraglib.side.fluid.FluidStack; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BucketItem; @@ -22,16 +16,14 @@ * @date 2023/3/28 * @implNote GTBucketItem */ -public class GTBucketItem extends BucketItem implements IItemRendererProvider { +public class GTBucketItem extends BucketItem { Fluid fluid; - IRenderer renderer; final Material material; final String langKey; public GTBucketItem(Supplier fluid, Properties properties, Material material, String langKey) { super(fluid.get(), properties); this.fluid = fluid.get(); - renderer = FluidHelper.isLighterThanAir(FluidStack.create(this.fluid, FluidHelper.getBucket())) ? GTBucketItemRenderer.INSTANCE_GAS : GTBucketItemRenderer.INSTANCE; this.material = material; this.langKey = langKey; } @@ -46,11 +38,6 @@ public void onRegister() { } } - @Override - public IRenderer getRenderer(ItemStack stack) { - return renderer; - } - public static int color(ItemStack itemStack, int index) { if (itemStack.getItem() instanceof GTBucketItem item) { if (index == 1) { diff --git a/fabric/src/main/java/com/gregtechceu/gtceu/common/blockentity/fabric/FluidPipeBlockEntityImpl.java b/fabric/src/main/java/com/gregtechceu/gtceu/common/blockentity/fabric/FluidPipeBlockEntityImpl.java index a9d8e88ce1..5f6318349c 100644 --- a/fabric/src/main/java/com/gregtechceu/gtceu/common/blockentity/fabric/FluidPipeBlockEntityImpl.java +++ b/fabric/src/main/java/com/gregtechceu/gtceu/common/blockentity/fabric/FluidPipeBlockEntityImpl.java @@ -8,7 +8,9 @@ import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeNet; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.PipeNetRoutePath; import com.lowdragmc.lowdraglib.side.fluid.FluidStack; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; import com.lowdragmc.lowdraglib.side.fluid.fabric.FluidHelperImpl; +import com.lowdragmc.lowdraglib.side.fluid.fabric.FluidTransferHelperImpl; import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import lombok.Setter; @@ -73,6 +75,15 @@ public Storage getFluidStorage(@Nullable Direction side) { return null; } + public static IFluidTransfer getNetHandler(FluidPipeBlockEntity pipe, @Nullable Direction side) { + Storage fluidStorage = ((FluidPipeBlockEntityImpl) pipe).getFluidStorage(side); + + if (fluidStorage == null) + fluidStorage = Storage.empty(); + + return FluidTransferHelperImpl.toFluidTransfer(fluidStorage); + } + class FluidVariantStorage extends SnapshotParticipant implements Storage { private final FluidPipeNet net; diff --git a/fabric/src/main/java/com/gregtechceu/gtceu/core/fabric/MixinHelpersImpl.java b/fabric/src/main/java/com/gregtechceu/gtceu/core/fabric/MixinHelpersImpl.java index 8e1faa5c56..aeb1802ba8 100644 --- a/fabric/src/main/java/com/gregtechceu/gtceu/core/fabric/MixinHelpersImpl.java +++ b/fabric/src/main/java/com/gregtechceu/gtceu/core/fabric/MixinHelpersImpl.java @@ -2,16 +2,27 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; +import com.mojang.datafixers.util.Pair; +import it.unimi.dsi.fastutil.objects.Object2BooleanMap; +import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler; import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback; import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.material.FlowingFluid; +import java.util.HashSet; +import java.util.Set; + public class MixinHelpersImpl { + private static final Set> registeredFluidTextures = new HashSet<>(); + public static void addFluidTexture(Material material, FluidStorage.FluidEntry value) { + if (registeredFluidTextures.contains(Pair.of(material, value.getStillTexture()))) return; + registeredFluidTextures.add(Pair.of(material, value.getStillTexture())); if (value.getFluid().get() instanceof FlowingFluid flowingFluid) { FluidVariantRendering.register(flowingFluid.getFlowing(), new GTFluidVariantRenderHandler()); FluidVariantRendering.register(flowingFluid.getSource(), new GTFluidVariantRenderHandler()); diff --git a/forge/build.gradle b/forge/build.gradle index 8204beaa69..411828d774 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -64,6 +64,16 @@ configurations { // snapshotModImplementation { // resolutionStrategy.cacheChangingModulesFor(0, "seconds") // } + + apiElements { + outgoing { + capability("net.minecraftforge:forge:${this.forge.versions.minecratfForge.get()}") + capability("com.lowdragmc.ldlib:ldlib-forge-${this.libs.versions.minecraft.get()}:${this.forge.versions.ldlib.get()}") + capability("com.tterrag.registrate:Registrate:${this.forge.versions.registrate.get()}") + capability("dev.toma.configuration:configuration-forge-${this.libs.versions.minecraft.get()}:${this.forge.versions.configuration.get()}") + capability("io.github.llamalad7:mixinextras-forge:${this.forge.versions.mixinextras.get()}") + } + } } //configurations.all { diff --git a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json index d0766f8220..aee7b9a374 100644 --- a/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json +++ b/forge/src/generated/resources/assets/gtceu/compass/nodes/materials/wire_and_cable.json @@ -241,15 +241,6 @@ "gtceu:vanadium_gallium_single_cable", "gtceu:yttrium_barium_cuprate_single_cable", "gtceu:graphene_single_cable", - "gtceu:manganese_phosphide_single_cable", - "gtceu:magnesium_diboride_single_cable", - "gtceu:mercury_barium_calcium_cuprate_single_cable", - "gtceu:uranium_triplatinum_single_cable", - "gtceu:samarium_iron_arsenic_oxide_single_cable", - "gtceu:indium_tin_barium_titanium_cuprate_single_cable", - "gtceu:uranium_rhodium_dinaquadide_single_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_single_cable", - "gtceu:ruthenium_trinium_americium_neutronate_single_cable", "gtceu:black_steel_single_cable", "gtceu:tungsten_steel_single_cable", "gtceu:naquadah_alloy_single_cable", @@ -283,15 +274,6 @@ "gtceu:vanadium_gallium_double_cable", "gtceu:yttrium_barium_cuprate_double_cable", "gtceu:graphene_double_cable", - "gtceu:manganese_phosphide_double_cable", - "gtceu:magnesium_diboride_double_cable", - "gtceu:mercury_barium_calcium_cuprate_double_cable", - "gtceu:uranium_triplatinum_double_cable", - "gtceu:samarium_iron_arsenic_oxide_double_cable", - "gtceu:indium_tin_barium_titanium_cuprate_double_cable", - "gtceu:uranium_rhodium_dinaquadide_double_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_double_cable", - "gtceu:ruthenium_trinium_americium_neutronate_double_cable", "gtceu:black_steel_double_cable", "gtceu:tungsten_steel_double_cable", "gtceu:naquadah_alloy_double_cable", @@ -325,15 +307,6 @@ "gtceu:vanadium_gallium_quadruple_cable", "gtceu:yttrium_barium_cuprate_quadruple_cable", "gtceu:graphene_quadruple_cable", - "gtceu:manganese_phosphide_quadruple_cable", - "gtceu:magnesium_diboride_quadruple_cable", - "gtceu:mercury_barium_calcium_cuprate_quadruple_cable", - "gtceu:uranium_triplatinum_quadruple_cable", - "gtceu:samarium_iron_arsenic_oxide_quadruple_cable", - "gtceu:indium_tin_barium_titanium_cuprate_quadruple_cable", - "gtceu:uranium_rhodium_dinaquadide_quadruple_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_quadruple_cable", - "gtceu:ruthenium_trinium_americium_neutronate_quadruple_cable", "gtceu:black_steel_quadruple_cable", "gtceu:tungsten_steel_quadruple_cable", "gtceu:naquadah_alloy_quadruple_cable", @@ -367,15 +340,6 @@ "gtceu:vanadium_gallium_octal_cable", "gtceu:yttrium_barium_cuprate_octal_cable", "gtceu:graphene_octal_cable", - "gtceu:manganese_phosphide_octal_cable", - "gtceu:magnesium_diboride_octal_cable", - "gtceu:mercury_barium_calcium_cuprate_octal_cable", - "gtceu:uranium_triplatinum_octal_cable", - "gtceu:samarium_iron_arsenic_oxide_octal_cable", - "gtceu:indium_tin_barium_titanium_cuprate_octal_cable", - "gtceu:uranium_rhodium_dinaquadide_octal_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_octal_cable", - "gtceu:ruthenium_trinium_americium_neutronate_octal_cable", "gtceu:black_steel_octal_cable", "gtceu:tungsten_steel_octal_cable", "gtceu:naquadah_alloy_octal_cable", @@ -409,15 +373,6 @@ "gtceu:vanadium_gallium_hex_cable", "gtceu:yttrium_barium_cuprate_hex_cable", "gtceu:graphene_hex_cable", - "gtceu:manganese_phosphide_hex_cable", - "gtceu:magnesium_diboride_hex_cable", - "gtceu:mercury_barium_calcium_cuprate_hex_cable", - "gtceu:uranium_triplatinum_hex_cable", - "gtceu:samarium_iron_arsenic_oxide_hex_cable", - "gtceu:indium_tin_barium_titanium_cuprate_hex_cable", - "gtceu:uranium_rhodium_dinaquadide_hex_cable", - "gtceu:enriched_naquadah_trinium_europium_duranide_hex_cable", - "gtceu:ruthenium_trinium_americium_neutronate_hex_cable", "gtceu:black_steel_hex_cable", "gtceu:tungsten_steel_hex_cable", "gtceu:naquadah_alloy_hex_cable", diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_ud.json b/forge/src/generated/resources/assets/gtceu/lang/en_ud.json index 6f6f08223b..a21a778afb 100644 --- a/forge/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/forge/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -69,13 +69,6 @@ "behaviour.wrench": "ʞɔıןɔʇɥbıᴚ uo sʞɔoןᗺ sǝʇɐʇoᴚ", "block.filter.tooltip": "ʇuǝɯuoɹıʌuǝ ㄥ§ǝǝɹℲ-ǝןɔıʇɹɐԀɐ§ ɐ sǝʇɐǝɹƆ", "block.filter_sterile.tooltip": "ʇuǝɯuoɹıʌuǝ ㄥ§pǝzıןıɹǝʇSɐ§ ɐ sǝʇɐǝɹƆ", - "block.fusion_casing": "buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_casing_mk2": "II ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_casing_mk3": "III ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", - "block.fusion_coil": "ʞɔoןᗺ ןıoƆ uoısnℲ", - "block.gtceu.active_casing_assembly_line": "buısɐƆ ǝuıꞀ ʎןqɯǝssⱯ", - "block.gtceu.active_casing_engine_intake": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ", - "block.gtceu.active_casing_extreme_engine_intake": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ ǝɯǝɹʇxƎ", "block.gtceu.active_transformer": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ", "block.gtceu.alloy_blast_smelter": "ɹǝʇןǝɯS ʇsɐןᗺ ʎoןןⱯ", "block.gtceu.aluminium_crate": "ǝʇɐɹƆ ɯnıuıɯnןⱯ", @@ -83,48 +76,22 @@ "block.gtceu.assembly_line": "ǝuıꞀ ʎןqɯǝssⱯ", "block.gtceu.assembly_line_casing": "buısɐƆ ǝuıꞀ ʎןqɯǝssⱯ", "block.gtceu.assembly_line_grating": "buıʇɐɹ⅁ ǝuıꞀ ʎןqɯǝssⱯ", - "block.gtceu.assembly_line_unit": "ʇıu∩ ǝuıꞀ ʎןqɯǝssⱯ", + "block.gtceu.assembly_line_unit": "buısɐƆ ןoɹʇuoƆ ʎןqɯǝssⱯ", "block.gtceu.atomic_casing": "buısɐƆ ɔıɯoʇⱯ", "block.gtceu.auto_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW oʇnⱯ", "block.gtceu.bronze_brick_casing": "buısɐƆ ʞɔıɹᗺ ǝzuoɹᗺ", "block.gtceu.bronze_crate": "ǝʇɐɹƆ ǝzuoɹᗺ", "block.gtceu.bronze_drum": "ɯnɹᗡ ǝzuoɹᗺ", - "block.gtceu.bronze_firebox": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ", "block.gtceu.bronze_firebox_casing": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ", - "block.gtceu.bronze_gearbox": "xoqɹɐǝ⅁ ǝzuoɹᗺ", + "block.gtceu.bronze_gearbox": "buısɐƆ xoqɹɐǝ⅁ ǝzuoɹᗺ", "block.gtceu.bronze_large_boiler": "ɹǝןıoᗺ ǝzuoɹᗺ ǝbɹɐꞀ", "block.gtceu.bronze_machine_casing": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ", "block.gtceu.bronze_pipe_casing": "buısɐƆ ǝdıԀ ǝzuoɹᗺ", - "block.gtceu.casing_aluminium_frostproof": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ɟooɹԀ ʇsoɹℲ", - "block.gtceu.casing_assembly_control": "buısɐƆ ןoɹʇuoƆ ʎןqɯǝssⱯ", "block.gtceu.casing_bronze_bricks": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ", - "block.gtceu.casing_bronze_gearbox": "buısɐƆ xoqɹɐǝ⅁ ǝzuoɹᗺ", - "block.gtceu.casing_bronze_pipe": "buısɐƆ ǝdıԀ ǝzuoɹᗺ", "block.gtceu.casing_coke_bricks": "sʞɔıɹᗺ uǝʌO ǝʞoƆ", "block.gtceu.casing_grate": "buısɐƆ ǝuıɥɔɐW ǝʇɐɹ⅁", - "block.gtceu.casing_hsse_sturdy": "buısɐƆ ǝuıɥɔɐW Ǝ-SSH ʎpɹnʇS", - "block.gtceu.casing_invar_heatproof": "buısɐƆ ǝuıɥɔɐW ɹɐʌuI ɟooɹԀ ʇɐǝH", - "block.gtceu.casing_laminated_glass": "ssɐן⅁ pǝʇɐuıɯɐꞀ", - "block.gtceu.casing_polytetrafluoroethylene_pipe": "buısɐƆ ǝdıԀ ƎℲ⟘Ԁ", "block.gtceu.casing_primitive_bricks": "sʞɔıɹqǝɹıℲ", - "block.gtceu.casing_ptfe_inert": "buısɐƆ ǝuıɥɔɐW ƎℲ⟘Ԁ ʇɹǝuI ʎןןɐɔıɯǝɥƆ", - "block.gtceu.casing_pump_deck": "ʞɔǝᗡ dɯnԀ", - "block.gtceu.casing_stainless_clean": "buısɐƆ ןǝǝʇS ssǝןuıɐʇS uɐǝןƆ", - "block.gtceu.casing_stainless_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.casing_stainless_turbine": "buısɐƆ ǝuıqɹn⟘ ssǝןuıɐʇS", - "block.gtceu.casing_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS", - "block.gtceu.casing_steel_pipe": "buısɐƆ ǝdıԀ ןǝǝʇS", - "block.gtceu.casing_steel_solid": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS pıןoS", - "block.gtceu.casing_steel_turbine": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS", - "block.gtceu.casing_titanium_gearbox": "buısɐƆ xoqɹɐǝ⅁ ɯnıuɐʇı⟘", - "block.gtceu.casing_titanium_pipe": "buısɐƆ ǝdıԀ ɯnıuɐʇı⟘", - "block.gtceu.casing_titanium_stable": "buısɐƆ ǝuıɥɔɐW ɯnıuɐʇı⟘ ǝןqɐʇS", - "block.gtceu.casing_titanium_turbine": "buısɐƆ ǝuıqɹn⟘ ɯnıuɐʇı⟘", - "block.gtceu.casing_tungstensteel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.casing_tungstensteel_pipe": "buısɐƆ ǝdıԀ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.casing_tungstensteel_robust": "buısɐƆ ǝuıɥɔɐW ןǝǝʇsuǝʇsbun⟘ ʇsnqoᴚ", - "block.gtceu.casing_tungstensteel_turbine": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.clean_machine_casing": "buısɐƆ ǝuıɥɔɐW uɐǝןƆ", + "block.gtceu.clean_machine_casing": "buısɐƆ ןǝǝʇS ssǝןuıɐʇS uɐǝןƆ", "block.gtceu.cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ", "block.gtceu.cleanroom": "ɯooɹuɐǝןƆ", "block.gtceu.cleanroom_glass": "ssɐן⅁ ɯooɹuɐǝןƆ", @@ -225,16 +192,16 @@ "block.gtceu.extreme_engine_intake_casing": "buısɐƆ ǝʞɐʇuI ǝuıbuƎ ǝɯǝɹʇxƎ", "block.gtceu.filter_casing": "buısɐƆ ɹǝʇןıℲ", "block.gtceu.firebricks": "sʞɔıɹqǝɹıℲ", - "block.gtceu.frostproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɟooɹdʇsoɹℲ", - "block.gtceu.fusion_casing": "buısɐƆ uoısnℲ", - "block.gtceu.fusion_casing_mk2": "ᄅʞW buısɐƆ uoısnℲ", - "block.gtceu.fusion_casing_mk3": "ƐʞW buısɐƆ uoısnℲ", - "block.gtceu.fusion_coil": "ןıoƆ uoısnℲ", + "block.gtceu.frostproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ɟooɹԀ ʇsoɹℲ", + "block.gtceu.fusion_casing": "buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_casing_mk2": "II ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_casing_mk3": "III ʞW buısɐƆ ǝuıɥɔɐW uoısnℲ", + "block.gtceu.fusion_coil": "ʞɔoןᗺ ןıoƆ uoısnℲ", "block.gtceu.fusion_glass": "ssɐן⅁ uoısnℲ", - "block.gtceu.gas_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ sɐ⅁", + "block.gtceu.gas_large_turbine": "ǝuıqɹn⟘ sɐ⅁ ǝbɹɐꞀ", "block.gtceu.gold_drum": "ɯnɹᗡ pןo⅁", "block.gtceu.heat_vent": "ʇuǝΛ ʇɐǝH", - "block.gtceu.heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɟooɹdʇɐǝH", + "block.gtceu.heatproof_machine_casing": "buısɐƆ ǝuıɥɔɐW ɹɐʌuI ɟooɹԀ ʇɐǝH", "block.gtceu.high_power_casing": "buısɐƆ ɹǝʍoԀ ɥbıH", "block.gtceu.high_temperature_smelting_casing": "buısɐƆ buıʇןǝɯS ǝɹnʇɐɹǝdɯǝ⟘ ɥbıH", "block.gtceu.hp_steam_alloy_smelter": "ɹǝʇןǝɯS ʎoןןⱯ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", @@ -246,7 +213,7 @@ "block.gtceu.hp_steam_macerator": "ɹoʇɐɹǝɔɐW ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", "block.gtceu.hp_steam_rock_crusher": "ɹǝɥsnɹƆ ʞɔoᴚ ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", "block.gtceu.hp_steam_solid_boiler": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH", - "block.gtceu.hssg_coil_block": "ʞɔoןᗺ ןıoƆ bssH", + "block.gtceu.hssg_coil_block": "ʞɔoןᗺ ןıoƆ ⅁-SSH", "block.gtceu.hv_16a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐ9Ɩ ΛH", "block.gtceu.hv_1a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ⱯƖ ΛH", "block.gtceu.hv_4a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐㄣ ΛH", @@ -329,7 +296,7 @@ "block.gtceu.hv_wiremill": "ɹ§II ןןıɯǝɹıM pǝɔuɐʌpⱯ9§", "block.gtceu.implosion_compressor": "ɹossǝɹdɯoƆ uoısoןdɯI", "block.gtceu.industrial_steam_casing": "buısɐƆ ɯɐǝʇS ןɐıɹʇsnpuI", - "block.gtceu.inert_machine_casing": "buısɐƆ ǝuıɥɔɐW ʇɹǝuI", + "block.gtceu.inert_machine_casing": "buısɐƆ ǝuıɥɔɐW ƎℲ⟘Ԁ ʇɹǝuI ʎןןɐɔıɯǝɥƆ", "block.gtceu.infinite_energy": "ʎbɹǝuƎ ǝʇıuıɟuI", "block.gtceu.iv_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌI", "block.gtceu.iv_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌI", @@ -715,6 +682,9 @@ "block.gtceu.naquadah_coil_block": "ʞɔoןᗺ ןıoƆ ɥɐpɐnbɐN", "block.gtceu.nichrome_coil_block": "ʞɔoןᗺ ןıoƆ ǝɯoɹɥɔıN", "block.gtceu.nonconducting_casing": "buısɐƆ buıʇɔnpuoɔuoN", + "block.gtceu.oil_heavy": "ןıO ʎʌɐǝH", + "block.gtceu.oil_light": "ןıO ʇɥbıꞀ", + "block.gtceu.oil_medium": "ןıO ʍɐᴚ", "block.gtceu.opv_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌdO", "block.gtceu.opv_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɐㄣᄅ0Ɩ ʌdO", "block.gtceu.opv_16a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ Ɐ9Ɩ ΛdO", @@ -782,15 +752,15 @@ "block.gtceu.opv_thermal_centrifuge": "ɹ§ ǝbnɟıɹʇuǝƆ ןɐɯɹǝɥ⟘ ʎɹɐpuǝbǝꞀ6§", "block.gtceu.opv_wiremill": "ɹ§ ןןıɯǝɹıM ʎɹɐpuǝbǝꞀ6§", "block.gtceu.plascrete": "ǝʇǝɹɔsɐןԀ", - "block.gtceu.plasma_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ ɐɯsɐןԀ", + "block.gtceu.plasma_large_turbine": "ǝuıqɹn⟘ ɐɯsɐןԀ ǝbɹɐꞀ", "block.gtceu.primitive_blast_furnace": "ǝɔɐuɹnℲ ʇsɐןᗺ ǝʌıʇıɯıɹԀ", "block.gtceu.primitive_pump": "dɯnԀ ǝʌıʇıɯıɹԀ", - "block.gtceu.ptfe_pipe_casing": "buısɐƆ ǝdıԀ ǝɟʇd", + "block.gtceu.ptfe_pipe_casing": "buısɐƆ ǝdıԀ ƎℲ⟘Ԁ", "block.gtceu.pump_deck": "ʞɔǝᗡ dɯnԀ", "block.gtceu.pump_hatch": "ɥɔʇɐH dɯnԀ", "block.gtceu.pyrolyse_oven": "uǝʌO ǝsʎןoɹʎԀ", "block.gtceu.reaction_safe_mixing_casing": "buısɐƆ buıxıW ǝɟɐS-uoıʇɔɐǝᴚ", - "block.gtceu.robust_machine_casing": "buısɐƆ ǝuıɥɔɐW ʇsnqoᴚ", + "block.gtceu.robust_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇsuǝʇsbun⟘ ʇsnqoᴚ", "block.gtceu.rubber_leaves": "sǝʌɐǝꞀ ɹǝqqnᴚ", "block.gtceu.rubber_log": "boꞀ ɹǝqqnᴚ", "block.gtceu.rubber_planks": "sʞuɐןԀ ɹǝqqnᴚ", @@ -799,11 +769,11 @@ "block.gtceu.shock_proof_cutting_casing": "buısɐƆ buıʇʇnƆ ɟooɹԀ ʞɔoɥS", "block.gtceu.slicing_blades": "sǝpɐןᗺ buıɔıןS", "block.gtceu.solid_machine_casing": "buısɐƆ ǝuıɥɔɐW pıןoS", - "block.gtceu.stable_machine_casing": "buısɐƆ ǝuıɥɔɐW ǝןqɐʇS", + "block.gtceu.stable_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯnıuɐʇı⟘ ǝןqɐʇS", "block.gtceu.stainless_steel_crate": "ǝʇɐɹƆ ןǝǝʇS ssǝןuıɐʇS", "block.gtceu.stainless_steel_drum": "ɯnɹᗡ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.stainless_steel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", - "block.gtceu.stainless_steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS ssǝןuıɐʇS", + "block.gtceu.stainless_steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS ssǝןuıɐʇS", + "block.gtceu.stainless_steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ssǝןuıɐʇS", "block.gtceu.steam_casing_bricked_bronze": "ןןnH ǝzuoɹᗺ pǝʞɔıɹᗺ", "block.gtceu.steam_casing_bricked_bronze.tooltip": "sǝuıɥɔɐW ɯɐǝʇS ʇsɹıɟ ɹnoʎ ɹoℲㄥ§", "block.gtceu.steam_casing_bricked_steel": "ןןnH uoɹI ʇɥbnoɹM pǝʞɔıɹᗺ", @@ -815,7 +785,7 @@ "block.gtceu.steam_grinder": "ɹǝpuıɹ⅁ ɯɐǝʇS", "block.gtceu.steam_input_bus": ")ɯɐǝʇS( snᗺ ʇnduI", "block.gtceu.steam_input_hatch": "ɥɔʇɐH ʇnduI ɯɐǝʇS", - "block.gtceu.steam_large_turbine": "ǝuıqɹn⟘ ǝbɹɐꞀ ɯɐǝʇS", + "block.gtceu.steam_large_turbine": "ǝuıqɹn⟘ ɯɐǝʇS ǝbɹɐꞀ", "block.gtceu.steam_liquid_boiler.bronze": "ɹǝןıoᗺ pınbıꞀ ɯɐǝʇS ןןɐɯS", "block.gtceu.steam_machine_casing": "buısɐƆ ǝuıɥɔɐW ɯɐǝʇS", "block.gtceu.steam_miner": "ɹǝuıW ɯɐǝʇS", @@ -825,23 +795,21 @@ "block.gtceu.steel_brick_casing": "buısɐƆ ʞɔıɹᗺ ןǝǝʇS", "block.gtceu.steel_crate": "ǝʇɐɹƆ ןǝǝʇS", "block.gtceu.steel_drum": "ɯnɹᗡ ןǝǝʇS", - "block.gtceu.steel_firebox": "buısɐƆ xoqǝɹıℲ ןǝǝʇS", "block.gtceu.steel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇS", - "block.gtceu.steel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇS", + "block.gtceu.steel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇS", "block.gtceu.steel_large_boiler": "ɹǝןıoᗺ ןǝǝʇS ǝbɹɐꞀ", - "block.gtceu.steel_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS", + "block.gtceu.steel_machine_casing": "buısɐƆ ǝuıɥɔɐW ןǝǝʇS pıןoS", "block.gtceu.steel_pipe_casing": "buısɐƆ ǝdıԀ ןǝǝʇS", "block.gtceu.steel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇS", "block.gtceu.sterilizing_filter_casing": "buısɐƆ ɹǝʇןıℲ buızıןıɹǝʇS", "block.gtceu.stress_proof_casing": "buısɐƆ ɟooɹԀ ssǝɹʇS", - "block.gtceu.sturdy_machine_casing": "buısɐƆ ǝuıɥɔɐW ʎpɹnʇS", - "block.gtceu.superconducting_coil": "ןıoƆ buıʇɔnpuoɔɹǝdnS", + "block.gtceu.sturdy_machine_casing": "buısɐƆ ǝuıɥɔɐW Ǝ-SSH ʎpɹnʇS", + "block.gtceu.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS", "block.gtceu.tempered_glass": "ssɐן⅁ pǝɹǝdɯǝ⟘", "block.gtceu.titanium_crate": "ǝʇɐɹƆ ɯnıuɐʇı⟘", "block.gtceu.titanium_drum": "ɯnɹᗡ ɯnıuɐʇı⟘", - "block.gtceu.titanium_firebox": "buısɐƆ xoqǝɹıℲ ɯnıuɐʇı⟘", "block.gtceu.titanium_firebox_casing": "buısɐƆ xoqǝɹıℲ ɯnıuɐʇı⟘", - "block.gtceu.titanium_gearbox": "xoqɹɐǝ⅁ ɯnıuɐʇı⟘", + "block.gtceu.titanium_gearbox": "buısɐƆ xoqɹɐǝ⅁ ɯnıuɐʇı⟘", "block.gtceu.titanium_large_boiler": "ɹǝןıoᗺ ɯnıuɐʇı⟘ ǝbɹɐꞀ", "block.gtceu.titanium_pipe_casing": "buısɐƆ ǝdıԀ ɯnıuɐʇı⟘", "block.gtceu.titanium_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ɯnıuɐʇı⟘", @@ -851,9 +819,8 @@ "block.gtceu.tungsten_steel_crate": "ǝʇɐɹƆ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungsten_steel_drum": "ɯnɹᗡ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_coil_block": "ʞɔoןᗺ ןıoƆ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.tungstensteel_firebox": "buısɐƆ xoqǝɹıℲ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇsuǝʇsbun⟘", - "block.gtceu.tungstensteel_gearbox": "xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", + "block.gtceu.tungstensteel_gearbox": "buısɐƆ xoqɹɐǝ⅁ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_large_boiler": "ɹǝןıoᗺ ןǝǝʇsuǝʇsbun⟘ ǝbɹɐꞀ", "block.gtceu.tungstensteel_pipe_casing": "buısɐƆ ǝdıԀ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.tungstensteel_turbine_casing": "buısɐƆ ǝuıqɹn⟘ ןǝǝʇsuǝʇsbun⟘", @@ -1236,14 +1203,6 @@ "block.gtceu.wire_coil.tooltip_pyro": ":uǝʌO ǝsʎןoɹʎԀ8§", "block.gtceu.wire_coil.tooltip_smelter": ":ɹǝʇןǝɯS ıʇןnW8§", "block.gtceu.wire_coil.tooltip_speed_pyro": "%s%%ɟ§ :pǝǝdS buıssǝɔoɹԀq§ ", - "block.gtceu.wire_coil_cupronickel": "ʞɔoןᗺ ןıoƆ ןǝʞɔıuoɹdnƆ", - "block.gtceu.wire_coil_hss_g": "ʞɔoןᗺ ןıoƆ ⅁-SSH", - "block.gtceu.wire_coil_kanthal": "ʞɔoןᗺ ןıoƆ ןɐɥʇuɐʞ", - "block.gtceu.wire_coil_naquadah": "ʞɔoןᗺ ןıoƆ ɥɐpɐnbɐN", - "block.gtceu.wire_coil_nichrome": "ʞɔoןᗺ ןıoƆ ǝɯoɹɥɔıN", - "block.gtceu.wire_coil_trinium": "ʞɔoןᗺ ןıoƆ ɯnıuıɹ⟘", - "block.gtceu.wire_coil_tritanium": "ʞɔoןᗺ ןıoƆ ɯnıuɐʇıɹ⟘", - "block.gtceu.wire_coil_tungstensteel": "ʞɔoןᗺ ןıoƆ ןǝǝʇsuǝʇsbun⟘", "block.gtceu.wood_crate": "ǝʇɐɹƆ uǝpooM", "block.gtceu.wood_drum": "ןǝɹɹɐᗺ uǝpooM", "block.gtceu.zpm_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɐㄣᄅ0Ɩ ɯdZ", @@ -1324,7 +1283,6 @@ "block.gtceu.zpm_transformer_2a": "ɹǝɯɹoɟsuɐɹ⟘ )xᄅ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_transformer_4a": "ɹǝɯɹoɟsuɐɹ⟘ )xㄣ( dɯⱯ-ıH ǝbɐʇןoΛ WԀZ", "block.gtceu.zpm_wiremill": "ɹ§III ןןıɯǝɹıM ǝʇıןƎɔ§", - "block.superconducting_coil": "ʞɔoןᗺ ןıoƆ buıʇɔnpuoɔɹǝdnS", "compass.node.gtceu.batteries/energy_cluster": "ɹǝʇsnןƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_crystal": "ןɐʇsʎɹƆ ʎbɹǝuƎ", "compass.node.gtceu.batteries/energy_module": "ǝןnpoW ʎbɹǝuƎ", @@ -1790,6 +1748,7 @@ "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.dumpAssets": "sʇǝssⱯdɯnp", "config.gtceu.option.dumpRecipes": "sǝdıɔǝᴚdɯnp", "config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ", "config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ", @@ -1891,15 +1850,14 @@ "cover.conveyor.blocks_input.disabled.1": "pǝןqɐsıᗡɔ§", "cover.conveyor.blocks_input.enabled.0": "˙ǝdıd oʇuı ʎɹoʇuǝʌuı ǝɥʇ ɯoɹɟ sɯǝʇı ןןnd oʇ ʇǝs sı ɹǝʌoɔ uǝɥʍ pǝʇɹǝsuı ǝq ʇou ןןıʍ sɯǝʇı 'pǝןqɐuǝ ɟI", "cover.conveyor.blocks_input.enabled.1": "pǝןqɐuƎɐ§", - "cover.conveyor.distribution.first_insert.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.first_insert.1": "ɹ§ʇɹǝsuI ʇsɹıℲq§", - "cover.conveyor.distribution.first_insert.2": "spuıɟ ʇı ʎɹoʇuǝʌuı ʇsɹıɟ ǝɥʇ oʇuı ʇɹǝsuı ןןıMㄥ§", - "cover.conveyor.distribution.round_robin.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.round_robin.1": "ʎʇıɹoıɹԀ ɥʇıʍ ɹ§uıqoᴚ punoᴚq§", - "cover.conveyor.distribution.round_robin.2": "sǝıɹoʇuǝʌuı oʇ ʎןןɐnbǝ sɯǝʇı ʇıןds oʇ sǝıɹ⟘ㄥ§", - "cover.conveyor.distribution.round_robin_enhanced.0": "ǝpoW uoıʇnqıɹʇsıᗡ", - "cover.conveyor.distribution.round_robin_enhanced.1": "ɹ§uıqoᴚ punoᴚ pǝɔuɐɥuƎq§", - "cover.conveyor.distribution.round_robin_enhanced.2": "sǝıɹoʇuǝʌuı ןןɐ oʇ ʎןןɐnbǝ sɯǝʇı sʇıןdSㄥ§", + "cover.conveyor.distribution.insert_first.0": "ʎʇıɹoıɹԀq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.insert_first.1": "˙puıɟ uɐɔ ʇı ʎʇıɹoıɹd ʇsǝɥbıɥ ǝɥʇ ɥʇıʍ ʎɹoʇuǝʌuı ʇsɹıɟ ǝɥʇ oʇuı ʇɹǝsuı ןןıMㄥ§", + "cover.conveyor.distribution.insert_first.2": "˙ɥʇɐd ɐ ɟo ʎʇıɹoıɹd ǝɥʇ ɹǝʍoן sǝdıd ɯǝʇı ǝʌıʇɔıɹʇsǝᴚㄥ§", + "cover.conveyor.distribution.round_robin_global.0": "uıqoᴚ punoᴚq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.round_robin_global.1": "sǝıɹoʇuǝʌuı pǝʇɔǝuuoɔ ssoɹɔɐ ʎןןɐnbǝ sɯǝʇı sʇıןdSㄥ§", + "cover.conveyor.distribution.round_robin_prio.0": "ʎʇıɹoıɹԀ ɥʇıʍ uıqoᴚ punoᴚq§ :ǝpoW uoıʇnqıɹʇsıᗡ", + "cover.conveyor.distribution.round_robin_prio.1": "˙ʇsɹıɟ sǝıʇıɹoıɹd ɹǝɥbıɥ sɹǝpısuoɔ puɐ sǝıɹoʇuǝʌuı pǝʇɔǝuuoɔ ssoɹɔɐ sɯǝʇı ʇıןds oʇ sǝıɹ⟘ㄥ§", + "cover.conveyor.distribution.round_robin_prio.2": "˙ɥʇɐd ɐ ɟo ʎʇıɹoıɹd ǝɥʇ ɹǝʍoן sǝdıd ɯǝʇı ǝʌıʇɔıɹʇsǝᴚㄥ§", "cover.conveyor.item_filter.title": "ɹǝʇןıℲ ɯǝʇI", "cover.conveyor.mode": "%s :ǝpoW", "cover.conveyor.mode.export": "ʇɹodxƎ :ǝpoW", @@ -1998,9 +1956,9 @@ "cover.universal.manual_import_export.mode.description.0": " ˙ɹǝʇןıɟ sʇı puɐ ɹǝʌoɔ ǝɥʇ ʎq pǝıɟıɔǝds sɐ ǝʌoɯ ʎןuo ןןıʍ spınןɟ/sɯǝʇI - ɹ§pǝןqɐsıᗡǝ§", "cover.universal.manual_import_export.mode.description.1": " ˙)ʎuɐ ɟı( sǝɥɔʇɐɯ ɹǝʇןıɟ sʇı sɐ buoן sɐ 'ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʇɹǝsuı puɐ pǝʇɔɐɹʇxǝ ǝq uɐɔ spınןɟ/sɯǝʇI - ɹ§pǝɹǝʇןıℲ ʍoןןⱯǝ§", "cover.universal.manual_import_export.mode.description.2": "ɹǝʌoɔ sıɥʇ ʎq pǝʇɔɐɹʇxǝ ɹo pǝʇɹǝsuı sɯǝʇı ǝɥʇ oʇ sǝıןddɐ ɹǝʇןıℲ ˙ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʌoɯ ǝq uɐɔ spınןɟ/sɯǝʇI - ɹ§pǝɹǝʇןıɟu∩ ʍoןןⱯǝ§", - "cover.universal.manual_import_export.mode.disabled": "pǝןqɐsıᗡ :O/I ןɐnuɐW", - "cover.universal.manual_import_export.mode.filtered": "pǝɹǝʇןıℲ :O/I ןɐnuɐW", - "cover.universal.manual_import_export.mode.unfiltered": "pǝɹǝʇןıɟu∩ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.disabled": "˙ɹǝʇןıɟ sʇı puɐ ɹǝʌoɔ ǝɥʇ ʎq pǝıɟıɔǝds sɐ ǝʌoɯ ʎןuo ןןıʍ spınןℲ / sɯǝʇIㄥ§\npǝןqɐsıᗡq§ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.filtered": ")ʎuɐ ɟı( sǝɥɔʇɐɯ ɹǝʇןıɟ sʇı sɐ buoן sɐ 'ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʇɹǝsuı puɐ pǝʇɔɐɹʇxǝ ǝq uɐɔ spınןℲ / sɯǝʇIㄥ§\npǝɹǝʇןıℲq§ :O/I ןɐnuɐW", + "cover.universal.manual_import_export.mode.unfiltered": "˙ɟןǝsʇı ɹǝʌoɔ sıɥʇ ʎq pǝʇɔɐɹʇxǝ ɹo pǝʇɹǝsuı sı ʇɐɥʍ oʇ sǝıןddɐ ʎןuo ɹǝʇןıɟ ǝɥ⟘ ˙ǝpoɯ ɹǝʌoɔ ǝɥʇ ɟo ʎןʇuǝpuǝdǝpuı pǝʌoɯ ǝq uɐɔ spınןℲ / sɯǝʇIㄥ§\npǝɹǝʇןıɟu∩q§ :O/I ןɐnuɐW", "cover.voiding.label.disabled": "pǝןqɐsıᗡ", "cover.voiding.label.enabled": "pǝןqɐuƎ", "cover.voiding.message.disabled": "pǝןqɐsıᗡ ɹǝʌoƆ buıpıoΛ", @@ -3161,8 +3119,8 @@ "item.bone_dust": "ןɐǝW ǝuoᗺ", "item.bone_small_dust": "ןɐǝW ǝuoᗺ ɟo ǝןıԀ ןןɐɯS", "item.bone_tiny_dust": "ןɐǝW ǝuoᗺ ɟo ǝןıԀ ʎuı⟘", + "item.borosilicate_glass_fine_wire": "sɹǝqıℲ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", "item.borosilicate_glass_ingot": "ɹɐᗺ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", - "item.borosilicate_glass_wireFine": "sɹǝqıℲ ssɐן⅁ ǝʇɐɔıןısoɹoᗺ", "item.cassiterite_sand_crushed": "puɐS ǝʇıɹǝʇıssɐƆ punoɹ⅁", "item.cassiterite_sand_dust": "puɐS ǝʇıɹǝʇıssɐƆ", "item.cassiterite_sand_impure_dust": "puɐS ǝʇıɹǝʇıssɐƆ ɟo ǝןıԀ ǝɹndɯI", @@ -4046,7 +4004,7 @@ "item.sugar_gem": "ǝqnƆ ɹɐbnS", "item.sugar_small_dust": "ɹɐbnS ɟo ǝןıԀ ןןɐɯS", "item.sugar_tiny_dust": "ɹɐbnS ɟo ǝןıԀ ʎuı⟘", - "item.talc_crushed": "ɔןɐ⟘ punoɹ⅁", + "item.talc_crushed_ore": "ɔןɐ⟘ punoɹ⅁", "item.talc_dust": "ɔןɐ⟘", "item.talc_impure_dust": "ɔןɐ⟘ ɟo ǝןıԀ ǝɹndɯI", "item.talc_pure_dust": "ɔןɐ⟘ ɟo ǝןıԀ pǝıɟıɹnԀ", @@ -4056,9 +4014,9 @@ "item.talc_tiny_dust": "ɔןɐ⟘ ɟo ǝןıԀ ʎuı⟘", "item.treated_wood_bolt": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ ʇɹoɥS", "item.treated_wood_dust": "dןnԀ pooM pǝʇɐǝɹ⟘", + "item.treated_wood_long_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ buoꞀ", "item.treated_wood_plate": "ʞuɐןԀ pooM pǝʇɐǝɹ⟘", "item.treated_wood_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘", - "item.treated_wood_rodLong": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ buoꞀ", "item.treated_wood_small_dust": "dןnԀ pooM pǝʇɐǝɹ⟘ ɟo ǝןıԀ ןןɐɯS", "item.treated_wood_tiny_dust": "dןnԀ pooM pǝʇɐǝɹ⟘ ɟo ǝןıԀ ʎuı⟘", "item.wheat_dust": "ɹnoןℲ", @@ -4066,8 +4024,8 @@ "item.wheat_tiny_dust": "ɹnoןℲ ɟo ǝןıԀ ʎuı⟘", "item.wood_bolt": "ʞɔıʇS pooM ʇɹoɥS", "item.wood_dust": "dןnԀ pooM", + "item.wood_long_rod": "ʞɔıʇS pooM buoꞀ", "item.wood_plate": "ʞuɐןԀ pooM", - "item.wood_rodLong": "ʞɔıʇS pooM buoꞀ", "item.wood_small_dust": "dןnԀ pooM ɟo ǝןıԀ ןןɐɯS", "item.wood_tiny_dust": "dןnԀ pooM ɟo ǝןıԀ ʎuı⟘", "itemGroup.gtceu.decoration": "suoıʇɐɹoɔǝᗡ ɥɔǝ⟘bǝɹ⅁", @@ -4130,6 +4088,7 @@ "material.bio_diesel": "ןǝsǝıᗡ oıᗺ", "material.biomass": "ssɐɯoıᗺ", "material.biotite": "ǝʇıʇoıᗺ", + "material.biphenyl": "ןʎuǝɥdıᗺ", "material.bismuth": "ɥʇnɯsıᗺ", "material.bismuth_bronze": "ǝzuoɹᗺ ɥʇnɯsıᗺ", "material.bisphenol_a": "Ɐ ןouǝɥdsıᗺ", @@ -4305,7 +4264,7 @@ "material.gypsum": "ɯnsdʎ⅁", "material.hafnium": "ɯnıuɟɐH", "material.hassium": "ɯnıssɐH", - "material.hastelloy_c_276": "9ㄥᄅ Ɔ ʎoןןǝʇsɐH", + "material.hastelloy_c_276": "9ㄥᄅ-Ɔ ʎoןןǝʇsɐH", "material.hastelloy_x": "X ʎoןןǝʇsɐH", "material.heavy_fuel": "ןǝnℲ ʎʌɐǝH", "material.helium": "ɯnıןǝH", @@ -4313,17 +4272,17 @@ "material.hematite": "ǝʇıʇɐɯǝH", "material.high_octane_gasoline": "ǝuıןosɐ⅁ ǝuɐʇɔO ɥbıH", "material.holmium": "ɯnıɯןoH", - "material.hsla_steel": "ןǝǝʇS-ⱯꞀSH", + "material.hsla_steel": "ןǝǝʇS ɐןsH", "material.hsse": "Ǝ-SSH", "material.hssg": "⅁-SSH", "material.hsss": "S-SSH", - "material.hydro_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ oɹpʎH", - "material.hydro_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ oɹpʎH", + "material.hydro_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ-oɹpʎH", + "material.hydro_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ-oɹpʎH", "material.hydrochloric_acid": "pıɔⱯ ɔıɹoןɥɔoɹpʎH", "material.hydrofluoric_acid": "pıɔⱯ ɔıɹonןɟoɹpʎH", "material.hydrogen": "uǝboɹpʎH", @@ -4333,7 +4292,7 @@ "material.ilmenite": "ǝʇıuǝɯןI", "material.impure_enriched_naquadah_solution": "uoıʇnןoS ɥɐpɐnbɐN pǝɥɔıɹuƎ ǝɹndɯI", "material.impure_naquadria_solution": "uoıʇnןoS ɐıɹpɐnbɐN ǝɹndɯI", - "material.incoloy_ma_956": "9ϛ6 ɐW ʎoןoɔuI", + "material.incoloy_ma_956": "9ϛ6-ⱯW ʎoןoɔuI", "material.indium": "ɯnıpuI", "material.indium_concentrate": "ǝʇɐɹʇuǝɔuoƆ ɯnıpuI", "material.indium_gallium_phosphide": "ǝpıɥdsoɥԀ ɯnıןןɐ⅁ ɯnıpuI", @@ -4363,14 +4322,14 @@ "material.light_blue_dye": "ǝʎᗡ ǝnןᗺ ʇɥbıꞀ", "material.light_fuel": "ןǝnℲ ʇɥbıꞀ", "material.light_gray_dye": "ǝʎᗡ ʎɐɹ⅁ ʇɥbıꞀ", - "material.lightly_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ oɹpʎH ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", - "material.lightly_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-oɹpʎH ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", + "material.lightly_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-ɯɐǝʇS ʎןʇɥbıꞀ", "material.lime_dye": "ǝʎᗡ ǝɯıꞀ", "material.liquid_air": "ɹıⱯ pınbıꞀ", "material.liquid_ender_air": "ɹıⱯ ɹǝpuƎ pınbıꞀ", @@ -4471,6 +4430,7 @@ "material.palladium": "ɯnıpɐןןɐԀ", "material.palladium_raw": "ʍɐᴚ ɯnıpɐןןɐԀ", "material.paper": "ɹǝdɐԀ", + "material.pcb_coolant": "ʇuɐןooƆ ᗺƆԀ", "material.pentlandite": "ǝʇıpuɐןʇuǝԀ", "material.perlite": "ǝʇıןɹǝԀ", "material.phenol": "ןouǝɥԀ", @@ -4491,6 +4451,7 @@ "material.polonium": "ɯnıuoןoԀ", "material.polybenzimidazole": "ǝןozɐpıɯızuǝqʎןoԀ", "material.polycaprolactam": "ɯɐʇɔɐןoɹdɐɔʎןoԀ", + "material.polychlorinated_biphenyl": "ןʎuǝɥdıᗺ pǝʇɐuıɹoןɥɔʎןoԀ", "material.polydimethylsiloxane": "ǝuɐxoןısןʎɥʇǝɯıpʎןoԀ", "material.polyethylene": "ǝuǝןʎɥʇǝʎןoԀ", "material.polyphenylene_sulfide": "ǝpıɟןnS ǝuǝןʎuǝɥdʎןoԀ", @@ -4564,14 +4525,14 @@ "material.seaborgium": "ɯnıbɹoqɐǝS", "material.seed_oil": "ןıO pǝǝS", "material.selenium": "ɯnıuǝןǝS", - "material.severely_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ oɹpʎH ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", - "material.severely_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_hydro_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-oɹpʎH ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_gas": "sɐ⅁ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_heavy_fuel": "ןǝnℲ ʎʌɐǝH pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_light_fuel": "ןǝnℲ ʇɥbıꞀ pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", + "material.severely_steam_cracked_naphtha": "ɐɥʇɥdɐN pǝʞɔɐɹƆ-ɯɐǝʇS ʎןǝɹǝʌǝS", "material.silicon": "uoɔıןıS", "material.silicon_dioxide": "ǝpıxoıᗡ uoɔıןıS", "material.silicone_rubber": "ɹǝqqnᴚ ǝuoɔıןıS", @@ -4592,15 +4553,15 @@ "material.spodumene": "ǝuǝɯnpodS", "material.stainless_steel": "ןǝǝʇS ssǝןuıɐʇS", "material.steam": "ɯɐǝʇS", - "material.steam_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ ɯɐǝʇS", - "material.steam_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ ɯɐǝʇS", + "material.steam_cracked_butadiene": "ǝuǝıpɐʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_butane": "ǝuɐʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_butene": "ǝuǝʇnᗺ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_ethane": "ǝuɐɥʇƎ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_ethylene": "ǝuǝןʎɥʇƎ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_propane": "ǝuɐdoɹԀ pǝʞɔɐɹƆ-ɯɐǝʇS", + "material.steam_cracked_propene": "ǝuǝdoɹԀ pǝʞɔɐɹƆ-ɯɐǝʇS", "material.steel": "ןǝǝʇS", - "material.stellite_100": "00Ɩ ǝʇıןןǝʇS", + "material.stellite_100": "00Ɩ-ǝʇıןןǝʇS", "material.sterilized_growth_medium": "ɯnıpǝW ɥʇʍoɹ⅁ pǝzıןıɹǝʇS", "material.sterling_silver": "ɹǝʌןıS buıןɹǝʇS", "material.stibnite": "ǝʇıuqıʇS", @@ -4687,7 +4648,7 @@ "material.yttrium": "ɯnıɹʇʇʎ", "material.yttrium_barium_cuprate": "ǝʇɐɹdnƆ ɯnıɹɐᗺ ɯnıɹʇʇʎ", "material.zeolite": "ǝʇıןoǝZ", - "material.zeron_100": "00Ɩ uoɹǝZ", + "material.zeron_100": "00Ɩ-uoɹǝZ", "material.zinc": "ɔuıZ", "material.zinc_sulfide": "ǝpıɟןnS ɔuıZ", "material.zincite": "ǝʇıɔuıZ", @@ -4911,15 +4872,5 @@ "tile.gtceu.petrified_foam.name": "ɯɐoℲ pǝıɟıɹʇǝԀ", "tile.gtceu.reinforced_foam.name": "ɯɐoℲ pǝɔɹoɟuıǝᴚ", "tile.gtceu.reinforced_stone.name": "ǝuoʇS pǝɔɹoɟuıǝᴚ", - "tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS", - "tile.stone_bricks_square.concrete_dark.name": "sʞɔıɹᗺ ǝʇǝɹɔuoƆ ʞɹɐᗡ ǝɹɐnbS", - "tile.wire_coil.tooltip_cracking": ":ʇıu∩ buıʞɔɐɹƆ8§", - "tile.wire_coil.tooltip_energy_cracking": "%s%%ɟ§ :ǝbɐs∩ ʎbɹǝuƎɐ§ ", - "tile.wire_coil.tooltip_energy_smelter": "ǝdıɔǝɹ ɹǝd8§ ʇ/∩Ǝ %sɟ§ :ǝbɐs∩ ʎbɹǝuƎɐ§ ", - "tile.wire_coil.tooltip_extended_info": "oɟuI snuoᗺ ןıoƆ ʍoɥs oʇ ⟘ℲIHS pןoH", - "tile.wire_coil.tooltip_heat": "ʞ %dɟ§ :ʎʇıɔɐdɐƆ ʇɐǝH ǝsɐᗺɔ§", - "tile.wire_coil.tooltip_parallel_smelter": "%sɟ§ :ןǝןןɐɹɐԀ xɐWϛ§ ", - "tile.wire_coil.tooltip_pyro": ":uǝʌO ǝsʎןoɹʎԀ8§", - "tile.wire_coil.tooltip_smelter": ":ɹǝʇןǝɯS ıʇןnW8§", - "tile.wire_coil.tooltip_speed_pyro": "%s%%ɟ§ :pǝǝdS buıssǝɔoɹԀq§ " + "tile.gtceu.seal.name": "ʞɔoןᗺ pǝןɐǝS" } \ No newline at end of file diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_us.json b/forge/src/generated/resources/assets/gtceu/lang/en_us.json index 58d4ab8642..213a5d5caa 100644 --- a/forge/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/forge/src/generated/resources/assets/gtceu/lang/en_us.json @@ -69,13 +69,6 @@ "behaviour.wrench": "Rotates Blocks on Rightclick", "block.filter.tooltip": "Creates a §aParticle-Free§7 environment", "block.filter_sterile.tooltip": "Creates a §aSterilized§7 environment", - "block.fusion_casing": "Fusion Machine Casing", - "block.fusion_casing_mk2": "Fusion Machine Casing MK II", - "block.fusion_casing_mk3": "Fusion Machine Casing MK III", - "block.fusion_coil": "Fusion Coil Block", - "block.gtceu.active_casing_assembly_line": "Assembly Line Casing", - "block.gtceu.active_casing_engine_intake": "Engine Intake Casing", - "block.gtceu.active_casing_extreme_engine_intake": "Extreme Engine Intake Casing", "block.gtceu.active_transformer": "Active Transformer", "block.gtceu.alloy_blast_smelter": "Alloy Blast Smelter", "block.gtceu.aluminium_crate": "Aluminium Crate", @@ -83,48 +76,22 @@ "block.gtceu.assembly_line": "Assembly Line", "block.gtceu.assembly_line_casing": "Assembly Line Casing", "block.gtceu.assembly_line_grating": "Assembly Line Grating", - "block.gtceu.assembly_line_unit": "Assembly Line Unit", + "block.gtceu.assembly_line_unit": "Assembly Control Casing", "block.gtceu.atomic_casing": "Atomic Casing", "block.gtceu.auto_maintenance_hatch": "Auto Maintenance Hatch", "block.gtceu.bronze_brick_casing": "Bronze Brick Casing", "block.gtceu.bronze_crate": "Bronze Crate", "block.gtceu.bronze_drum": "Bronze Drum", - "block.gtceu.bronze_firebox": "Bronze Firebox Casing", "block.gtceu.bronze_firebox_casing": "Bronze Firebox Casing", - "block.gtceu.bronze_gearbox": "Bronze Gearbox", + "block.gtceu.bronze_gearbox": "Bronze Gearbox Casing", "block.gtceu.bronze_large_boiler": "Large Bronze Boiler", "block.gtceu.bronze_machine_casing": "Bronze Machine Casing", "block.gtceu.bronze_pipe_casing": "Bronze Pipe Casing", - "block.gtceu.casing_aluminium_frostproof": "Frost Proof Aluminium Machine Casing", - "block.gtceu.casing_assembly_control": "Assembly Control Casing", "block.gtceu.casing_bronze_bricks": "Bronze Machine Casing", - "block.gtceu.casing_bronze_gearbox": "Bronze Gearbox Casing", - "block.gtceu.casing_bronze_pipe": "Bronze Pipe Casing", "block.gtceu.casing_coke_bricks": "Coke Oven Bricks", "block.gtceu.casing_grate": "Grate Machine Casing", - "block.gtceu.casing_hsse_sturdy": "Sturdy HSS-E Machine Casing", - "block.gtceu.casing_invar_heatproof": "Heat Proof Invar Machine Casing", - "block.gtceu.casing_laminated_glass": "Laminated Glass", - "block.gtceu.casing_polytetrafluoroethylene_pipe": "PTFE Pipe Casing", "block.gtceu.casing_primitive_bricks": "Firebricks", - "block.gtceu.casing_ptfe_inert": "Chemically Inert PTFE Machine Casing", - "block.gtceu.casing_pump_deck": "Pump Deck", - "block.gtceu.casing_stainless_clean": "Clean Stainless Steel Casing", - "block.gtceu.casing_stainless_steel_gearbox": "Stainless Steel Gearbox Casing", - "block.gtceu.casing_stainless_turbine": "Stainless Turbine Casing", - "block.gtceu.casing_steel_gearbox": "Steel Gearbox Casing", - "block.gtceu.casing_steel_pipe": "Steel Pipe Casing", - "block.gtceu.casing_steel_solid": "Solid Steel Machine Casing", - "block.gtceu.casing_steel_turbine": "Steel Turbine Casing", - "block.gtceu.casing_titanium_gearbox": "Titanium Gearbox Casing", - "block.gtceu.casing_titanium_pipe": "Titanium Pipe Casing", - "block.gtceu.casing_titanium_stable": "Stable Titanium Machine Casing", - "block.gtceu.casing_titanium_turbine": "Titanium Turbine Casing", - "block.gtceu.casing_tungstensteel_gearbox": "Tungstensteel Gearbox Casing", - "block.gtceu.casing_tungstensteel_pipe": "Tungstensteel Pipe Casing", - "block.gtceu.casing_tungstensteel_robust": "Robust Tungstensteel Machine Casing", - "block.gtceu.casing_tungstensteel_turbine": "Tungstensteel Turbine Casing", - "block.gtceu.clean_machine_casing": "Clean Machine Casing", + "block.gtceu.clean_machine_casing": "Clean Stainless Steel Casing", "block.gtceu.cleaning_maintenance_hatch": "Cleaning Maintenance Hatch", "block.gtceu.cleanroom": "Cleanroom", "block.gtceu.cleanroom_glass": "Cleanroom Glass", @@ -225,16 +192,16 @@ "block.gtceu.extreme_engine_intake_casing": "Extreme Engine Intake Casing", "block.gtceu.filter_casing": "Filter Casing", "block.gtceu.firebricks": "Firebricks", - "block.gtceu.frostproof_machine_casing": "Frostproof Machine Casing", - "block.gtceu.fusion_casing": "Fusion Casing", - "block.gtceu.fusion_casing_mk2": "Fusion Casing Mk2", - "block.gtceu.fusion_casing_mk3": "Fusion Casing Mk3", - "block.gtceu.fusion_coil": "Fusion Coil", + "block.gtceu.frostproof_machine_casing": "Frost Proof Aluminium Machine Casing", + "block.gtceu.fusion_casing": "Fusion Machine Casing", + "block.gtceu.fusion_casing_mk2": "Fusion Machine Casing MK II", + "block.gtceu.fusion_casing_mk3": "Fusion Machine Casing MK III", + "block.gtceu.fusion_coil": "Fusion Coil Block", "block.gtceu.fusion_glass": "Fusion Glass", - "block.gtceu.gas_large_turbine": "Gas Large Turbine", + "block.gtceu.gas_large_turbine": "Large Gas Turbine", "block.gtceu.gold_drum": "Gold Drum", "block.gtceu.heat_vent": "Heat Vent", - "block.gtceu.heatproof_machine_casing": "Heatproof Machine Casing", + "block.gtceu.heatproof_machine_casing": "Heat Proof Invar Machine Casing", "block.gtceu.high_power_casing": "High Power Casing", "block.gtceu.high_temperature_smelting_casing": "High Temperature Smelting Casing", "block.gtceu.hp_steam_alloy_smelter": "High Pressure Steam Alloy Smelter", @@ -246,7 +213,7 @@ "block.gtceu.hp_steam_macerator": "High Pressure Steam Macerator", "block.gtceu.hp_steam_rock_crusher": "High Pressure Steam Rock Crusher", "block.gtceu.hp_steam_solid_boiler": "High Pressure Steam Solid Boiler", - "block.gtceu.hssg_coil_block": "Hssg Coil Block", + "block.gtceu.hssg_coil_block": "HSS-G Coil Block", "block.gtceu.hv_16a_energy_converter": "HV 16A Energy Converter", "block.gtceu.hv_1a_energy_converter": "HV 1A Energy Converter", "block.gtceu.hv_4a_energy_converter": "HV 4A Energy Converter", @@ -329,7 +296,7 @@ "block.gtceu.hv_wiremill": "§6Advanced Wiremill II§r", "block.gtceu.implosion_compressor": "Implosion Compressor", "block.gtceu.industrial_steam_casing": "Industrial Steam Casing", - "block.gtceu.inert_machine_casing": "Inert Machine Casing", + "block.gtceu.inert_machine_casing": "Chemically Inert PTFE Machine Casing", "block.gtceu.infinite_energy": "Infinite Energy", "block.gtceu.iv_1024a_laser_source_hatch": "Iv 1024a Laser Source Hatch", "block.gtceu.iv_1024a_laser_target_hatch": "Iv 1024a Laser Target Hatch", @@ -715,6 +682,9 @@ "block.gtceu.naquadah_coil_block": "Naquadah Coil Block", "block.gtceu.nichrome_coil_block": "Nichrome Coil Block", "block.gtceu.nonconducting_casing": "Nonconducting Casing", + "block.gtceu.oil_heavy": "Heavy Oil", + "block.gtceu.oil_light": "Light Oil", + "block.gtceu.oil_medium": "Raw Oil", "block.gtceu.opv_1024a_laser_source_hatch": "Opv 1024a Laser Source Hatch", "block.gtceu.opv_1024a_laser_target_hatch": "Opv 1024a Laser Target Hatch", "block.gtceu.opv_16a_energy_converter": "OpV 16A Energy Converter", @@ -782,15 +752,15 @@ "block.gtceu.opv_thermal_centrifuge": "§9Legendary Thermal Centrifuge §r", "block.gtceu.opv_wiremill": "§9Legendary Wiremill §r", "block.gtceu.plascrete": "Plascrete", - "block.gtceu.plasma_large_turbine": "Plasma Large Turbine", + "block.gtceu.plasma_large_turbine": "Large Plasma Turbine", "block.gtceu.primitive_blast_furnace": "Primitive Blast Furnace", "block.gtceu.primitive_pump": "Primitive Pump", - "block.gtceu.ptfe_pipe_casing": "ptfe Pipe Casing", + "block.gtceu.ptfe_pipe_casing": "PTFE Pipe Casing", "block.gtceu.pump_deck": "Pump Deck", "block.gtceu.pump_hatch": "Pump Hatch", "block.gtceu.pyrolyse_oven": "Pyrolyse Oven", "block.gtceu.reaction_safe_mixing_casing": "Reaction-Safe Mixing Casing", - "block.gtceu.robust_machine_casing": "Robust Machine Casing", + "block.gtceu.robust_machine_casing": "Robust Tungstensteel Machine Casing", "block.gtceu.rubber_leaves": "Rubber Leaves", "block.gtceu.rubber_log": "Rubber Log", "block.gtceu.rubber_planks": "Rubber Planks", @@ -799,11 +769,11 @@ "block.gtceu.shock_proof_cutting_casing": "Shock Proof Cutting Casing", "block.gtceu.slicing_blades": "Slicing Blades", "block.gtceu.solid_machine_casing": "Solid Machine Casing", - "block.gtceu.stable_machine_casing": "Stable Machine Casing", + "block.gtceu.stable_machine_casing": "Stable Titanium Machine Casing", "block.gtceu.stainless_steel_crate": "Stainless Steel Crate", "block.gtceu.stainless_steel_drum": "Stainless Steel Drum", - "block.gtceu.stainless_steel_gearbox": "Stainless Steel Gearbox", - "block.gtceu.stainless_steel_turbine_casing": "Stainless Steel Turbine Casing", + "block.gtceu.stainless_steel_gearbox": "Stainless Steel Gearbox Casing", + "block.gtceu.stainless_steel_turbine_casing": "Stainless Turbine Casing", "block.gtceu.steam_casing_bricked_bronze": "Bricked Bronze Hull", "block.gtceu.steam_casing_bricked_bronze.tooltip": "§7For your first Steam Machines", "block.gtceu.steam_casing_bricked_steel": "Bricked Wrought Iron Hull", @@ -815,7 +785,7 @@ "block.gtceu.steam_grinder": "Steam Grinder", "block.gtceu.steam_input_bus": "Input Bus (Steam)", "block.gtceu.steam_input_hatch": "Steam Input Hatch", - "block.gtceu.steam_large_turbine": "Steam Large Turbine", + "block.gtceu.steam_large_turbine": "Large Steam Turbine", "block.gtceu.steam_liquid_boiler.bronze": "Small Steam Liquid Boiler", "block.gtceu.steam_machine_casing": "Steam Machine Casing", "block.gtceu.steam_miner": "Steam Miner", @@ -825,23 +795,21 @@ "block.gtceu.steel_brick_casing": "Steel Brick Casing", "block.gtceu.steel_crate": "Steel Crate", "block.gtceu.steel_drum": "Steel Drum", - "block.gtceu.steel_firebox": "Steel Firebox Casing", "block.gtceu.steel_firebox_casing": "Steel Firebox Casing", - "block.gtceu.steel_gearbox": "Steel Gearbox", + "block.gtceu.steel_gearbox": "Steel Gearbox Casing", "block.gtceu.steel_large_boiler": "Large Steel Boiler", - "block.gtceu.steel_machine_casing": "Steel Machine Casing", + "block.gtceu.steel_machine_casing": "Solid Steel Machine Casing", "block.gtceu.steel_pipe_casing": "Steel Pipe Casing", "block.gtceu.steel_turbine_casing": "Steel Turbine Casing", "block.gtceu.sterilizing_filter_casing": "Sterilizing Filter Casing", "block.gtceu.stress_proof_casing": "Stress Proof Casing", - "block.gtceu.sturdy_machine_casing": "Sturdy Machine Casing", - "block.gtceu.superconducting_coil": "Superconducting Coil", + "block.gtceu.sturdy_machine_casing": "Sturdy HSS-E Machine Casing", + "block.gtceu.superconducting_coil": "Superconducting Coil Block", "block.gtceu.tempered_glass": "Tempered Glass", "block.gtceu.titanium_crate": "Titanium Crate", "block.gtceu.titanium_drum": "Titanium Drum", - "block.gtceu.titanium_firebox": "Titanium Firebox Casing", "block.gtceu.titanium_firebox_casing": "Titanium Firebox Casing", - "block.gtceu.titanium_gearbox": "Titanium Gearbox", + "block.gtceu.titanium_gearbox": "Titanium Gearbox Casing", "block.gtceu.titanium_large_boiler": "Large Titanium Boiler", "block.gtceu.titanium_pipe_casing": "Titanium Pipe Casing", "block.gtceu.titanium_turbine_casing": "Titanium Turbine Casing", @@ -851,9 +819,8 @@ "block.gtceu.tungsten_steel_crate": "Tungstensteel Crate", "block.gtceu.tungsten_steel_drum": "Tungstensteel Drum", "block.gtceu.tungstensteel_coil_block": "Tungstensteel Coil Block", - "block.gtceu.tungstensteel_firebox": "Tungstensteel Firebox Casing", "block.gtceu.tungstensteel_firebox_casing": "Tungstensteel Firebox Casing", - "block.gtceu.tungstensteel_gearbox": "Tungstensteel Gearbox", + "block.gtceu.tungstensteel_gearbox": "Tungstensteel Gearbox Casing", "block.gtceu.tungstensteel_large_boiler": "Large Tungstensteel Boiler", "block.gtceu.tungstensteel_pipe_casing": "Tungstensteel Pipe Casing", "block.gtceu.tungstensteel_turbine_casing": "Tungstensteel Turbine Casing", @@ -1236,14 +1203,6 @@ "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven:", "block.gtceu.wire_coil.tooltip_smelter": "§8Multi Smelter:", "block.gtceu.wire_coil.tooltip_speed_pyro": " §bProcessing Speed: §f%s%%", - "block.gtceu.wire_coil_cupronickel": "Cupronickel Coil Block", - "block.gtceu.wire_coil_hss_g": "HSS-G Coil Block", - "block.gtceu.wire_coil_kanthal": "Kanthal Coil Block", - "block.gtceu.wire_coil_naquadah": "Naquadah Coil Block", - "block.gtceu.wire_coil_nichrome": "Nichrome Coil Block", - "block.gtceu.wire_coil_trinium": "Trinium Coil Block", - "block.gtceu.wire_coil_tritanium": "Tritanium Coil Block", - "block.gtceu.wire_coil_tungstensteel": "Tungstensteel Coil Block", "block.gtceu.wood_crate": "Wooden Crate", "block.gtceu.wood_drum": "Wooden Barrel", "block.gtceu.zpm_1024a_laser_source_hatch": "Zpm 1024a Laser Source Hatch", @@ -1324,7 +1283,6 @@ "block.gtceu.zpm_transformer_2a": "ZPM Voltage Hi-Amp (2x) Transformer", "block.gtceu.zpm_transformer_4a": "ZPM Voltage Hi-Amp (4x) Transformer", "block.gtceu.zpm_wiremill": "§cElite Wiremill III§r", - "block.superconducting_coil": "Superconducting Coil Block", "compass.node.gtceu.batteries/energy_cluster": "Energy Cluster", "compass.node.gtceu.batteries/energy_crystal": "Energy Crystal", "compass.node.gtceu.batteries/energy_module": "Energy Module", @@ -1790,6 +1748,7 @@ "config.gtceu.option.doProcessingArray": "doProcessingArray", "config.gtceu.option.doTerrainExplosion": "doTerrainExplosion", "config.gtceu.option.doesExplosionDamagesTerrain": "doesExplosionDamagesTerrain", + "config.gtceu.option.dumpAssets": "dumpAssets", "config.gtceu.option.dumpRecipes": "dumpRecipes", "config.gtceu.option.enableCleanroom": "enableCleanroom", "config.gtceu.option.enableMaintenance": "enableMaintenance", @@ -1891,15 +1850,14 @@ "cover.conveyor.blocks_input.disabled.1": "§cDisabled", "cover.conveyor.blocks_input.enabled.0": "If enabled, items will not be inserted when cover is set to pull items from the inventory into pipe.", "cover.conveyor.blocks_input.enabled.1": "§aEnabled", - "cover.conveyor.distribution.first_insert.0": "Distribution Mode", - "cover.conveyor.distribution.first_insert.1": "§bFirst Insert§r", - "cover.conveyor.distribution.first_insert.2": "§7Will insert into the first inventory it finds", - "cover.conveyor.distribution.round_robin.0": "Distribution Mode", - "cover.conveyor.distribution.round_robin.1": "§bRound Robin§r with Priority", - "cover.conveyor.distribution.round_robin.2": "§7Tries to split items equally to inventories", - "cover.conveyor.distribution.round_robin_enhanced.0": "Distribution Mode", - "cover.conveyor.distribution.round_robin_enhanced.1": "§bEnhanced Round Robin§r", - "cover.conveyor.distribution.round_robin_enhanced.2": "§7Splits items equally to all inventories", + "cover.conveyor.distribution.insert_first.0": "Distribution Mode: §bPriority", + "cover.conveyor.distribution.insert_first.1": "§7Will insert into the first inventory with the highest priority it can find.", + "cover.conveyor.distribution.insert_first.2": "§7Restrictive item pipes lower the priority of a path.", + "cover.conveyor.distribution.round_robin_global.0": "Distribution Mode: §bRound Robin", + "cover.conveyor.distribution.round_robin_global.1": "§7Splits items equally across connected inventories", + "cover.conveyor.distribution.round_robin_prio.0": "Distribution Mode: §bRound Robin with Priority", + "cover.conveyor.distribution.round_robin_prio.1": "§7Tries to split items across connected inventories and considers higher priorities first.", + "cover.conveyor.distribution.round_robin_prio.2": "§7Restrictive item pipes lower the priority of a path.", "cover.conveyor.item_filter.title": "Item Filter", "cover.conveyor.mode": "Mode: %s", "cover.conveyor.mode.export": "Mode: Export", @@ -1998,9 +1956,9 @@ "cover.universal.manual_import_export.mode.description.0": "§eDisabled§r - Items/fluids will only move as specified by the cover and its filter. ", "cover.universal.manual_import_export.mode.description.1": "§eAllow Filtered§r - Items/fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any). ", "cover.universal.manual_import_export.mode.description.2": "§eAllow Unfiltered§r - Items/fluids can be moved independently of the cover mode. Filter applies to the items inserted or extracted by this cover", - "cover.universal.manual_import_export.mode.disabled": "Manual I/O: Disabled", - "cover.universal.manual_import_export.mode.filtered": "Manual I/O: Filtered", - "cover.universal.manual_import_export.mode.unfiltered": "Manual I/O: Unfiltered", + "cover.universal.manual_import_export.mode.disabled": "Manual I/O: §bDisabled\n§7Items / Fluids will only move as specified by the cover and its filter.", + "cover.universal.manual_import_export.mode.filtered": "Manual I/O: §bFiltered\n§7Items / Fluids can be extracted and inserted independently of the cover mode, as long as its filter matches (if any)", + "cover.universal.manual_import_export.mode.unfiltered": "Manual I/O: §bUnfiltered\n§7Items / Fluids can be moved independently of the cover mode. The filter only applies to what is inserted or extracted by this cover itself.", "cover.voiding.label.disabled": "Disabled", "cover.voiding.label.enabled": "Enabled", "cover.voiding.message.disabled": "Voiding Cover Disabled", @@ -3161,8 +3119,8 @@ "item.bone_dust": "Bone Meal", "item.bone_small_dust": "Small Pile of Bone Meal", "item.bone_tiny_dust": "Tiny Pile of Bone Meal", + "item.borosilicate_glass_fine_wire": "Borosilicate Glass Fibers", "item.borosilicate_glass_ingot": "Borosilicate Glass Bar", - "item.borosilicate_glass_wireFine": "Borosilicate Glass Fibers", "item.cassiterite_sand_crushed": "Ground Cassiterite Sand", "item.cassiterite_sand_dust": "Cassiterite Sand", "item.cassiterite_sand_impure_dust": "Impure Pile of Cassiterite Sand", @@ -4046,7 +4004,7 @@ "item.sugar_gem": "Sugar Cube", "item.sugar_small_dust": "Small Pile of Sugar", "item.sugar_tiny_dust": "Tiny Pile of Sugar", - "item.talc_crushed": "Ground Talc", + "item.talc_crushed_ore": "Ground Talc", "item.talc_dust": "Talc", "item.talc_impure_dust": "Impure Pile of Talc", "item.talc_pure_dust": "Purified Pile of Talc", @@ -4056,9 +4014,9 @@ "item.talc_tiny_dust": "Tiny Pile of Talc", "item.treated_wood_bolt": "Short Treated Wood Stick", "item.treated_wood_dust": "Treated Wood Pulp", + "item.treated_wood_long_rod": "Long Treated Wood Stick", "item.treated_wood_plate": "Treated Wood Plank", "item.treated_wood_rod": "Treated Wood Stick", - "item.treated_wood_rodLong": "Long Treated Wood Stick", "item.treated_wood_small_dust": "Small Pile of Treated Wood Pulp", "item.treated_wood_tiny_dust": "Tiny Pile of Treated Wood Pulp", "item.wheat_dust": "Flour", @@ -4066,8 +4024,8 @@ "item.wheat_tiny_dust": "Tiny Pile of Flour", "item.wood_bolt": "Short Wood Stick", "item.wood_dust": "Wood Pulp", + "item.wood_long_rod": "Long Wood Stick", "item.wood_plate": "Wood Plank", - "item.wood_rodLong": "Long Wood Stick", "item.wood_small_dust": "Small Pile of Wood Pulp", "item.wood_tiny_dust": "Tiny Pile of Wood Pulp", "itemGroup.gtceu.decoration": "GregTech Decorations", @@ -4130,6 +4088,7 @@ "material.bio_diesel": "Bio Diesel", "material.biomass": "Biomass", "material.biotite": "Biotite", + "material.biphenyl": "Biphenyl", "material.bismuth": "Bismuth", "material.bismuth_bronze": "Bismuth Bronze", "material.bisphenol_a": "Bisphenol A", @@ -4305,7 +4264,7 @@ "material.gypsum": "Gypsum", "material.hafnium": "Hafnium", "material.hassium": "Hassium", - "material.hastelloy_c_276": "Hastelloy C 276", + "material.hastelloy_c_276": "Hastelloy C-276", "material.hastelloy_x": "Hastelloy X", "material.heavy_fuel": "Heavy Fuel", "material.helium": "Helium", @@ -4313,17 +4272,17 @@ "material.hematite": "Hematite", "material.high_octane_gasoline": "High Octane Gasoline", "material.holmium": "Holmium", - "material.hsla_steel": "HSLA-Steel", + "material.hsla_steel": "Hsla Steel", "material.hsse": "HSS-E", "material.hssg": "HSS-G", "material.hsss": "HSS-S", - "material.hydro_cracked_butadiene": "Hydro Cracked Butadiene", - "material.hydro_cracked_butane": "Hydro Cracked Butane", - "material.hydro_cracked_butene": "Hydro Cracked Butene", - "material.hydro_cracked_ethane": "Hydro Cracked Ethane", - "material.hydro_cracked_ethylene": "Hydro Cracked Ethylene", - "material.hydro_cracked_propane": "Hydro Cracked Propane", - "material.hydro_cracked_propene": "Hydro Cracked Propene", + "material.hydro_cracked_butadiene": "Hydro-Cracked Butadiene", + "material.hydro_cracked_butane": "Hydro-Cracked Butane", + "material.hydro_cracked_butene": "Hydro-Cracked Butene", + "material.hydro_cracked_ethane": "Hydro-Cracked Ethane", + "material.hydro_cracked_ethylene": "Hydro-Cracked Ethylene", + "material.hydro_cracked_propane": "Hydro-Cracked Propane", + "material.hydro_cracked_propene": "Hydro-Cracked Propene", "material.hydrochloric_acid": "Hydrochloric Acid", "material.hydrofluoric_acid": "Hydrofluoric Acid", "material.hydrogen": "Hydrogen", @@ -4333,7 +4292,7 @@ "material.ilmenite": "Ilmenite", "material.impure_enriched_naquadah_solution": "Impure Enriched Naquadah Solution", "material.impure_naquadria_solution": "Impure Naquadria Solution", - "material.incoloy_ma_956": "Incoloy Ma 956", + "material.incoloy_ma_956": "Incoloy MA-956", "material.indium": "Indium", "material.indium_concentrate": "Indium Concentrate", "material.indium_gallium_phosphide": "Indium Gallium Phosphide", @@ -4363,14 +4322,14 @@ "material.light_blue_dye": "Light Blue Dye", "material.light_fuel": "Light Fuel", "material.light_gray_dye": "Light Gray Dye", - "material.lightly_hydro_cracked_gas": "Lightly Hydro Cracked Gas", - "material.lightly_hydro_cracked_heavy_fuel": "Lightly Hydro Cracked Heavy Fuel", - "material.lightly_hydro_cracked_light_fuel": "Lightly Hydro Cracked Light Fuel", - "material.lightly_hydro_cracked_naphtha": "Lightly Hydro Cracked Naphtha", - "material.lightly_steam_cracked_gas": "Lightly Steam Cracked Gas", - "material.lightly_steam_cracked_heavy_fuel": "Lightly Steam Cracked Heavy Fuel", - "material.lightly_steam_cracked_light_fuel": "Lightly Steam Cracked Light Fuel", - "material.lightly_steam_cracked_naphtha": "Lightly Steam Cracked Naphtha", + "material.lightly_hydro_cracked_gas": "Lightly Hydro-Cracked Gas", + "material.lightly_hydro_cracked_heavy_fuel": "Lightly Hydro-Cracked Heavy Fuel", + "material.lightly_hydro_cracked_light_fuel": "Lightly Hydro-Cracked Light Fuel", + "material.lightly_hydro_cracked_naphtha": "Lightly Hydro-Cracked Naphtha", + "material.lightly_steam_cracked_gas": "Lightly Steam-Cracked Gas", + "material.lightly_steam_cracked_heavy_fuel": "Lightly Steam-Cracked Heavy Fuel", + "material.lightly_steam_cracked_light_fuel": "Lightly Steam-Cracked Light Fuel", + "material.lightly_steam_cracked_naphtha": "Lightly Steam-Cracked Naphtha", "material.lime_dye": "Lime Dye", "material.liquid_air": "Liquid Air", "material.liquid_ender_air": "Liquid Ender Air", @@ -4471,6 +4430,7 @@ "material.palladium": "Palladium", "material.palladium_raw": "Palladium Raw", "material.paper": "Paper", + "material.pcb_coolant": "PCB Coolant", "material.pentlandite": "Pentlandite", "material.perlite": "Perlite", "material.phenol": "Phenol", @@ -4491,6 +4451,7 @@ "material.polonium": "Polonium", "material.polybenzimidazole": "Polybenzimidazole", "material.polycaprolactam": "Polycaprolactam", + "material.polychlorinated_biphenyl": "Polychlorinated Biphenyl", "material.polydimethylsiloxane": "Polydimethylsiloxane", "material.polyethylene": "Polyethylene", "material.polyphenylene_sulfide": "Polyphenylene Sulfide", @@ -4564,14 +4525,14 @@ "material.seaborgium": "Seaborgium", "material.seed_oil": "Seed Oil", "material.selenium": "Selenium", - "material.severely_hydro_cracked_gas": "Severely Hydro Cracked Gas", - "material.severely_hydro_cracked_heavy_fuel": "Severely Hydro Cracked Heavy Fuel", - "material.severely_hydro_cracked_light_fuel": "Severely Hydro Cracked Light Fuel", - "material.severely_hydro_cracked_naphtha": "Severely Hydro Cracked Naphtha", - "material.severely_steam_cracked_gas": "Severely Steam Cracked Gas", - "material.severely_steam_cracked_heavy_fuel": "Severely Steam Cracked Heavy Fuel", - "material.severely_steam_cracked_light_fuel": "Severely Steam Cracked Light Fuel", - "material.severely_steam_cracked_naphtha": "Severely Steam Cracked Naphtha", + "material.severely_hydro_cracked_gas": "Severely Hydro-Cracked Gas", + "material.severely_hydro_cracked_heavy_fuel": "Severely Hydro-Cracked Heavy Fuel", + "material.severely_hydro_cracked_light_fuel": "Severely Hydro-Cracked Light Fuel", + "material.severely_hydro_cracked_naphtha": "Severely Hydro-Cracked Naphtha", + "material.severely_steam_cracked_gas": "Severely Steam-Cracked Gas", + "material.severely_steam_cracked_heavy_fuel": "Severely Steam-Cracked Heavy Fuel", + "material.severely_steam_cracked_light_fuel": "Severely Steam-Cracked Light Fuel", + "material.severely_steam_cracked_naphtha": "Severely Steam-Cracked Naphtha", "material.silicon": "Silicon", "material.silicon_dioxide": "Silicon Dioxide", "material.silicone_rubber": "Silicone Rubber", @@ -4592,15 +4553,15 @@ "material.spodumene": "Spodumene", "material.stainless_steel": "Stainless Steel", "material.steam": "Steam", - "material.steam_cracked_butadiene": "Steam Cracked Butadiene", - "material.steam_cracked_butane": "Steam Cracked Butane", - "material.steam_cracked_butene": "Steam Cracked Butene", - "material.steam_cracked_ethane": "Steam Cracked Ethane", - "material.steam_cracked_ethylene": "Steam Cracked Ethylene", - "material.steam_cracked_propane": "Steam Cracked Propane", - "material.steam_cracked_propene": "Steam Cracked Propene", + "material.steam_cracked_butadiene": "Steam-Cracked Butadiene", + "material.steam_cracked_butane": "Steam-Cracked Butane", + "material.steam_cracked_butene": "Steam-Cracked Butene", + "material.steam_cracked_ethane": "Steam-Cracked Ethane", + "material.steam_cracked_ethylene": "Steam-Cracked Ethylene", + "material.steam_cracked_propane": "Steam-Cracked Propane", + "material.steam_cracked_propene": "Steam-Cracked Propene", "material.steel": "Steel", - "material.stellite_100": "Stellite 100", + "material.stellite_100": "Stellite-100", "material.sterilized_growth_medium": "Sterilized Growth Medium", "material.sterling_silver": "Sterling Silver", "material.stibnite": "Stibnite", @@ -4687,7 +4648,7 @@ "material.yttrium": "Yttrium", "material.yttrium_barium_cuprate": "Yttrium Barium Cuprate", "material.zeolite": "Zeolite", - "material.zeron_100": "Zeron 100", + "material.zeron_100": "Zeron-100", "material.zinc": "Zinc", "material.zinc_sulfide": "Zinc Sulfide", "material.zincite": "Zincite", @@ -4911,15 +4872,5 @@ "tile.gtceu.petrified_foam.name": "Petrified Foam", "tile.gtceu.reinforced_foam.name": "Reinforced Foam", "tile.gtceu.reinforced_stone.name": "Reinforced Stone", - "tile.gtceu.seal.name": "Sealed Block", - "tile.stone_bricks_square.concrete_dark.name": "Square Dark Concrete Bricks", - "tile.wire_coil.tooltip_cracking": "§8Cracking Unit:", - "tile.wire_coil.tooltip_energy_cracking": " §aEnergy Usage: §f%s%%", - "tile.wire_coil.tooltip_energy_smelter": " §aEnergy Usage: §f%s EU/t §8per recipe", - "tile.wire_coil.tooltip_extended_info": "Hold SHIFT to show Coil Bonus Info", - "tile.wire_coil.tooltip_heat": "§cBase Heat Capacity: §f%d K", - "tile.wire_coil.tooltip_parallel_smelter": " §5Max Parallel: §f%s", - "tile.wire_coil.tooltip_pyro": "§8Pyrolyse Oven:", - "tile.wire_coil.tooltip_smelter": "§8Multi Smelter:", - "tile.wire_coil.tooltip_speed_pyro": " §bProcessing Speed: §f%s%%" + "tile.gtceu.seal.name": "Sealed Block" } \ No newline at end of file diff --git a/forge/src/main/java/com/gregtechceu/gtceu/api/blockentity/forge/MetaMachineBlockEntityImpl.java b/forge/src/main/java/com/gregtechceu/gtceu/api/blockentity/forge/MetaMachineBlockEntityImpl.java index 60f726b5ed..491048be5f 100644 --- a/forge/src/main/java/com/gregtechceu/gtceu/api/blockentity/forge/MetaMachineBlockEntityImpl.java +++ b/forge/src/main/java/com/gregtechceu/gtceu/api/blockentity/forge/MetaMachineBlockEntityImpl.java @@ -117,7 +117,7 @@ public static LazyOptional getCapability(MetaMachine machine, @NotNull Ca )); } } - var transfer = machine.getItemTransferCap(side); + var transfer = machine.getItemTransferCap(side, true); if (transfer != null) { return ForgeCapabilities.ITEM_HANDLER.orEmpty(cap, LazyOptional.of(() -> ItemTransferHelperImpl.toItemHandler(transfer))); } @@ -134,7 +134,7 @@ public static LazyOptional getCapability(MetaMachine machine, @NotNull Ca )); } } - var transfer = machine.getFluidTransferCap(side); + var transfer = machine.getFluidTransferCap(side, true); if (transfer != null) { return ForgeCapabilities.FLUID_HANDLER.orEmpty(cap, LazyOptional.of(() -> FluidTransferHelperImpl.toFluidHandler(transfer))); } @@ -149,11 +149,11 @@ public static LazyOptional getCapability(MetaMachine machine, @NotNull Ca } } else if (cap == GTCapability.CAPABILITY_LASER) { if (machine instanceof ILaserContainer energyContainer) { - return GTCapability.CAPABILITY_ENERGY_CONTAINER.orEmpty(cap, LazyOptional.of(() -> energyContainer)); + return GTCapability.CAPABILITY_LASER.orEmpty(cap, LazyOptional.of(() -> energyContainer)); } var list = machine.getTraits().stream().filter(ILaserContainer.class::isInstance).filter(t -> t.hasCapability(side)).map(ILaserContainer.class::cast).toList(); if (!list.isEmpty()) { - return GTCapability.CAPABILITY_ENERGY_CONTAINER.orEmpty(cap, LazyOptional.of(() -> list.size() == 1 ? list.get(0) : new LaserContainerList(list))); + return GTCapability.CAPABILITY_LASER.orEmpty(cap, LazyOptional.of(() -> list.size() == 1 ? list.get(0) : new LaserContainerList(list))); } } diff --git a/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/FluidPipeBlockEntityImpl.java b/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/FluidPipeBlockEntityImpl.java index 065ef65c76..1bd036733b 100644 --- a/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/FluidPipeBlockEntityImpl.java +++ b/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/FluidPipeBlockEntityImpl.java @@ -8,7 +8,9 @@ import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeData; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeNet; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.PipeNetRoutePath; +import com.lowdragmc.lowdraglib.side.fluid.IFluidTransfer; import com.lowdragmc.lowdraglib.side.fluid.forge.FluidHelperImpl; +import com.lowdragmc.lowdraglib.side.fluid.forge.FluidTransferHelperImpl; import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import lombok.Setter; @@ -77,6 +79,10 @@ public IFluidHandler getFluidHandler(@Nullable Direction side) { return null; } + public static IFluidTransfer getNetHandler(FluidPipeBlockEntity pipe, @Nullable Direction side) { + return FluidTransferHelperImpl.toFluidTransfer(((FluidPipeBlockEntityImpl) pipe).getFluidHandler(side)); + } + public static void onBlockEntityRegister(BlockEntityType cableBlockEntityBlockEntityType) { } diff --git a/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/ItemPipeBlockEntityImpl.java b/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/ItemPipeBlockEntityImpl.java index 97f882feb9..c8eabc20cb 100644 --- a/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/ItemPipeBlockEntityImpl.java +++ b/forge/src/main/java/com/gregtechceu/gtceu/common/blockentity/forge/ItemPipeBlockEntityImpl.java @@ -36,7 +36,7 @@ public static void onBlockEntityRegister(BlockEntityType ca if (getHandlers().size() == 0) initHandlers(); checkNetwork(); - return ForgeCapabilities.ITEM_HANDLER.orEmpty(cap, LazyOptional.of(() -> ItemTransferHelperImpl.toItemHandler(getHandlers().getOrDefault(side, getDefaultHandler())))); + return ForgeCapabilities.ITEM_HANDLER.orEmpty(cap, LazyOptional.of(() -> ItemTransferHelperImpl.toItemHandler(getHandler(side, true)))); } else if (cap == GTCapability.CAPABILITY_COVERABLE) { return GTCapability.CAPABILITY_COVERABLE.orEmpty(cap, LazyOptional.of(this::getCoverContainer)); } else if (cap == GTCapability.CAPABILITY_TOOLABLE) { diff --git a/settings.gradle b/settings.gradle index 5b27aa6a93..419b184649 100644 --- a/settings.gradle +++ b/settings.gradle @@ -59,6 +59,7 @@ dependencyResolutionManagement { def vineFlowerVersion = "1.+" def macheteVersion = "1.+" def ldLibVersion = "1.0.21.a" + def mixinextrasVersion = "0.2.0" fabric { def parchment = version("parchment", parchmentVersion) @@ -122,6 +123,13 @@ dependencyResolutionManagement { def configuration = version("configuration", configurationFabricFile) library("configuration", "curse.maven", "configuration-444699").versionRef(configuration) + def mixinextras = version("mixinextras", mixinextrasVersion) + library("mixinextras", "io.github.llamalad7", "mixinextras-fabric").versionRef(mixinextras) + library("mixinextras-common", "io.github.llamalad7", "mixinextras-common").versionRef(mixinextras) + + def configuration = version("configuration", configurationVersion) + library("configuration", "dev.toma.configuration", "configuration-fabric-1.20.1").versionRef(configuration) + def worldStripper = version("worldStripper", worldStripperFabricFile) library("worldStripper", "curse.maven", "worldStripper-250603").versionRef(worldStripper) @@ -172,6 +180,9 @@ dependencyResolutionManagement { def kubejs = version("kubejs", kjsVersion) library("kubejs", "dev.latvian.mods", "kubejs-forge").versionRef(kubejs) + def mixinextras = version("mixinextras", mixinextrasVersion) + library("mixinextras-forge", "io.github.llamalad7", "mixinextras-forge").versionRef(mixinextras) + def configuration = version("configuration", configurationForgeFile) library("configuration", "curse.maven", "configuration-444699").versionRef(configuration)