From 0d68f794ae2049aff3023fac3c3a5ddf7eba5ed0 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 28 Aug 2019 02:46:56 +0300 Subject: [PATCH 01/17] Iron furnace drops experience. Still need to save fuel time to tag --- .../machine/iron/IronFurnaceBlockEntity.java | 18 ++++++-- .../java/techreborn/client/gui/GuiAESU.java | 15 +++---- .../client/gui/GuiAlloyFurnace.java | 7 ---- .../techreborn/client/gui/GuiIronFurnace.java | 42 +++++++++++++++---- 4 files changed, 57 insertions(+), 25 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index 8eadfb800..33ba02a08 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -60,7 +60,7 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity int outputSlot = 1; int fuelSlot = 2; boolean active = false; - private float experience; + public float experience; public IronFurnaceBlockEntity() { super(TRBlockEntities.IRON_FURNACE); @@ -161,10 +161,10 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity totalExperience -= expToDrop; player.world.spawnEntity(new ExperienceOrbEntity(player.world, player.x, player.y + 0.5D, player.z + 0.5D, expToDrop)); } - experience = 0; } + experience = 0; } - + private void updateState() { BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof BlockMachineBase) { @@ -269,6 +269,14 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity public void setProgress(int progress) { this.progress = progress; } + + public float getExperience() { + return experience; + } + + public void setExperience(float experience) { + this.experience = experience; + } @Override public BuiltContainer createContainer(int syncID, final PlayerEntity player) { @@ -276,6 +284,8 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity .addInventory().blockEntity(this).fuelSlot(2, 56, 53).slot(0, 56, 17).outputSlot(1, 116, 35) .syncIntegerValue(this::getBurnTime, this::setBurnTime) .syncIntegerValue(this::getProgress, this::setProgress) - .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this, syncID); + .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime) + .sync(this::getExperience, this::setExperience) + .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index d57c858df..15896c11d 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -43,6 +43,14 @@ public class GuiAESU extends GuiBase { super(player, aesu, aesu.createContainer(syncID, player)); this.blockEntity = aesu; } + + @Override + public void init() { + addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256))); + addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64))); + addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64))); + addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256))); + } @Override protected void drawBackground(final float f, final int mouseX, final int mouseY) { @@ -71,13 +79,6 @@ public class GuiAESU extends GuiBase { } builder.drawMultiEnergyBar(this, 81, 28, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); - - addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256))); - addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64))); - addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64))); - addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256))); - - } public void onClick(int amount){ diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index cc1d7a3d7..7368f538f 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -42,7 +42,6 @@ public class GuiAlloyFurnace extends GuiBase { @Override protected void drawBackground(float lastFrameDuration, int mouseX, int mouseY) { super.drawBackground(lastFrameDuration, mouseX, mouseY); - GuiBase.Layer layer = GuiBase.Layer.BACKGROUND; // Input slots @@ -62,10 +61,4 @@ public class GuiAlloyFurnace extends GuiBase { builder.drawProgressBar(this, blockEntity.getCookProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawBurnBar(this, blockEntity.getBurnTimeRemainingScaled(100), 100, 56, 36, mouseX, mouseY, layer); } - - @Override - public void render(int mouseX, int mouseY, float lastFrameDuration) { - super.render(mouseX, mouseY, lastFrameDuration); - this.drawMouseoverTooltip(mouseX, mouseY); - } } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 9d75a528b..76679d7f1 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -24,9 +24,17 @@ package techreborn.client.gui; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import com.mojang.blaze3d.platform.GlStateManager; + +import net.minecraft.client.gui.widget.AbstractButtonWidget; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; @@ -41,10 +49,27 @@ public class GuiIronFurnace extends GuiBase { this.blockEntity = furnace; } - public void onClick(int amount){ + public void onClick(){ NetworkManager.sendToServer(ServerboundPackets.createPacketExperience(blockEntity)); } + @Override + public void init() { + super.init(); + addButton(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, "Exp", b -> onClick()) { + + + @Override + public void renderToolTip(int mouseX, int mouseY) { + List list = new ArrayList<>(); + list.add("Expirience accumulated: " + blockEntity.experience); + renderTooltip(list, mouseX - getGuiLeft(), mouseY - getGuiTop()); + GlStateManager.disableLighting(); + GlStateManager.color4f(1, 1, 1, 1); + } + }); + } + @Override protected void drawBackground(float lastFrameDuration, int mouseX, int mouseY) { super.drawBackground(lastFrameDuration, mouseX, mouseY); @@ -59,17 +84,20 @@ public class GuiIronFurnace extends GuiBase { } @Override - protected void drawForeground(final int mouseX, final int mouseY) { + protected void drawForeground(int mouseX, int mouseY) { super.drawForeground(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; builder.drawProgressBar(this, blockEntity.gaugeProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawBurnBar(this, blockEntity.gaugeFuelScaled(100), 100, 56, 36, mouseX, mouseY, layer); - } + Iterator buttonsList = this.buttons.iterator(); - @Override - public void render(int mouseX, int mouseY, float lastFrameDuration) { - super.render(mouseX, mouseY, lastFrameDuration); - this.drawMouseoverTooltip(mouseX, mouseY); + while (buttonsList.hasNext()) { + AbstractButtonWidget abstractButtonWidget = (AbstractButtonWidget) buttonsList.next(); + if (abstractButtonWidget.isHovered()) { + abstractButtonWidget.renderToolTip(mouseX, mouseY); + break; + } + } } } From 2518c32c54a48299e915678106fd1dcb8201afcf Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 28 Aug 2019 15:40:42 +0300 Subject: [PATCH 02/17] UpDown button refactoring --- src/main/java/techreborn/client/gui/GuiAESU.java | 10 +++++----- .../techreborn/client/gui/GuiChunkLoader.java | 13 ++++++++----- .../techreborn/client/gui/GuiFusionReactor.java | 15 +++++++++------ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 15896c11d..3c1549d31 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -30,6 +30,7 @@ import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; import techreborn.packets.ServerboundPackets; @@ -46,10 +47,10 @@ public class GuiAESU extends GuiBase { @Override public void init() { - addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256))); - addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64))); - addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64))); - addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256))); + addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, b -> onClick(-256), UpDownButtonType.FASTREWIND)); } @Override @@ -61,7 +62,6 @@ public class GuiAESU extends GuiBase { this.drawSlot(98, 45, layer); this.drawArmourSlots(8, 18, layer); this.builder.drawEnergyOutput(this, 155, 61, this.blockEntity.getCurrentOutput(), layer); - this.builder.drawUpDownButtons(this, 121, 79, layer); } @Override diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 8c968dffd..41c0328b2 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -28,6 +28,7 @@ import net.minecraft.entity.player.PlayerEntity; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.network.NetworkManager; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; import techreborn.packets.ServerboundPackets; @@ -41,6 +42,13 @@ public class GuiChunkLoader extends GuiBase { this.blockEntity = blockEntity; } + public void init() { + addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); + } + @Override protected void drawBackground(float partialTicks, int mouseX, int mouseY) { super.drawBackground(partialTicks, mouseX, mouseY); @@ -48,7 +56,6 @@ public class GuiChunkLoader extends GuiBase { // Battery slot drawSlot(8, 72, layer); - builder.drawUpDownButtons(this, 64, 40, layer); if (GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE) { return; } @@ -62,10 +69,6 @@ public class GuiChunkLoader extends GuiBase { final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; builder.drawMultiEnergyBar(this, 9, 19, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); - addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5))); - addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1))); - addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1))); - addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5))); } public void onClick(int amount){ diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 7dc6e8ceb..ab0597522 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -34,6 +34,7 @@ import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonUpDown; +import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; @@ -56,6 +57,14 @@ public class GuiFusionReactor extends GuiBase { super(player, blockEntity, blockEntity.createContainer(syncID, player)); this.blockEntity = blockEntity; } + + @Override + public void init() { + addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD)); + addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND)); + addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1), UpDownButtonType.FASTREWIND)); + } @Override protected void drawBackground(final float partialTicks, final int mouseX, final int mouseY) { @@ -101,15 +110,9 @@ public class GuiFusionReactor extends GuiBase { } } - builder.drawUpDownButtons(this, 121, 79, layer); drawString("Size: " + blockEntity.size, 83, 81, 0xFFFFFF, layer); drawString("" + blockEntity.getPowerMultiplier() + "x", 10, 81, 0xFFFFFF, layer); - addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5))); - addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1))); - addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5))); - addButton(new GuiButtonUpDown(left + 121 + 36, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-1))); - builder.drawMultiEnergyBar(this, 9, 19, (int) this.blockEntity.getEnergy(), (int) this.blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); } From 528b868abe4cb822d4f7c629271f72e2b3b36be7 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 28 Aug 2019 17:56:59 +0300 Subject: [PATCH 03/17] Do not forget to call super in GUI init --- src/main/java/techreborn/client/gui/GuiAESU.java | 1 + src/main/java/techreborn/client/gui/GuiChunkLoader.java | 1 + src/main/java/techreborn/client/gui/GuiFusionReactor.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 3c1549d31..84bf4a592 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -47,6 +47,7 @@ public class GuiAESU extends GuiBase { @Override public void init() { + super.init(); addButton(new GuiButtonUpDown(left + 121, top + 79, this, b -> onClick(256), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, b -> onClick(64), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, b -> onClick(-64), UpDownButtonType.REWIND)); diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 41c0328b2..db0b9a68c 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -43,6 +43,7 @@ public class GuiChunkLoader extends GuiBase { } public void init() { + super.init(); addButton(new GuiButtonUpDown(left + 64, top + 40, this, b -> onClick(5), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index ab0597522..22f45c56a 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -60,6 +60,7 @@ public class GuiFusionReactor extends GuiBase { @Override public void init() { + super.init(); addButton(new GuiButtonUpDown(left + 121, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(5), UpDownButtonType.FASTFORWARD)); addButton(new GuiButtonUpDown(left + 121 + 12, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(1), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(left + 121 + 24, top + 79, this, (ButtonWidget buttonWidget) -> sendSizeChange(-5), UpDownButtonType.REWIND)); From fbfa24b6ff68d990177be8cf4547b32b6064b83c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 29 Aug 2019 02:43:39 +0300 Subject: [PATCH 04/17] Iron furnace accumulates and drops experience. Closes #1817 --- .../iron/IronAlloyFurnaceBlockEntity.java | 35 ++++++++--- .../machine/iron/IronFurnaceBlockEntity.java | 7 ++- .../techreborn/client/gui/GuiIronFurnace.java | 61 +++++++++++++------ .../java/techreborn/utils/PlayerUtils.java | 41 +++++++++++++ 4 files changed, 116 insertions(+), 28 deletions(-) create mode 100644 src/main/java/techreborn/utils/PlayerUtils.java diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java index 3b5cb5b62..fc9ae6df7 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java @@ -28,6 +28,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; @@ -46,11 +47,10 @@ import techreborn.init.TRContent; public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { - public int tickTime; public RebornInventory inventory = new RebornInventory<>(4, "IronAlloyFurnaceBlockEntity", 64, this); public int burnTime; public int totalBurnTime; - public int cookTime; + public int progress; int input1 = 0; int input2 = 1; int output = 2; @@ -72,6 +72,23 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity } return AbstractFurnaceBlockEntity.createFuelTimeMap().getOrDefault(stack.getItem(), 0); } + + @Override + public void fromTag(CompoundTag compoundTag) { + super.fromTag(compoundTag); + burnTime = compoundTag.getInt("BurnTime"); + totalBurnTime = compoundTag.getInt("TotalBurnTime"); + progress = compoundTag.getInt("Progress"); + } + + @Override + public CompoundTag toTag(CompoundTag compoundTag) { + super.toTag(compoundTag); + compoundTag.putInt("BurnTime", burnTime); + compoundTag.putInt("TotalBurnTime", totalBurnTime); + compoundTag.putInt("Progress", progress); + return compoundTag; + } @Override public void tick() { @@ -96,14 +113,14 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity } } if (isBurning() && canSmelt()) { - ++cookTime; - if (cookTime == 200) { - cookTime = 0; + ++progress; + if (progress == 200) { + progress = 0; smeltItem(); updateInventory = true; } } else { - cookTime = 0; + progress = 0; } } if (isBurning != isBurning()) { @@ -212,7 +229,7 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity } public int getCookProgressScaled(int scale) { - return cookTime * scale / 200; + return progress * scale / 200; } public void updateState() { @@ -256,11 +273,11 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity } public int getCookTime() { - return cookTime; + return progress; } public void setCookTime(int cookTime) { - this.cookTime = cookTime; + this.progress = cookTime; } @Override diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index 33ba02a08..cd99995b1 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -50,7 +50,6 @@ import techreborn.utils.RecipeUtils; public class IronFurnaceBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IContainerProvider { - public int tickTime; public RebornInventory inventory = new RebornInventory<>(3, "IronFurnaceBlockEntity", 64, this, getInvetoryAccess()); public int burnTime; public int totalBurnTime; @@ -179,12 +178,18 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity public void fromTag(CompoundTag compoundTag) { super.fromTag(compoundTag); experience = compoundTag.getFloat("Experience"); + burnTime = compoundTag.getInt("BurnTime"); + totalBurnTime = compoundTag.getInt("TotalBurnTime"); + progress = compoundTag.getInt("Progress"); } @Override public CompoundTag toTag(CompoundTag compoundTag) { super.toTag(compoundTag); compoundTag.putFloat("Experience", experience); + compoundTag.putInt("BurnTime", burnTime); + compoundTag.putInt("TotalBurnTime", totalBurnTime); + compoundTag.putInt("Progress", progress); return compoundTag; } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 76679d7f1..0aa8556ca 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -25,13 +25,14 @@ package techreborn.client.gui; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonSimple; @@ -39,6 +40,7 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; import techreborn.packets.ServerboundPackets; +import techreborn.utils.PlayerUtils; public class GuiIronFurnace extends GuiBase { @@ -56,16 +58,48 @@ public class GuiIronFurnace extends GuiBase { @Override public void init() { super.init(); - addButton(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, "Exp", b -> onClick()) { + addButton(new GuiButtonSimple(getGuiLeft() + 116, getGuiTop() + 57, 18, 18, "", b -> onClick()) { - @Override public void renderToolTip(int mouseX, int mouseY) { - List list = new ArrayList<>(); - list.add("Expirience accumulated: " + blockEntity.experience); - renderTooltip(list, mouseX - getGuiLeft(), mouseY - getGuiTop()); - GlStateManager.disableLighting(); - GlStateManager.color4f(1, 1, 1, 1); + PlayerEntity player = playerInventory.player; + if (player == null) { + return; + } + String message = "Experience: "; + + float furnaceExp = blockEntity.experience; + if (furnaceExp <= 0) { + message = message + "0"; + } else { + float expTillLevel = (1.0F - player.experienceProgress) * player.getNextLevelExperience(); + if (furnaceExp <= expTillLevel) { + int percentage = (int) (blockEntity.experience * 100 / player.getNextLevelExperience()); + message = message + "+" + + (percentage > 0 ? String.valueOf(percentage) : "<1") + + "%"; + } else { + int levels = 0; + furnaceExp -= expTillLevel; + while (furnaceExp > 0) { + furnaceExp -= PlayerUtils.getLevelExperience(player.experienceLevel); + ++levels; + } + message = message + "+" + String.valueOf(levels) + "L"; + } + } + + List list = new ArrayList<>(); + list.add(message); + renderTooltip(list, mouseX, mouseY); + GlStateManager.disableLighting(); + GlStateManager.color4f(1, 1, 1, 1); + + } + + @Override + public void renderBg(MinecraftClient mc, int mouseX, int mouseY) { + mc.getItemRenderer().renderGuiItem(new ItemStack(Items.EXPERIENCE_BOTTLE), x, y); } }); } @@ -90,14 +124,5 @@ public class GuiIronFurnace extends GuiBase { builder.drawProgressBar(this, blockEntity.gaugeProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawBurnBar(this, blockEntity.gaugeFuelScaled(100), 100, 56, 36, mouseX, mouseY, layer); - Iterator buttonsList = this.buttons.iterator(); - - while (buttonsList.hasNext()) { - AbstractButtonWidget abstractButtonWidget = (AbstractButtonWidget) buttonsList.next(); - if (abstractButtonWidget.isHovered()) { - abstractButtonWidget.renderToolTip(mouseX, mouseY); - break; - } - } } } diff --git a/src/main/java/techreborn/utils/PlayerUtils.java b/src/main/java/techreborn/utils/PlayerUtils.java new file mode 100644 index 000000000..80c2b1f74 --- /dev/null +++ b/src/main/java/techreborn/utils/PlayerUtils.java @@ -0,0 +1,41 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package techreborn.utils; + +/** + * @author drcrazy + * + */ +public class PlayerUtils { + + public static int getLevelExperience(int level) { + if (level >= 30) { + return 112 + (level - 30) * 9; + } + return level >= 15 ? 37 + (level - 15) * 5 : 7 + level * 2; + + } + +} From 7c4564b5abdc7ab925976b6776bea7719bcecbda Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 30 Aug 2019 14:26:23 +0300 Subject: [PATCH 05/17] Move common code for iron machines into abstract class --- .../GenericMachineBlockEntity.java | 6 +- .../iron/AbstractIronMachineBlockEntity.java | 207 ++++++++++++++ .../iron/IronAlloyFurnaceBlockEntity.java | 183 +------------ .../machine/iron/IronFurnaceBlockEntity.java | 259 ++++-------------- .../client/gui/GuiAlloyFurnace.java | 2 +- .../techreborn/client/gui/GuiIronFurnace.java | 4 +- .../techreborn/config/TechRebornConfig.java | 9 +- 7 files changed, 289 insertions(+), 381 deletions(-) create mode 100644 src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java diff --git a/src/main/java/techreborn/blockentity/GenericMachineBlockEntity.java b/src/main/java/techreborn/blockentity/GenericMachineBlockEntity.java index 1713e30ef..cb6f3fa65 100644 --- a/src/main/java/techreborn/blockentity/GenericMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/GenericMachineBlockEntity.java @@ -68,14 +68,14 @@ public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity checkTier(); } - public int getProgressScaled(final int scale) { + public int getProgressScaled(int scale) { if (crafter != null && crafter.currentTickTime != 0) { return crafter.currentTickTime * scale / crafter.currentNeededTicks; } return 0; } - // TilePowerAcceptor + // PowerAcceptorBlockEntity @Override public void tick() { super.tick(); @@ -115,7 +115,7 @@ public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity return new ItemStack(toolDrop, 1); } - // ItemHandlerProvider + // InventoryProvider @Override public RebornInventory getInventory() { return inventory; diff --git a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java new file mode 100644 index 000000000..45b2de202 --- /dev/null +++ b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java @@ -0,0 +1,207 @@ +package techreborn.blockentity.machine.iron; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.AbstractFurnaceBlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import reborncore.api.IToolDrop; +import reborncore.api.blockentity.InventoryProvider; +import reborncore.common.blockentity.MachineBaseBlockEntity; +import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.util.RebornInventory; +import techreborn.config.TechRebornConfig; + +public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop { + + public RebornInventory inventory; + public int burnTime; + public int totalBurnTime; + public int progress; + public int totalCookingTime; + int fuelSlot; + Block toolDrop; + boolean active = false; + + public AbstractIronMachineBlockEntity(BlockEntityType blockEntityTypeIn, int fuelSlot, Block toolDrop) { + super(blockEntityTypeIn); + this.fuelSlot = fuelSlot; + // default value for vanilla smelting recipes is 200 + this.totalCookingTime = (int) (200 / TechRebornConfig.cookingScale); + this.toolDrop = toolDrop; + } + + /** + * Checks that we have all inputs and can put output into slot + * @return + */ + protected abstract boolean canSmelt(); + + /** + * Turn ingredients into the appropriate smelted + * item in the output slot + */ + protected abstract void smelt(); + + /** + * Returns the number of ticks that the supplied fuel item will keep the + * furnace burning, or 0 if the item isn't fuel + * @param stack Itemstack of fuel + * @return Integer Number of ticks + */ + private int getItemBurnTime(ItemStack stack) { + if (stack.isEmpty()) { + return 0; + } + return (int) (AbstractFurnaceBlockEntity.createFuelTimeMap().getOrDefault(stack.getItem(), 0) * TechRebornConfig.fuelScale); + } + + /** + * Returns remaining fraction of fuel burn time + * @param scale Scale to use for burn time + * @return int scaled remaining fuel burn time + */ + public int getBurnTimeRemainingScaled(int scale) { + if (totalBurnTime == 0) { + return 0; + } + + return burnTime * scale / totalBurnTime; + } + + /** + * Returns crafting progress + * @param scale Scale to use for crafting progress + * @return int Scaled crafting progress + */ + public int getProgressScaled(int scale) { + if (totalCookingTime > 0) { + return progress * scale / totalCookingTime; + } + return 0; + } + + /** + * Returns true if Iron Machine is burning fuel thus can do work + * @return Boolean True if machine is burning + */ + public boolean isBurning() { + return burnTime > 0; + } + + private void updateState() { + BlockState state = world.getBlockState(pos); + if (state.getBlock() instanceof BlockMachineBase) { + BlockMachineBase blockMachineBase = (BlockMachineBase) state.getBlock(); + if (state.get(BlockMachineBase.ACTIVE) != burnTime > 0) + blockMachineBase.setActive(burnTime > 0, world, pos); + } + } + + // MachineBaseBlockEntity + @Override + public void fromTag(CompoundTag compoundTag) { + super.fromTag(compoundTag); + burnTime = compoundTag.getInt("BurnTime"); + totalBurnTime = compoundTag.getInt("TotalBurnTime"); + progress = compoundTag.getInt("Progress"); + } + + @Override + public CompoundTag toTag(CompoundTag compoundTag) { + super.toTag(compoundTag); + compoundTag.putInt("BurnTime", burnTime); + compoundTag.putInt("TotalBurnTime", totalBurnTime); + compoundTag.putInt("Progress", progress); + return compoundTag; + } + + @Override + public void tick() { + super.tick(); + if(world.isClient){ + return; + } + boolean isBurning = isBurning(); + if (isBurning) { + --burnTime; + } + + if (!isBurning && canSmelt()) { + burnTime = totalBurnTime = getItemBurnTime(inventory.getInvStack(fuelSlot)); + if (burnTime > 0) { + // Fuel slot + ItemStack fuelStack = inventory.getInvStack(fuelSlot); + if (fuelStack.getItem().hasRecipeRemainder()) { + inventory.setInvStack(fuelSlot, new ItemStack(fuelStack.getItem().getRecipeRemainder())); + } else if (fuelStack.getCount() > 1) { + inventory.shrinkSlot(fuelSlot, 1); + } else if (fuelStack.getCount() == 1) { + inventory.setInvStack(fuelSlot, ItemStack.EMPTY); + } + } + } + + if (isBurning() && canSmelt()) { + ++progress; + if (progress == totalCookingTime) { + progress = 0; + smelt(); + } + } else { + progress = 0; + } + + if (isBurning != isBurning()) { + inventory.setChanged(); + updateState(); + } + if (inventory.hasChanged()) { + markDirty(); + } + } + + @Override + public boolean canBeUpgraded() { + return false; + } + + // InventoryProvider + @Override + public RebornInventory getInventory() { + return inventory; + } + + // IToolDrop + @Override + public ItemStack getToolDrop(PlayerEntity entityPlayer) { + return new ItemStack(toolDrop); + } + + public int getBurnTime() { + return this.burnTime; + } + + public void setBurnTime(int burnTime) { + this.burnTime = burnTime; + } + + public int getTotalBurnTime() { + return this.totalBurnTime; + } + + public void setTotalBurnTime(int totalBurnTime) { + this.totalBurnTime = totalBurnTime; + } + + public int getProgress() { + return progress; + } + + public void setProgress(int progress) { + this.progress = progress; + } + +} \ No newline at end of file diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java index fc9ae6df7..3e64aa706 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java @@ -24,19 +24,11 @@ package techreborn.blockentity.machine.iron; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.Direction; -import reborncore.api.IToolDrop; -import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; -import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.blocks.BlockMachineBase; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.util.RebornInventory; @@ -44,93 +36,15 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { +public class IronAlloyFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements IContainerProvider { - public RebornInventory inventory = new RebornInventory<>(4, "IronAlloyFurnaceBlockEntity", 64, this); - public int burnTime; - public int totalBurnTime; - public int progress; int input1 = 0; int input2 = 1; int output = 2; - int fuel = 3; public IronAlloyFurnaceBlockEntity() { - super(TRBlockEntities.IRON_ALLOY_FURNACE); - } - - /** - * Returns the number of ticks that the supplied fuel item will keep the - * furnace burning, or 0 if the item isn't fuel - * @param stack Itemstack of fuel - * @return Integer Number of ticks - */ - public static int getItemBurnTime(ItemStack stack) { - if (stack.isEmpty()) { - return 0; - } - return AbstractFurnaceBlockEntity.createFuelTimeMap().getOrDefault(stack.getItem(), 0); - } - - @Override - public void fromTag(CompoundTag compoundTag) { - super.fromTag(compoundTag); - burnTime = compoundTag.getInt("BurnTime"); - totalBurnTime = compoundTag.getInt("TotalBurnTime"); - progress = compoundTag.getInt("Progress"); - } - - @Override - public CompoundTag toTag(CompoundTag compoundTag) { - super.toTag(compoundTag); - compoundTag.putInt("BurnTime", burnTime); - compoundTag.putInt("TotalBurnTime", totalBurnTime); - compoundTag.putInt("Progress", progress); - return compoundTag; - } - - @Override - public void tick() { - super.tick(); - if(world.isClient){ - return; - } - - boolean isBurning = isBurning(); - boolean updateInventory = false; - if (isBurning) { - --burnTime; - } - if (burnTime != 0 || !inventory.getInvStack(input1).isEmpty() && !inventory.getInvStack(fuel).isEmpty()) { - if (burnTime == 0 && canSmelt()) { - totalBurnTime = burnTime = getItemBurnTime(inventory.getInvStack(fuel)); - if (burnTime > 0) { - updateInventory = true; - if (!inventory.getInvStack(fuel).isEmpty()) { - inventory.shrinkSlot(fuel, 1); - } - } - } - if (isBurning() && canSmelt()) { - ++progress; - if (progress == 200) { - progress = 0; - smeltItem(); - updateInventory = true; - } - } else { - progress = 0; - } - } - if (isBurning != isBurning()) { - updateInventory = true; - updateState(); - } - - if (updateInventory) { - markDirty(); - } + super(TRBlockEntities.IRON_ALLOY_FURNACE, 3, TRContent.Machine.IRON_ALLOY_FURNACE.block); + this.inventory = new RebornInventory<>(4, "IronAlloyFurnaceBlockEntity", 64, this); } public boolean hasAllInputs(RebornRecipe recipeType) { @@ -150,7 +64,8 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity return true; } - private boolean canSmelt() { + @Override + protected boolean canSmelt() { if (inventory.getInvStack(input1).isEmpty() || inventory.getInvStack(input2).isEmpty()) { return false; } @@ -172,11 +87,8 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity return result <= inventory.getStackLimit() && result <= inventory.getInvStack(output).getMaxCount(); } - /** - * Turn one item from the furnace source stack into the appropriate smelted - * item in the furnace result stack - */ - public void smeltItem() { + @Override + protected void smelt() { if (!canSmelt()) { return; } @@ -212,87 +124,16 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity } } - /** - * Furnace isBurning - * @return Boolean True if furnace is burning - */ - public boolean isBurning() { - return burnTime > 0; - } - - public int getBurnTimeRemainingScaled(int scale) { - if (totalBurnTime == 0) { - totalBurnTime = 200; - } - - return burnTime * scale / totalBurnTime; - } - - public int getCookProgressScaled(int scale) { - return progress * scale / 200; - } - - public void updateState() { - BlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockMachineBase) { - BlockMachineBase blockMachineBase = (BlockMachineBase) state.getBlock(); - if (state.get(BlockMachineBase.ACTIVE) != burnTime > 0) - blockMachineBase.setActive(burnTime > 0, world, pos); - } - } - - @Override - public Direction getFacing() { - return getFacingEnum(); - } - - @Override - public ItemStack getToolDrop(PlayerEntity entityPlayer) { - return TRContent.Machine.IRON_ALLOY_FURNACE.getStack(); - } - - @Override - public RebornInventory getInventory() { - return inventory; - } - - public int getBurnTime() { - return burnTime; - } - - public void setBurnTime(int burnTime) { - this.burnTime = burnTime; - } - - public int getTotalBurnTime() { - return totalBurnTime; - } - - public void setTotalBurnTime(int currentItemBurnTime) { - this.totalBurnTime = currentItemBurnTime; - } - - public int getCookTime() { - return progress; - } - - public void setCookTime(int cookTime) { - this.progress = cookTime; - } - @Override public BuiltContainer createContainer(int syncID, final PlayerEntity player) { return new ContainerBuilder("alloyfurnace").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 47, 17) .slot(1, 65, 17) - .outputSlot(2, 116, 35).fuelSlot(3, 56, 53).syncIntegerValue(this::getBurnTime, this::setBurnTime) - .syncIntegerValue(this::getCookTime, this::setCookTime) - .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this, syncID); - } - - @Override - public boolean canBeUpgraded() { - return false; + .outputSlot(2, 116, 35).fuelSlot(3, 56, 53) + .syncIntegerValue(this::getBurnTime, this::setBurnTime) + .syncIntegerValue(this::getProgress, this::setProgress) + .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime) + .addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index cd99995b1..f42a6d9c1 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -26,8 +26,6 @@ package techreborn.blockentity.machine.iron; import java.util.Optional; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -35,120 +33,23 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; import net.minecraft.server.network.ServerPlayerEntity; -import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; -import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.util.IInventoryAccess; import reborncore.common.util.RebornInventory; -import reborncore.common.util.ItemUtils; import techreborn.init.TRBlockEntities; +import techreborn.init.TRContent; import techreborn.utils.RecipeUtils; -public class IronFurnaceBlockEntity extends MachineBaseBlockEntity - implements InventoryProvider, IContainerProvider { +public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements IContainerProvider { - public RebornInventory inventory = new RebornInventory<>(3, "IronFurnaceBlockEntity", 64, this, getInvetoryAccess()); - public int burnTime; - public int totalBurnTime; - public int progress; - public int fuelScale = 160; int inputSlot = 0; int outputSlot = 1; - int fuelSlot = 2; - boolean active = false; public float experience; - + public IronFurnaceBlockEntity() { - super(TRBlockEntities.IRON_FURNACE); - } - - public static IInventoryAccess getInvetoryAccess(){ - return (slotID, stack, face, direction, blockEntity) -> { - if(direction == IInventoryAccess.AccessDirection.INSERT){ - boolean isFuel = AbstractFurnaceBlockEntity.canUseAsFuel(stack); - if(isFuel){ - ItemStack fuelSlotStack = blockEntity.inventory.getInvStack(blockEntity.fuelSlot); - if(fuelSlotStack.isEmpty() || ItemUtils.isItemEqual(stack, fuelSlotStack, true, true) && fuelSlotStack.getMaxCount() != fuelSlotStack.getCount()){ - return slotID == blockEntity.fuelSlot; - } - } - return slotID != blockEntity.outputSlot; - } - return true; - }; - } - - public int gaugeProgressScaled(int scale) { - return progress * scale / fuelScale; - } - - public int gaugeFuelScaled(int scale) { - if (totalBurnTime == 0) { - totalBurnTime = burnTime; - if (totalBurnTime == 0) { - totalBurnTime = fuelScale; - } - } - return burnTime * scale / totalBurnTime; - } - - private void cookItems() { - if (!canSmelt()) { - return; - } - ItemStack inputStack = inventory.getInvStack(inputSlot); - ItemStack outputStack = getResultFor(inputStack); - float recipeExp = getExperienceFor(inputStack); - - if (inventory.getInvStack(outputSlot).isEmpty()) { - inventory.setInvStack(outputSlot, outputStack.copy()); - } else if (inventory.getInvStack(outputSlot).isItemEqualIgnoreDamage(outputStack)) { - inventory.getInvStack(outputSlot).increment(outputStack.getCount()); - } - if (inputStack.getCount() > 1) { - inventory.shrinkSlot(inputSlot, 1); - } else { - inventory.setInvStack(inputSlot, ItemStack.EMPTY); - } - experience += recipeExp; - } - - private boolean canSmelt() { - if (inventory.getInvStack(inputSlot).isEmpty()) { - return false; - } - ItemStack outputStack = getResultFor(inventory.getInvStack(inputSlot)); - if (outputStack.isEmpty()) - return false; - if (inventory.getInvStack(outputSlot).isEmpty()) - return true; - if (!inventory.getInvStack(outputSlot).isItemEqualIgnoreDamage(outputStack)) - return false; - int result = inventory.getInvStack(outputSlot).getCount() + outputStack.getCount(); - return result <= inventory.getStackLimit() && result <= outputStack.getMaxCount(); - } - - public boolean isBurning() { - return burnTime > 0; - } - - private ItemStack getResultFor(ItemStack stack) { - ItemStack result = RecipeUtils.getMatchingRecipes(world, RecipeType.SMELTING, stack); - if (!result.isEmpty()) { - return result.copy(); - } - return ItemStack.EMPTY; - } - - private float getExperienceFor(ItemStack stack) { - Optional recipe = world.getRecipeManager().getFirstMatch(RecipeType.SMELTING, this, world); - if (recipe.isPresent()) { - return recipe.get().getExperience(); - } - return 0; + super(TRBlockEntities.IRON_FURNACE, 2, TRContent.Machine.IRON_FURNACE.block); + this.inventory = new RebornInventory<>(3, "IronFurnaceBlockEntity", 64, this); } public void handleGuiInputFromClient(PlayerEntity playerIn) { @@ -164,117 +65,74 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity experience = 0; } - private void updateState() { - BlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockMachineBase) { - BlockMachineBase blockMachineBase = (BlockMachineBase) state.getBlock(); - if (state.get(BlockMachineBase.ACTIVE) != burnTime > 0) - blockMachineBase.setActive(burnTime > 0, world, pos); + private ItemStack getResultFor(ItemStack stack) { + ItemStack result = RecipeUtils.getMatchingRecipes(world, RecipeType.SMELTING, stack); + if (!result.isEmpty()) { + return result.copy(); + } + return ItemStack.EMPTY; + } + + private float getExperienceFor(ItemStack stack) { + Optional recipe = world.getRecipeManager().getFirstMatch(RecipeType.SMELTING, this, world); + if (recipe.isPresent()) { + return recipe.get().getExperience(); + } + return 0; + } + + // AbstractIronMachineBlockEntity + @Override + protected void smelt() { + if (!canSmelt()) { + return; + } + ItemStack inputStack = inventory.getInvStack(inputSlot); + ItemStack resultStack = getResultFor(inputStack); + + if (inventory.getInvStack(outputSlot).isEmpty()) { + inventory.setInvStack(outputSlot, resultStack.copy()); + } else if (inventory.getInvStack(outputSlot).isItemEqualIgnoreDamage(resultStack)) { + inventory.getInvStack(outputSlot).increment(resultStack.getCount()); + } + experience += getExperienceFor(inputStack); + if (inputStack.getCount() > 1) { + inventory.shrinkSlot(inputSlot, 1); + } else { + inventory.setInvStack(inputSlot, ItemStack.EMPTY); } } - - // MachineBaseBlockEntity + + @Override + protected boolean canSmelt() { + if (inventory.getInvStack(inputSlot).isEmpty()) { + return false; + } + ItemStack outputStack = getResultFor(inventory.getInvStack(inputSlot)); + if (outputStack.isEmpty()) + return false; + if (inventory.getInvStack(outputSlot).isEmpty()) + return true; + if (!inventory.getInvStack(outputSlot).isItemEqualIgnoreDamage(outputStack)) + return false; + int result = inventory.getInvStack(outputSlot).getCount() + outputStack.getCount(); + return result <= inventory.getStackLimit() && result <= outputStack.getMaxCount(); + } + @Override public void fromTag(CompoundTag compoundTag) { super.fromTag(compoundTag); experience = compoundTag.getFloat("Experience"); - burnTime = compoundTag.getInt("BurnTime"); - totalBurnTime = compoundTag.getInt("TotalBurnTime"); - progress = compoundTag.getInt("Progress"); } @Override public CompoundTag toTag(CompoundTag compoundTag) { super.toTag(compoundTag); compoundTag.putFloat("Experience", experience); - compoundTag.putInt("BurnTime", burnTime); - compoundTag.putInt("TotalBurnTime", totalBurnTime); - compoundTag.putInt("Progress", progress); return compoundTag; } - @Override - public void tick() { - super.tick(); - if(world.isClient){ - return; - } - boolean isBurning = isBurning(); - boolean updateInventory = false; - if (isBurning) { - --burnTime; - } - - if (burnTime <= 0 && canSmelt()) { - burnTime = totalBurnTime = (int) (AbstractFurnaceBlockEntity.createFuelTimeMap().getOrDefault(inventory.getInvStack(fuelSlot).getItem(), 0) * 1.25); - if (burnTime > 0) { - // Fuel slot - ItemStack fuelStack = inventory.getInvStack(fuelSlot); - if (fuelStack.getItem().hasRecipeRemainder()) { - inventory.setInvStack(fuelSlot, new ItemStack(fuelStack.getItem().getRecipeRemainder())); - } else if (fuelStack.getCount() > 1) { - inventory.shrinkSlot(fuelSlot, 1); - } else if (fuelStack.getCount() == 1) { - inventory.setInvStack(fuelSlot, ItemStack.EMPTY); - } - updateInventory = true; - } - } - if (isBurning() && canSmelt()) { - progress++; - if (progress >= fuelScale) { - progress = 0; - cookItems(); - updateInventory = true; - } - } else { - progress = 0; - } - if (isBurning != isBurning()) { - updateInventory = true; - updateState(); - } - if (updateInventory) { - markDirty(); - } - } - - @Override - public boolean canBeUpgraded() { - return false; - } - - // InventoryProvider - @Override - public RebornInventory getInventory() { - return this.inventory; - } - // IContainerProvider - public int getBurnTime() { - return this.burnTime; - } - - public void setBurnTime(int burnTime) { - this.burnTime = burnTime; - } - - public int getTotalBurnTime() { - return this.totalBurnTime; - } - - public void setTotalBurnTime(int totalBurnTime) { - this.totalBurnTime = totalBurnTime; - } - - public int getProgress() { - return progress; - } - - public void setProgress(int progress) { - this.progress = progress; - } - public float getExperience() { return experience; } @@ -286,7 +144,8 @@ public class IronFurnaceBlockEntity extends MachineBaseBlockEntity @Override public BuiltContainer createContainer(int syncID, final PlayerEntity player) { return new ContainerBuilder("ironfurnace").player(player.inventory).inventory().hotbar() - .addInventory().blockEntity(this).fuelSlot(2, 56, 53).slot(0, 56, 17).outputSlot(1, 116, 35) + .addInventory().blockEntity(this) + .fuelSlot(2, 56, 53).slot(0, 56, 17).outputSlot(1, 116, 35) .syncIntegerValue(this::getBurnTime, this::setBurnTime) .syncIntegerValue(this::getProgress, this::setProgress) .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime) diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index 7368f538f..f5745f871 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -58,7 +58,7 @@ public class GuiAlloyFurnace extends GuiBase { super.drawForeground(mouseX, mouseY); GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, blockEntity.getCookProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); + builder.drawProgressBar(this, blockEntity.getProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); builder.drawBurnBar(this, blockEntity.getBurnTimeRemainingScaled(100), 100, 56, 36, mouseX, mouseY, layer); } } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 0aa8556ca..7cadafff3 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -122,7 +122,7 @@ public class GuiIronFurnace extends GuiBase { super.drawForeground(mouseX, mouseY); final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawProgressBar(this, blockEntity.gaugeProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); - builder.drawBurnBar(this, blockEntity.gaugeFuelScaled(100), 100, 56, 36, mouseX, mouseY, layer); + builder.drawProgressBar(this, blockEntity.getProgressScaled(100), 100, 85, 36, mouseX, mouseY, GuiBuilder.ProgressDirection.RIGHT, layer); + builder.drawBurnBar(this, blockEntity.getBurnTimeRemainingScaled(100), 100, 56, 36, mouseX, mouseY, layer); } } diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index 286c60e8a..636764fda 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -241,10 +241,6 @@ public class TechRebornConfig { @Config(config = "items", category = "upgrades", key = "energy_storage", comment = "Energy storage behavior extra power") public static double energyStoragePower = 40_000; - - - - // Machines @Config(config = "machines", category = "grinder", key = "GrinderInput", comment = "Grinder Max Input (Value in EU)") public static int grinderMaxInput = 32; @@ -465,7 +461,12 @@ public class TechRebornConfig { @Config(config = "machines", category = "solid_canning_machine", key = "solidCanningMachineMaxInput", comment = "Solid Canning Machine Max Energy (Value in EU)") public static int solidCanningMachineMaxEnergy = 1_000; + @Config(config = "machines", category = "iron_machine", key = "fuel_scale", comment = "Multiplier for vanilla furnace item burn time") + public static double fuelScale = 1.25; + @Config(config = "machines", category = "iron_machine", key = "cooking_scale", comment = "Multiplier for vanilla furnace item cook time") + public static double cookingScale = 1.25; + // Misc @Config(config = "misc", category = "general", key = "IC2TransformersStyle", comment = "Input from dots side, output from other sides, like in IC2.") public static boolean IC2TransformersStyle = true; From adebb34a037bf9697ecec9c39e60ea2ab99fae14 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 30 Aug 2019 15:15:47 +0300 Subject: [PATCH 06/17] Charge\discharge items on server side only. Should fix #1822 --- .../blockentity/storage/EnergyStorageBlockEntity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java b/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java index 88145538b..78e6f7874 100644 --- a/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/EnergyStorageBlockEntity.java @@ -66,6 +66,9 @@ public class EnergyStorageBlockEntity extends PowerAcceptorBlockEntity @Override public void tick() { super.tick(); + if (world.isClient) { + return; + } if (!inventory.getInvStack(0).isEmpty()) { ItemStack stack = inventory.getInvStack(0); From 3f4e53e259b0e5997887e922ccc9c4c2b1967717 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 30 Aug 2019 17:53:46 +0100 Subject: [PATCH 07/17] Made the chunkloader work --- src/main/java/techreborn/TechReborn.java | 1 + .../machine/tier3/ChunkLoaderBlockEntity.java | 68 +++++++++++++++++-- .../techreborn/client/gui/GuiChunkLoader.java | 6 +- .../techreborn/config/TechRebornConfig.java | 2 +- .../packets/ServerboundPackets.java | 6 +- 5 files changed, 74 insertions(+), 9 deletions(-) diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 20b0e4f4c..feace7bde 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -44,6 +44,7 @@ import techreborn.init.*; import techreborn.packets.ClientboundPackets; import techreborn.packets.ServerboundPackets; import techreborn.utils.BehaviorDispenseScrapbox; +import reborncore.common.chunkloading.ChunkLoaderManager; import techreborn.world.WorldGenerator; public class TechReborn implements ModInitializer { diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index aaac171d1..84c4492b5 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -24,10 +24,16 @@ package techreborn.blockentity.machine.tier3; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.World; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; @@ -38,6 +44,9 @@ import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; +import reborncore.common.chunkloading.ChunkLoaderManager; + +import javax.annotation.Nullable; public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { @@ -49,7 +58,7 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements this.radius = 1; } - public void handleGuiInputFromClient(int buttonID) { + public void handleGuiInputFromClient(int buttonID, @Nullable PlayerEntity playerEntity) { radius += buttonID; if (radius > TechRebornConfig.chunkLoaderMaxRadius) { @@ -58,17 +67,65 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements if (radius <= 1) { radius = 1; } + + reload(); + + if(playerEntity != null){ + ChunkLoaderManager manager = ChunkLoaderManager.get(getWorld()); + manager.syncChunkLoaderToClient((ServerPlayerEntity) playerEntity, getPos()); + } } @Override public ItemStack getToolDrop(final PlayerEntity entityPlayer) { return TRContent.Machine.CHUNK_LOADER.getStack(); } - + + private void reload(){ + unLoadAll(); + load(); + } + + private void load(){ + ChunkLoaderManager manager = ChunkLoaderManager.get(getWorld()); + ChunkPos rootPos = getChunkPos(); + int loadRadius = radius -1; + for (int i = -loadRadius; i <= loadRadius; i++) { + for (int j = -loadRadius; j <= loadRadius; j++) { + ChunkPos loadPos = new ChunkPos(rootPos.x + i, rootPos.z + j); + + if(!manager.isChunkLoaded(getWorld(), loadPos, getPos())){ + manager.loadChunk(getWorld(), loadPos, getPos(), "todo"); + } + } + } + } + + @Override - public void tick() { - super.tick(); - // TODO: chunkload + public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) { + if(world.isClient){ + return; + } + unLoadAll(); + ChunkLoaderManager.get(world).clearClient((ServerPlayerEntity) playerEntity); + } + + @Override + public void onPlace(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { + if(world.isClient){ + return; + } + reload(); + } + + private void unLoadAll(){ + ChunkLoaderManager manager = ChunkLoaderManager.get(world); + manager.unloadChunkLoader(world, getPos()); + } + + public ChunkPos getChunkPos(){ + return new ChunkPos(getPos()); } @Override @@ -129,4 +186,5 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements return new ContainerBuilder("chunkloader").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).energySlot(0, 8, 72).syncEnergyValue().syncIntegerValue(this::getRadius, this::setRadius).addInventory().create(this, syncID); } + } diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index db0b9a68c..40c5c7bc2 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -25,8 +25,10 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; +import reborncore.client.ClientChunkManager; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; +import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; import reborncore.common.network.NetworkManager; @@ -48,6 +50,8 @@ public class GuiChunkLoader extends GuiBase { addButton(new GuiButtonUpDown(left + 64 + 12, top + 40, this, b -> onClick(1), UpDownButtonType.FORWARD)); addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); + + addButton(new GuiButtonSimple(left + 30, top + 70, 140, 20, "Toggle Loaded Chunks", b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); } @Override @@ -73,6 +77,6 @@ public class GuiChunkLoader extends GuiBase { } public void onClick(int amount){ - NetworkManager.sendToServer(ServerboundPackets.createPacketChunkloader(amount, blockEntity)); + NetworkManager.sendToServer(ServerboundPackets.createPacketChunkloader(amount, blockEntity, ClientChunkManager.hasChunksForLoader(blockEntity.getPos()))); } } diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index 636764fda..82ee85fc5 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -321,7 +321,7 @@ public class TechRebornConfig { public static int chunkLoaderMaxEnergy = 10_000; @Config(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxRadius", comment = "Chunk Loader Max Radius") - public static int chunkLoaderMaxRadius = 10; + public static int chunkLoaderMaxRadius = 5; @Config(config = "machines", category = "assembling_machine", key = "AssemblingMachineMaxInput", comment = "Assembling Machine Max Input (Value in EU)") public static int assemblingMachineMaxInput = 128; diff --git a/src/main/java/techreborn/packets/ServerboundPackets.java b/src/main/java/techreborn/packets/ServerboundPackets.java index eeed1032a..3b6a1e605 100644 --- a/src/main/java/techreborn/packets/ServerboundPackets.java +++ b/src/main/java/techreborn/packets/ServerboundPackets.java @@ -131,11 +131,12 @@ public class ServerboundPackets { registerPacketHandler(CHUNKLOADER, (extendedPacketBuffer, context) -> { BlockPos pos = extendedPacketBuffer.readBlockPos(); int buttonID = extendedPacketBuffer.readInt(); + boolean sync = extendedPacketBuffer.readBoolean(); context.getTaskQueue().execute(() -> { BlockEntity blockEntity = context.getPlayer().world.getBlockEntity(pos); if (blockEntity instanceof ChunkLoaderBlockEntity) { - ((ChunkLoaderBlockEntity) blockEntity).handleGuiInputFromClient(buttonID); + ((ChunkLoaderBlockEntity) blockEntity).handleGuiInputFromClient(buttonID, sync ? context.getPlayer() : null); } }); }); @@ -193,10 +194,11 @@ public class ServerboundPackets { }); } - public static Packet createPacketChunkloader(int buttonID, ChunkLoaderBlockEntity blockEntity) { + public static Packet createPacketChunkloader(int buttonID, ChunkLoaderBlockEntity blockEntity, boolean sync) { return NetworkManager.createServerBoundPacket(CHUNKLOADER, extendedPacketBuffer -> { extendedPacketBuffer.writeBlockPos(blockEntity.getPos()); extendedPacketBuffer.writeInt(buttonID); + extendedPacketBuffer.writeBoolean(sync); }); } From 0724c2017af5ea4b763bc249f96cfc907f0aaee6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 30 Aug 2019 18:12:17 +0100 Subject: [PATCH 08/17] Cleanup / minor improvements to the chunk loader. --- .../machine/tier3/ChunkLoaderBlockEntity.java | 43 ++++++------------- .../idsu/InterdimensionalSUBlockEntity.java | 2 +- .../techreborn/client/gui/GuiChunkLoader.java | 16 ++----- .../techreborn/config/TechRebornConfig.java | 6 --- .../techreborn/utils/StackWIPHandler.java | 1 - 5 files changed, 17 insertions(+), 51 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index 84c4492b5..8bc4b041b 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -34,11 +34,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; +import org.apache.commons.lang3.StringUtils; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; @@ -48,10 +50,11 @@ import reborncore.common.chunkloading.ChunkLoaderManager; import javax.annotation.Nullable; -public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { +public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { - public RebornInventory inventory = new RebornInventory<>(1, "ChunkLoaderBlockEntity", 64, this); + public RebornInventory inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this); private int radius; + private String ownerUdid; public ChunkLoaderBlockEntity() { super(TRBlockEntities.CHUNK_LOADER ); @@ -95,7 +98,7 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements ChunkPos loadPos = new ChunkPos(rootPos.x + i, rootPos.z + j); if(!manager.isChunkLoaded(getWorld(), loadPos, getPos())){ - manager.loadChunk(getWorld(), loadPos, getPos(), "todo"); + manager.loadChunk(getWorld(), loadPos, getPos(), ownerUdid); } } } @@ -116,6 +119,7 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements if(world.isClient){ return; } + ownerUdid = placer.getUuidAsString(); reload(); } @@ -140,39 +144,18 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements public void fromTag(CompoundTag nbttagcompound) { super.fromTag(nbttagcompound); this.radius = nbttagcompound.getInt("radius"); + this.ownerUdid = nbttagcompound.getString("ownerUdid"); + if(!StringUtils.isBlank(ownerUdid)){ + nbttagcompound.putString("ownerUdid", this.ownerUdid); + } inventory.read(nbttagcompound); } - - @Override - public double getBaseMaxPower() { - return TechRebornConfig.chunkLoaderMaxEnergy; - } - - @Override - public boolean canAcceptEnergy(final Direction direction) { - return true; - } - - @Override - public boolean canProvideEnergy(final Direction direction) { - return false; - } - - @Override - public double getBaseMaxOutput() { - return 0; - } - - @Override - public double getBaseMaxInput() { - return TechRebornConfig.chunkLoaderMaxInput; - } @Override public RebornInventory getInventory() { return this.inventory; } - + public int getRadius() { return radius; } @@ -184,7 +167,7 @@ public class ChunkLoaderBlockEntity extends PowerAcceptorBlockEntity implements @Override public BuiltContainer createContainer(int syncID, PlayerEntity player) { return new ContainerBuilder("chunkloader").player(player.inventory).inventory().hotbar().addInventory() - .blockEntity(this).energySlot(0, 8, 72).syncEnergyValue().syncIntegerValue(this::getRadius, this::setRadius).addInventory().create(this, syncID); + .blockEntity(this).syncIntegerValue(this::getRadius, this::setRadius).addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/storage/idsu/InterdimensionalSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/idsu/InterdimensionalSUBlockEntity.java index c76dfc33b..f4929ffd7 100644 --- a/src/main/java/techreborn/blockentity/storage/idsu/InterdimensionalSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/idsu/InterdimensionalSUBlockEntity.java @@ -108,7 +108,7 @@ public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity impl @Override public CompoundTag toTag(CompoundTag nbttagcompound) { super.toTag(nbttagcompound); - if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid)) { + if (ownerUdid == null || StringUtils.isEmpty(ownerUdid)) { return nbttagcompound; } nbttagcompound.putString("ownerUdid", this.ownerUdid); diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index 40c5c7bc2..8030fe4d5 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -51,31 +51,21 @@ public class GuiChunkLoader extends GuiBase { addButton(new GuiButtonUpDown(left + 64 + 24, top + 40, this, b -> onClick(-1), UpDownButtonType.REWIND)); addButton(new GuiButtonUpDown(left + 64 + 36, top + 40, this, b -> onClick(-5), UpDownButtonType.FASTREWIND)); - addButton(new GuiButtonSimple(left + 30, top + 70, 140, 20, "Toggle Loaded Chunks", b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); + addButton(new GuiButtonSimple(left + 10, top + 70, 155, 20, "Toggle Loaded Chunks", b -> ClientChunkManager.toggleLoadedChunks(blockEntity.getPos()))); } @Override protected void drawBackground(float partialTicks, int mouseX, int mouseY) { super.drawBackground(partialTicks, mouseX, mouseY); final Layer layer = Layer.BACKGROUND; - - // Battery slot - drawSlot(8, 72, layer); + if (GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE) { return; } - String text = "Raidus: " + String.valueOf(blockEntity.getRadius()); + String text = "Radius: " + blockEntity.getRadius(); drawCentredString(text, 25, 4210752, layer); } - - @Override - protected void drawForeground(final int mouseX, final int mouseY) { - super.drawForeground(mouseX, mouseY); - final GuiBase.Layer layer = GuiBase.Layer.FOREGROUND; - builder.drawMultiEnergyBar(this, 9, 19, (int) blockEntity.getEnergy(), (int) blockEntity.getMaxPower(), mouseX, mouseY, 0, layer); - } - public void onClick(int amount){ NetworkManager.sendToServer(ServerboundPackets.createPacketChunkloader(amount, blockEntity, ClientChunkManager.hasChunksForLoader(blockEntity.getPos()))); } diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index 82ee85fc5..3e4284f4c 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -313,12 +313,6 @@ public class TechRebornConfig { @Config(config = "machines", category = "rolling_machine", key = "RollingMachineMaxEnergy", comment = "Rolling Machine Max Energy (Value in EU)") public static int rollingMachineMaxEnergy = 10000; - - @Config(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxInput", comment = "Chunk Loader Max Input") - public static int chunkLoaderMaxInput = 32; - - @Config(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxEnergy", comment = "Chunk Loader Max Energy") - public static int chunkLoaderMaxEnergy = 10_000; @Config(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxRadius", comment = "Chunk Loader Max Radius") public static int chunkLoaderMaxRadius = 5; diff --git a/src/main/java/techreborn/utils/StackWIPHandler.java b/src/main/java/techreborn/utils/StackWIPHandler.java index 83fd747b6..ab7af33ca 100644 --- a/src/main/java/techreborn/utils/StackWIPHandler.java +++ b/src/main/java/techreborn/utils/StackWIPHandler.java @@ -46,7 +46,6 @@ public class StackWIPHandler { public static void setup() { wipBlocks.add(TRContent.Machine.MAGIC_ENERGY_ABSORBER.block); - wipBlocks.add(TRContent.Machine.CHUNK_LOADER.block); wipBlocks.add(TRContent.Machine.MAGIC_ENERGY_CONVERTER.block); addHead("modmuss50"); From ea23ef7038b8df7b80f07db7ff2e7fc0c27cfeb3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 30 Aug 2019 19:26:37 +0100 Subject: [PATCH 09/17] cleaup method name --- .../blockentity/machine/tier3/ChunkLoaderBlockEntity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index 8bc4b041b..a3f368544 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -32,7 +32,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.apache.commons.lang3.StringUtils; import reborncore.api.IToolDrop; @@ -41,7 +40,6 @@ import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; -import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; @@ -85,7 +83,7 @@ public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IT } private void reload(){ - unLoadAll(); + unloadAll(); load(); } @@ -110,7 +108,7 @@ public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IT if(world.isClient){ return; } - unLoadAll(); + unloadAll(); ChunkLoaderManager.get(world).clearClient((ServerPlayerEntity) playerEntity); } @@ -123,7 +121,7 @@ public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IT reload(); } - private void unLoadAll(){ + private void unloadAll(){ ChunkLoaderManager manager = ChunkLoaderManager.get(world); manager.unloadChunkLoader(world, getPos()); } From aab010af3ce7a24ddb95ce9c2dfb2813e3b34475 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 2 Sep 2019 16:23:03 +0300 Subject: [PATCH 10/17] Updated textures for rubber planks, door, trapdoor --- src/main/java/techreborn/TechReborn.java | 1 - .../models/block/rubber/rubber_door_bottom.json | 4 ++-- .../block/rubber/rubber_door_bottom_hinge.json | 4 ++-- .../models/block/rubber/rubber_door_top.json | 4 ++-- .../block/rubber/rubber_door_top_hinge.json | 4 ++-- .../block/rubber/rubber_trapdoor_bottom.json | 2 +- .../block/rubber/rubber_trapdoor_open.json | 2 +- .../block/rubber/rubber_trapdoor_top.json | 2 +- .../textures/block/rubber_door_bottom.png | Bin 0 -> 455 bytes .../textures/block/rubber_door_top.png | Bin 0 -> 449 bytes .../techreborn/textures/block/rubber_planks.png | Bin 645 -> 446 bytes .../textures/block/rubber_trapdoor.png | Bin 0 -> 418 bytes 12 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/block/rubber_door_bottom.png create mode 100644 src/main/resources/assets/techreborn/textures/block/rubber_door_top.png create mode 100644 src/main/resources/assets/techreborn/textures/block/rubber_trapdoor.png diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index feace7bde..20b0e4f4c 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -44,7 +44,6 @@ import techreborn.init.*; import techreborn.packets.ClientboundPackets; import techreborn.packets.ServerboundPackets; import techreborn.utils.BehaviorDispenseScrapbox; -import reborncore.common.chunkloading.ChunkLoaderManager; import techreborn.world.WorldGenerator; public class TechReborn implements ModInitializer { diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom.json index fd1870dac..8b3a8d955 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/door_bottom", "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks" + "bottom": "techreborn:block/rubber_door_bottom", + "top": "techreborn:block/rubber_door_top" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom_hinge.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom_hinge.json index addff102a..8fc87a6d3 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom_hinge.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_bottom_hinge.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/door_bottom_rh", "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks" + "bottom": "techreborn:block/rubber_door_bottom", + "top": "techreborn:block/rubber_door_top" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top.json index ab93213fa..fec0579e5 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/door_top", "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks" + "bottom": "techreborn:block/rubber_door_bottom", + "top": "techreborn:block/rubber_door_top" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top_hinge.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top_hinge.json index fd4930deb..02925fd70 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top_hinge.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_door_top_hinge.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/door_top_rh", "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks" + "bottom": "techreborn:block/rubber_door_bottom", + "top": "techreborn:block/rubber_door_top" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_bottom.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_bottom.json index be180bb6c..3f428463f 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_bottom.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "techreborn:block/rubber_planks" + "texture": "techreborn:block/rubber_trapdoor" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_open.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_open.json index ad212118b..79c641fda 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_open.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "techreborn:block/rubber_planks" + "texture": "techreborn:block/rubber_trapdoor" } } diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_top.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_top.json index 28d10997b..5ece6409c 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_top.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "techreborn:block/rubber_planks" + "texture": "techreborn:block/rubber_trapdoor" } } diff --git a/src/main/resources/assets/techreborn/textures/block/rubber_door_bottom.png b/src/main/resources/assets/techreborn/textures/block/rubber_door_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2b494c9603b8d19034124c96e461cde1a1e0fce9 GIT binary patch literal 455 zcmV;&0XY7NP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bEH$K~y+TZIjDN z!$1^h{(^(B5wUcXzGMH2+n_Iov@% ziMvsx153a{m`l7ArAh4uyY41~LYBa0`!SLvG;*dB>>5jBNcv=}XBE_*P;jVMa&-hv znijf{QQd?(RTYfdeMZd(Y?nI$s*3aTtg?=HWYYU6yX+nXM$T*;G=}Wj6?(clImn#P z^W2OChwaKKbk;q@pAU=1&}P=g(W$babs<07%Hc5WG83qGAaLf7gO3)8AJ}Jnn>Q8L xkq*gXks3)vSCi55Zd$b0)hh&oLjKyE`v%m22PqRO!!!T@002ovPDHLkV1mCs$n*dJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/block/rubber_door_top.png b/src/main/resources/assets/techreborn/textures/block/rubber_door_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e8aa34f6f942695a9f8731560e797d0019783336 GIT binary patch literal 449 zcmV;y0Y3hTP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ai&wK~y+TZIVk) z!$1&3J0oK9AtHc;f&?4^v0(w1;Rc+QwFL_#7A(NTg4l_J0KbmQOhVpf?EX|&kKMVu zz4@`4ey_{XQqGrtZpJ~m_q;S0czDX}Xx#T8yiH3R4R zSV1e{079Ck|Lg;kWS6EvKUrHr!r|h)__N>Gqj-~eEo!-Fa2eT>6N-sRSkpL(0V`yA zVS#TNCt5LLjfhromrY*yXH-HWF|jM%fjg@QoKD6o2TI5;(-0&^j+pS~x{f>WAE}8u zva1V=9r+5i5Y344Nx=o;31V$(w72Yo|B3A#G}eTgwh5^o{0?AS0}v+`{|7OlGrsZ% rHPR688*^}WZLf=o-9N5|WqD!0;g8)%Y*DyR?zJ%1a45E43aCvu3u=VXEt!AO>O$Ih-j>m(0%XMeQ?l*^SB`KaCf0{-!N zZijmltEx}SvNg|3F3xB5q*%9XlsYMp1jN0UmHUk%bFX;1vzd1!NwRA7<(v}9nU^2E zgE6mQv20Es=gmRvU*8tK-ky%#vu7Q7);$fLUP{~FE!thvw{D~&RZ8#5O>QoaYx*aF z5~T--nt-7$?0?fPx%J$l{z$;0E|{->c-P=)cHk|jS9FLP2#SN4liXgN_yJqf+=KrC zJ-C?)H79V%{q?CI;N`YY2c(NUK%+QFAdUS2K8U)A=Vk=v_NY%!gTLkgD5iOdF`ol^ z0aOy_KyOVv{vYtt!sh^TST0bn_#rwC{N3A+5h;EQCn$Yn9uqGO^v3Ef>H(w)eC*%M Z>>F%-4Xik|?L}000McNliru z-~<*GG&VFJ7*qfN0whU9K~yNuEs@KP97PmF<32JgtGaspkOvzf0Rm|(kg;SI2>ygG z;9J?U1|bk$u<*D|Pghk|X5PFk+CLC+;spKj^ABbgLNK%L2!BG=T$tu5zW=a3dols| z^|!Y#zq-9F<+JBUUeP@4snZLdR+yfeDBc|VK+0Dk}#Zq@-TTLti_4>xmi_fos2L8qhu&X@ej(Fr(B?-`zc*#t0yn_V}2Z_11bW zZA`(t=hEDrh=K|LCg@M!e^E-a?nER^?%w@61VKqeet-Y#{+q9FYcl|swP@a(FvUP1 zhIfDjD7B9%Fd+nScU4YPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0XIoRK~y+Tg_BE5 z13?gkJAac){;}9&r^sJu#-UFZ{WLRyZC&}vw&**|E`8Ye;C?*!cOR M07*qoM6N<$f=U*%?EnA( literal 0 HcmV?d00001 From 8cff7c16445dafa6b3d71cdad5f88d527267c082 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 3 Sep 2019 20:09:34 +0300 Subject: [PATCH 11/17] New textures for storage blocks --- src/main/java/techreborn/init/TRContent.java | 2 +- .../block/storage/aluminum_storage_block.png | Bin 605 -> 430 bytes .../block/storage/brass_storage_block.png | Bin 760 -> 441 bytes .../block/storage/bronze_storage_block.png | Bin 710 -> 448 bytes .../block/storage/chrome_storage_block.png | Bin 607 -> 439 bytes .../block/storage/copper_storage_block.png | Bin 704 -> 449 bytes .../block/storage/electrum_storage_block.png | Bin 716 -> 445 bytes .../block/storage/invar_storage_block.png | Bin 684 -> 441 bytes ...iridium_reinforced_stone_storage_block.png | Bin 732 -> 658 bytes ...reinforced_tungstensteel_storage_block.png | Bin 669 -> 556 bytes ...forced_tungstensteel_storage_block_ctm.png | Bin 1494 -> 1227 bytes .../block/storage/iridium_storage_block.png | Bin 607 -> 443 bytes ...dum_reinforced_stone_storage_block_ctm.png | Bin 1437 -> 1700 bytes .../block/storage/lead_storage_block.png | Bin 685 -> 436 bytes .../block/storage/nickel_storage_block.png | Bin 678 -> 442 bytes .../block/storage/osmium_storage_block.png | Bin 708 -> 0 bytes .../block/storage/peridot_storage_block.png | Bin 910 -> 429 bytes .../block/storage/platinum_storage_block.png | Bin 718 -> 444 bytes .../storage/red_garnet_storage_block.png | Bin 790 -> 430 bytes .../storage/refined_iron_storage_block.png | Bin 612 -> 443 bytes .../block/storage/ruby_storage_block.png | Bin 895 -> 436 bytes .../block/storage/sapphire_storage_block.png | Bin 903 -> 433 bytes .../block/storage/silver_storage_block.png | Bin 607 -> 436 bytes .../block/storage/steel_storage_block.png | Bin 596 -> 415 bytes .../block/storage/tin_storage_block.png | Bin 483 -> 413 bytes .../block/storage/titanium_storage_block.png | Bin 607 -> 432 bytes .../block/storage/tungsten_storage_block.png | Bin 682 -> 438 bytes .../storage/tungstensteel_storage_block.png | Bin 696 -> 438 bytes .../storage/yellow_garnet_storage_block.png | Bin 801 -> 441 bytes .../block/storage/zinc_storage_block.png | Bin 606 -> 436 bytes .../blocks/osmium_storage_block.json | 19 ------------------ 31 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/block/storage/osmium_storage_block.png delete mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/osmium_storage_block.json diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index af5044aba..45d5c1877 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -332,7 +332,7 @@ public class TRContent { public enum StorageBlocks implements ItemConvertible { ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE, - IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY, + IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY, SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC; public final String name; diff --git a/src/main/resources/assets/techreborn/textures/block/storage/aluminum_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/aluminum_storage_block.png index 95a1b466c6eaefbbc9e339f03ecdb2f75184f846..640a857fc32671332c0cf274044ea2e8798802d7 100644 GIT binary patch delta 404 zcmV;F0c-x<1g-;+B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPLrFwIR5(v{lQC<;P!xrq!7WHZA}AdcGCS!Y2>qdUR_JO+p_@)R zISV?7fVIz7~t( y)r2q-NDhogcu*OQ$M!puFp}0%So3q|egFgC30Yjo-woyf0000#rpM delta 561 zcmV-10?z%e1Kk9WBo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;E1Pczr6IK8K z0qRLaK~y-)b(76%95E1tKmE>l@+1bwnBYSWdF)($$tB?6kbvWhpCK4~X0dr9N1SsVJcPgy0%MHC7#W6v=sm_5emp!NA^=AM z=NuoeuDa|oMvO5SV*nUqWEw}NX<{vfPuJI7sRyvul0~rA;;qGdkF^$6#ac@#1%TEX z@6OIBrC_b4wf1VkT6-Ld_YA{;sv;t&Dr+h1fA)I-LI`ZCRTaNY*;|V_`A;dKs+3xJ zSr%f90DS`?1YVZqbqlRET5AA^2#1`hwc?z^7(*$A)>`i>C%dO(F~+c#f-wf~J>Gk2 ztsVHbfvWaA)LQW(LQ1K7+bYIL&bdnuA@q9|>4bJ0+`qv|DKSkGF~+_L=Nux^6ANHB zf7VSwDWwM|rNkIx2h>`7v!~~0a?bb|BO-z^hG7^w^SZ9bKaexyI5N*O`P6+QY^`C} zb>)yVUv6)i=b6?TDJ8u3tfi1r;`h_jU*NBIcZ3j*IViPajN!w@1pqJ0g7=Xf_qqjYbZ5>V;ZLEHpECtVdkh?ApG`~ZTJ z_z~P(I*DD~?Bpg6Zbg(pYxjbG_#HeUFQz|8@4Gkmyxez^Hh*r<*MCBZe6~=`I!#4z z&G;U5ZLqU{9NN7D6+b5riq#zQ=X=G?!%M}RtJAQ`g65aenTlzv6}r2FLWpQG{f;I} z#~12>M8AJj#b57_ihz)7yWdgno`juA5U;H5MdImvuBSsUO$sq}Q%r!^)QPjLBlWm` zHynnyd=V1HvVUQKm_{Z-Xfag%fXD-jJpr&0xy8n>vhZM;7|6W_#7wr4HUCerOiV-s zHWO6w2V!yAFpCWz9dI0(=%g$LpZV!^rkpkR%2PsgggUpmSTnZ8xjX;> delta 717 zcmV;;0y6!%1Na4yBo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;E2L~)!488yW z0)0}q-qaX!<^N*XWpgK<3{*la!D|NI|{1Av!*{(`s- zRRTE~uHS$S_`5Co&Ij0bkM8yq+wkKbNAfj;f_7H0F7WA>O54|LltwSpYldhzL1Pq$I?#;{6j^e1oVb7tk>} zTx+O7iGtTH{VotoW*kSVEL^XV@iapL*WIH!;KCLFrQRSygWaw}UFJG2O!Gp{nb)sg zlk)^xvAzcf;_sQ#5dg!%npf~WCKW?C&|CURY9tx+^l^Fr4*QfpW$LL3i>J>irxsz%esX18OV9|6M{ zkj}GCk2Ec?j^wIPz^YUfqxstpIEd#1fr1eCLg=y*; z?)FTFzlkmp&l72$>3zLryqtw)zVgFQzi~ajf;^F?w@{U|jHJt3F8{uyx`i^2q&V~9 z_rDPJH-cEfyT;d_Kc$q!dOl!b;Njtc-a|}BQeEL3C~ZbkO$r5Q7G6M8U=sB0hkX#77W2OTo9$ z#zwHVv+xN_CD>ain8w0Rh#>~lLe#>a@90@}#?1$tJNNEAvwvsrY$|)3D_@~NxBsj- zU7b(_*NpE`A7ZiAmXG=q|Ej0MbqVmMmX@wvj#;e*gz`Nliru-~<;EF#^>uX+!`3 z0#ivuK~y-)Et5HpBvlke&wGD}%q$S7g^e&kI2cGR;emn4GI~So2B#%(aB(T44X^;w zDu&7-BL05^MzVpct8?y^Z(n_xwI~hemWo6&L$HA3B1{v=V2@-NC=kH(!~&{_@cE}7 z5fKy>e=?Ip2aAemlAdh)z&secvDD=GwsCBQ*FQg@D5NBhZ+@Y*hSY*(r_=`ZKsz2; z9v(O>opx+cJ3qephp`(7XeDU1@Wso|FrcNwR2iJ@17QJ)A;7)hnU|R zR{&LI?1rjRi_&W0&1~=-k4*jf0RNb=x{~Sks?GWtu=b@j0m=MknF7M zMl(0iw-P-?peM1qiX;B>5rJGX5x#=vdz`=3{4I6~5T0fp8V*0BOmQP>QYMZg>< z82iQ^$)PE&2|oR<%msI0k3=X4a@SZTFf$&O1t}G`WNtf>P6T))k&u~$fX$$l#KWm$ zf5K%Q^a^K-I~;;{j>=^-iV9s7RpquDDT$fk2qb7`Qh}@j01E4E=lL>t|8!s}1w@&d z^s3;2MW1>r`oiW2;FxiHMARl&?C#aL=% z28cK}bJCo36y7^E-u``NC9!=lw@FRze;QXy&b#y7Prvf?@0D=lwr-S6wqe|^8-F}K z69hhY=A3;0_}hJ@;Z#eg3SWKv0TIFZe519-^L3+Xa$N;WLnut2V8Pd)yx_d6zp zVmm^zg>FeGNM;Z<`3`3?Z_Iwl?0xsnJ#X$iGut{J9DRohU-`S@Y}Qr;*NpE`pJB1J z+Yj?;s^UjcDAs>-7+;SRdpmu_ll{Zr4QL*no~gLhSq+`_ZYf0cnHSMyll!rHAkpt1 zb#eamtOy9X);2ekyC-3162#fcawLA4JnHE%m!+kcx+y0>Y?{Q~?VfsEzZe{c;_Wpg zjAg?BF^x=w&|;|j0g(q5djeo1a*K^$W$D2*F_3!=h?#gSU0D1-!89=u5!g)72L3=S zt{P^s;iChNBNLre#o#kP+}3t}0000TzIgEP)uYF6pFVqj|H0$icOG88_UP8_+h;E%J-Bpr+l=||pTGF?_a!f-12wt4EDv&*I}wof$#I*2jJ+ucQ5W#Z4T^Is*#oPQK>dRs25UM)&oY_o7wr?-re?-0|f2 z=Z&j=JYTgZYi)kzNdd!Ym!q}<{i9mq8c~vxSdwa$T$Bo=7>o=IEp!dcb&V_nLJTde vjLof#%(V>+tPBi9XLrv*(UF^NNK5W;8XYr zHoic70kyEOu@wu!#>zr8s427w{-6jp%6IUrJLBfS=FYu)zkivtcQ=*2jpgr9&~5Ks zajrU|h+MOLkGeKkYPP~?t)b#u_gXQ{QRnmRok@VlW*QOPdwkOAXkutEhpAh+17NER zuCJ`A$MyZgqknMs@)0s@d0+^bMjQbeM(I3IGy}tSfY^xKu;o{o&!8WS$h}6uIGY_G z{_mh4Oaww6CejA}KnxcLX4vARLp+X#=%ffEKl4rJK{;#g6#5bO&0 RZC(HX002ovPDHLkV1mh@y@vn* delta 660 zcmV;F0&D%j1Hc84Bo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;EFB5Ctc4+_r z0!>LoK~y-)Et5NrBt;YeP@YjK-(kig*v7&yBE96%Z^ zpPugOs?7JnXpRsO3i)4Ae+?`vqDgwP9|QAX3}Y$D`L=Vah40?JLs3Xcetz={tu>?-Ogg1DXe;gE#Pae5 z>(Xhb2CehsZ~rh30|BiBtrkB2>=h~_i`#wkxZnw$h zIv}98PEn!MMgSUskaXZ-t%y0>F&M|d=j4y4D>EG-X}v&!))#K$20%q&cUY=`IZiNc zJ4YsKRaz5#_&u2m?!rML6eQ)Iu@ZN_z96OImdx!y!ifaWB!J8$6l?~qB%V$k2A6%% ze=9s&+~p9wT$RgV6cxHCs>(Kul*G(%1OhZOsR`Kx02FT9!TCD)U|m_XfGU%u7X=SI z67fVcP)qJsqaZ~%#$;JfJoL(CAFS)jG$$+wH+oStgTF2ph8wjCm>H!QOKHpi!P(qN zb8e&X{@Qr@_n8}s9fNsHYTlpFn};0X}C!xG+s zS0M8Uu&7A{7z|>H2{O5bP%#KWAb{_Ozv(UAmvrZz)AQe+`+v76zZ=l}aC@a+rqdYXPl zlVziUdLYs7A64<|^idHIa&x|4 zasA?Q5GMIYNPig1h5=$4nFyi9Q1t^M4=nZsz((X28^6lJgLz^g_Zkp0S(YySpJ1Mt zhzM*ZXaj#B7MBgP*znN-$B~IeQWAsDd^dbi&YFAWDIq#So!eZj8QWs=$OD=fm4@o8 zvSA1<279CpXu7@`Yuq|9Q1_FWMjrim&^SHW(%+ecksQ1>)mof~@C_wq4jg`cXo3I$ N002ovPDHLkV1jTawb1|o delta 673 zcmV;S0$%;S1Iz`GBo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;EHw_cY(^CKd z0$E8!K~y-)Ez-Y=G({9Z@pErgb@%M9C}J$;3W}ha3WmOrkKx;x2pVW$pco1!8hr}O z%E!!XPgm9bW3ax$IY0U4>(82%OFsn#O(vqVO%!6?l>zbUe2dB00-Oo=b3aQEOfBZ>n4XFk5g;E;mMmwEY z@9x>wg?4J73qSq#nsFE?Xw{(A!l$2nfF;zr(AJfdf~t}!EOp`TwD88m%HEByzIYe& zpr}v*RF%;URi##?wZhg4As{Jubj%7ijQh1Qe`lwZLL}%Iir`2Q!j;w<%d#*cIBtW~ z&TXGuuLB&GWud50N+SX^5=4?k;qJa7?(Db07z4M-->;sT;Rs1v3lwO}%5B^Ls3;r* z)>U9SF2U#r-I8rp+A8>T%%Pg#CUj3E3xd3CtQwdZ_v?z(iqB+@j^IRqdlCtmNeI{o ze_BgCoH_Bxq(*fouW*3b*IZ`8;^* zVPh=?P-Y}cQ}Dnekw{bmHHT7!5(TM3?~`>qako{j`(Qh5Omo75aARqTO7QRb%9uv2 z1c=Mt0_;le$e`0+w`=r8)gIiB7yYuajfARGCnQ&vj9TbwI z8~gLYKaXdEz^yaqBRDA1MLKkFsf$A?p%f8k<@@yyxiS49J@=fP|K{93X@BGV^5Q#``1tx%+}_+$ z1lNr3QQu&ZWm)KUcU7Ft-W01jyi6vFgVPhm;q}$;1~lK?jZ{qA?QnE>PzVt%^E{gD z;qgg5km&c1s`!0AR|JGyd%d1=_ay90f_SIXiNyJ0p{GMDO$#w~Q%r!^)QR`|ef7A0 zdp`=RbqVmMmX@wvj#;e*gz`Nliru-~<;EI0_0jT0Z~) z0y#-UK~y-)O_NP-97haBAIa)J*@=-`MApvMr3_@3QzltON;a7*7*IwdPj^=p$t-#T zm>Z%1l0`m#lrO*jl0^+wqxK2_J?R9483be|H9FB9F(o~S?nDGd5+3e9(jzFU1cBKA zBp?K^fA1Sn8_kcH%jLqfEd2HKCkhYpVU_(tAf$DF9|hYa3>UnNfIhIE1tBJMMv*BBpq2^l%oN z36iKC)q|0W2x&sC6^dcQKq*S?m3B*P-pS?!5aDQ5&wtJdb!gx;TCc)^X(h-NMVu8TX*I zN^2F7<3_aC#=7tP@!Rj5UtZ~PFrg^5W_Q-h8(+V^e3#sKdU{4th@?aWW`+BQ2ZCg~ zyiv-)x7RbO%D%4ja8!lXIxfNe{m)#tl^_ot{QdllmK(@OP$BvOs&_|3$ULA0Nv%7# aC;tI-U3QT$#npHK0000R5(v%Qo(K#Q4~F$8Hkhs355}e0h_opsgV>S77d0p?sZ{| z3x7iQrtuHdO?NKb`VWms6B0-ST>vquprLgr1wjHhz{t7nBY$l@$;^HCy!-Aw@7}j^ z|KYZSbLey|v1@ClSVD0MYLC1mc>MGUBG=^8VwW*1+j#RC3G_ud9}Lgl_o7_hi0pZkv+lR zxr6SX0dgE&!%^oKj(aBm!+k|K zS{|fg^3_@uD>pZ9Icm0QG-}SO+XN30^!aM}@ZRmbK25+4HiTnQYlX|)MIZPF0?{Q> TjuX1^00000NkvXXu0mjfSZ5cb delta 689 zcmV;i0#5ys1>6OYBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru;0g^1G%gBfwCMl< z0%=J^K~y-)O_M!OV^XDOO-Q zN@KCtYx~;9=bV`>t`~C3k&fh_ss+R z^y3c9r9|+KcC{viz}>%}JAoKHISX}N5knxvh;t6_ z9npKd_iSEY->CX~HLLZeBQVBLRgvMak1>WAV<+N0*4o`zP}eoiIhxs5VvL9g)__-_ zh!A`r1kZNGV~h?REsvt0JWoM3l$JM?wh1 z7^&-;&u@IfFHw&8RAv&g-UW zf3Vgvold#Ax#8mCg86*T-Q69V%?1$x6^t>6f)#~Ql;9oKTH3Z{I-N3`%@~izhzM6# zS6p9TcR^BRn{wCm`v|>W>_QR(ZQJs?^ZeoAf#Gn-U@+kP{G5KjPs)W-%3CJ9HS7w3 zloI><``q5%G8&CIJUry->4~bUczJnYe=?a6ykiY~Y38VEM<60#EbVH|$6tRV#)zuW zwrfNMgCXa{Hf83E}SuU3h1_RpF8WBNNS+=WA9K|_DDINZoW=;(Loxpof zN(r>H2$YmEIcG}g#GEUnl*m~a4r&(5_4^L~`R_B%c7alb@AoaL=-aWg!&XGz7mMEj Xi)lg8Nq`su00000NkvXXu0mjfRCz|4 diff --git a/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png index f2587229bc79875c7b3d6b17a0badca27dcd14dd..57fc9b7899aaf104aa6b3f89fdc301a7393cb31d 100644 GIT binary patch delta 531 zcmV+u0_^>r1*`;+B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP!AV3xR5(v{lg~;*Q4q#IuT~OD_=lTHYC@PG8bXUoY7@~u7ZELb ziP}f>2Gyori?+Rk1T6$9Fv2KEq%uN_pb#>tzNxXB(Qh+n=6}x2ne&}7=3OtC~`ihg5U8swH15g3k0@UBu7+wGI1{Gr%|m1VITt7~v@!Q_LzeF=`lVz|7z z0`lSto!Ix9x!Ob;D7D*LoR&_|dU*Pd06pG;UoqxPXS1Ej>@JUceKejxpJB)GNfFbt zImD6~IK2Vb`hPumdu_w8JK+h(5lxKYrdo!h*NO0O6vaXThP3&_j12wkQmdg}ujBdg zOFWmyL@Jd+Fc=h{Q|xYUNxnfvRWQP0Ci?w;Db!+8DwX60thdscKw+^?K-h>ri*+KR zS81>t1-Y+Yi(uWwgubqs&*ESxB>8_P_^+6j$0580MSmLT15puGFl%u)6jDS~M<0q+ zFrK+`aV9?3`b~3*Ejd2+u4iH+RaiwLR@F6^@PXOQP++~;e8JSjBwFn@%)x-HqmhXC znRHqn4r8=#w_7%1ynJ5%nLyPg)+uy177_aVANcTgHa5Q+@B;R|DQW658wZ{Krni44`RF&`!fX8@d0AIfOf``MN z)*Q1$f6kfSgZ;E)ns!740n}Q_rkpP`IcI+U_0te2*=Wt#?{}1($)%vGm?^~!Gh{YiN-4NINx%Z=?qtj4Y<&IA zw}@plIpKi-%>|;BI z7^+HJ8}2^J=T2=MRT&;6frtPZwI*e3XDrVPu8#ZIk%EXALg9$WNWlYo53(sKCHl6~ zf7Zq{O*eEi8~5Ib2(~)TyNOd7O_DPJ^E~6?y#D+(wN~7nwl>rfwRL*$x1O*hTm!>h z@0~yY_>B<9TTn`2T~>nN`20vVWd??^BM`tmAf?3VbmDM0aK6mLv^p=mT!1pGJO9zooOohx?Weh>Z&f5%&uw&OE#00000 LNkvXXu0mjfRdz4; diff --git a/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block_ctm.png b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block_ctm.png index 915134e43fd967e8ba5e066e4a95c703d4888e8e..81b7f3771431c20dcbacfbf3d419e5026ab9871c 100644 GIT binary patch delta 1203 zcmV;k1WfzZ3(EF@hq3;O~Ws zQrFULyAU^_8yBub-H400a3!etAH>kEgoZ|=5HZ8lX3988TWvy`)*1Ub?e}r=oHvT& z7bf?-`_A{CbI*T0=iHav3n$+0v|25@ex+$UcUNqDeB8kN{CqOUIQr0-&!=@4=4S2j z@oS3P|oa@iV<#uhSQL{GXv zx&Y(*M)$kS`z-$Y^>u$n7Y@jy7oTEQpH=+BHb?*Z;Wc^3O|4cDYt}InN(<(#<&Y7zHdGBPIQn zm8LKD;DH1FPUyxjS4UhQ-E%XuKA*?4e`B0*qN90a&RXD1Z?0Z*Ig7985CNP(-;V%g z0Wyo@6a;^fK};^mLqnD1Jb|3+#&2G%xjx2m0(cb&GOir}7UDUb*-?&QE{h*?ps~E{ zvgZJcWf=!NO9tpGACv>s_28ae{;n4veT-K}MqEEBLzH?MXJmKLcyvl3Rjqg97w;|k z9F0rJQ?F48#Dt6U0DTbW$Y>=M=*1U^f+r!nP8)v*I&-Q7AoEU9iX0YG1S$`V`q+)H zchUu(gi=ZyC*(2gGR`xj^f^x=z?p(9KBKTD2T)>17>H!%Bm)@-(g(4uD77rU@`H%M z0o$aga00yL3?rg(C80RFSkBMPnC;k`$)^kp+l$HV={bP$2%bgO4zrAlO9{$};?81E zJ|KTuaKOOuzTHzBYpa&;Z20d|{U@t0{b*~yuNd?EuC(gbZg2Q+^|y1@xv z`I`N5;Rjn?TeHF9kPQzH`%yM8)$CR$=f-h-bMwv`$Bs_86DzkPlKWu#(+-}fo$8iK zKLcGLFTeGMk6gi=CA&xe%&F71ZLs8L9?ySXAU~=jB|G`fX}^+jBKPi@sm`O5$CCRz zCX^88y2%>9pPzFF)GL6Jng}eM|IQtt0@%dI@4auigGUZ|1V{*#ks1m}&-Hpn)+ZT= zWeZx3Wh<47E{mT#H1R}-@*sI)$RIJV3xqa`4v6~Fi~QKIWL&x+>bnE!vgt-nHz|L@ z9K-ux`2$Cve0BWJban$;D#Pn@vCbzP|_h<$Dz%P#QpYHeD;0AoA$gVc&tuNF#`R9MG8q&Kg-` zfXyW`f)t6TVf7wBe+Ef&N!8(T2< zxvo^Wde1+bn>PwclOg;Vl}sxxY~Qp;#t*wb{3HT#H!%wIZGcgrub;H>*|TTu^5UX( zZhsGqJ$A%%08kZxGp{Yoc`JVL`Ii#@|8f_wBaps~qH&HvcYz}C#q_lO1#}aBsGX*P RKLG#$002ovPDHLkV1jq4QaS(t delta 1467 zcmV;s1w{JG3Dygc8Gi!+002a!ipBr{00d`2O+f$vv5yP zfP?@5`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u0q;;uR7GNJc4l*WXm^5PZgpdA zcUfa?S7d8nY;#;@a9Cw*WOIH|US*@FuEod8$jZ*q)73aaOMhy4glKhqWpa5kJVo8# z;oaWf)796ftFUQveQkV)U1xDxWNuq!Z(wb7zrx4N&d@MBLu-14Hb6pV`@`iXG>LIBriESLrkQouguQT+1uRO+}$cQKWB7%FgZe|s<3l_hjM?0qo}XR z%+KE6;p61xD1S0MD>gvlDJiVFF8UiHbKtN)GjzeF+4@( z=I3N^dO1Q%BQH2uWNcz?cxZNkV{mt4aCj*+JzZ&WV{m$Dc!Oqid?_&=}v8t}LsjRU#L4Qfe%g)!>+uz{g*xKASKS+9_A@9*yK@9yvL=;`V&I6@>aI4w6p zB``WBFgq?eLNPl-BQ7{EIzlZrJ}NUjK1fe6Iz%EYHZ3+lCNMcbNl!34L@+u+Izvk} zK1eDyK2RkuI4U$eGdx8oF*`6jLM}K#?e6a4M5I~1dbyE47k>Z;bV*G`2jT}D5+xf# zgGvhk00PfRL_t(I%SDojU(#?G#$OzBkjR9&A#4m>?AKvp8fGeFA%d6(=7m?9kwtcy zR%(=IS=nXxY1cp6JAVQ2***{N_IaNl-{%1^l`v+u)WmQW&UygKY~^;of?*s^hfpa> zt|}1R9*}{vxPKMJYjLWq&F8mQo6VY2^Bj}{Isw6RNRS!pVMaJoc9c_9V?zxKCU6`& zh8qarR&;T?-6d4j2J4R3mx97IXeV@$4*_mPm&TKg4yu|?HMg{ySlKMN!x7090^Eu& znp+d7YT{3~ongFQS<%i$rFH_GS#@ZR20>w{BD@}naep!^GeSo+5+~pV&gsP0WSJ@w zkXjNJ)#~NA&ZKb$E65Jbq{v>Dst_+G!<^CuX7yZ)6d<4~EMo>>y)soK9*K7M^!BCt z)yjy@6F`1NlBh_#6g@vMIOH5ojfiP{0r?e4q6)dBNb4w)92-wW(!M4@enpa~@C^C{ zC0Uc^eSfupTZ<&og}8Wel9EjDzH%Gj)*?xCA$maSpd@2N0{6)N6tyWgX6UER?hm{AphmTg* z*48&Rw;oSCS>4=z`mB|9vi|wR&I>61h17Un$+VMhV*-UT^be2aYXOv`$CyB&45?x* zfLaK~1oCC*>KiK5B5z?#piqY1!9p$a7RCe$W#}0g&DVmXVKo{P$i3WoHS&6G`_0yR zZhv)mcO_S`@%9}JEB8Je{s0D><)x3G7TP2o^Z#rQesO)JVb$z|;_)snCck}88_&yq zKlZZHBn>OEkJ`v5`!l=uE6!tTK0iOFi@#}DF%h3ZD3r$Ni`IgHph1Fxbb>Zk35k{1YazkHpNK!;FKA_F zVXNXFXh=T5T8IRR5{O`Jp`43%*%^}yn>X+6JCnC}c1xXu{hv_KY&KOamn(|MHOu#? zYlEZiaah}|srY~KI#x_`G<@tU9-f{kp7+ke5(}DduWwXr)azlp)67Aj_sJxh?D=V^ z9+c_#PboYdzbPU>u6C=X+&vjPlK@w08xj068tLEBdbOIv)UA91U~3-S+-s}H^{dN^ z@csD}GRCrD2$)7D0yKVNZbAh}^K{qs%>61S5QMuMselEw8TppI{M81VT0w zX#>9?hKq(7ws`3fk0TSE6k+6N?hgjaS#z&AC5j$lp4(ik8QU;<$0*6xlzXA(y8+DdD29>OnspazVI2Yw^~0000eM z-L!P&`sXiRK7R7_=`$ex>e1sTcke&EaqG_Ad-pG0xt4VO=Iw>c*1mfE=H2@bKydl$ z^*3+dUA%nt%awf?KeeK4ra~G~WeDrw1(luAE-PnKV_^kQMX3bkN zW6q+Z$4{R*cj3gTbMqIkJiBa~fAlYLpo18byxm>2Rdzn%m}nd>Fdh=h+RfV zRobc9iyNrou&0Y-h{R>xzS~8I40v2ZorF$LDv-H-L``?fk{PG}*DG*c{=6-H%PiI( zw-`;TGiGhe-o20AAVWt}hu!>#;DL8cfjymTPE>?Ab}ri@c+&ft7l-21V9T>7H(1xb zJ}Pp`-%~Xr`A%g^+ohOi^%665B=@Z_FnsCk6rx(W`a+DF+p~Bl^O!{aACU($X4Hlq z+|fJh#HOjPuBTmAXl~rJraoF#p);VM?&NFUUB&MsZggLdc`sV^{%+BU${kORf8Mz2 z$MaQtvexETo)j>gb~$P*&_Ajrt`Q|Ei6yC4$wjF^iowXh&_dV1T-V4VAjHtZ%Glh> s$XwgNz{b%7 diff --git a/src/main/resources/assets/techreborn/textures/block/storage/iridum_reinforced_stone_storage_block_ctm.png b/src/main/resources/assets/techreborn/textures/block/storage/iridum_reinforced_stone_storage_block_ctm.png index 7f5a706a0892124c395555594d987750cbade829..58df9e589b610b44ad7638a13ca3432c1f84a36c 100644 GIT binary patch delta 1679 zcmV;A25|YE3#1K@85ITq0047(dh`GQ00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkUIY~r8R9Hu?mq|}sR}{yOpCJ&&Fwa90Aj}X7R3Vg26v3)0bWx!$_!6uU z;u}=$s_KF+x@kpIb%$6bX+lv;nF3)R%xo|-A&jnnr@5Bv;B?_0>FGV+cmDUD^FPzG zt)rvEy|S_*_wRq-mzbCs;dyy^S#I9EDGLh=l9`z)g@uK(x3?$5!^3iRb|%He#gd$y zEXT*k()Zgl`Q+h4NzTrcZ@>9kJ}&=AZrr$WExxz6S8NgC@_FkQ;&iOYFTXw!YjJT= zPESu|a&l5eMn?2-gv}!&A|yUOUUqhN#AdTeU0t0tHa36i`-_VUu`ElUIXpEtTc4dy zr{1r_mz0#~J9NPyR%vOeR905X(b17?Zf?re)s@7?#wx&Ww@X-9m}F#R$lJGXWp#B` zMn^|wZf;Kc`}^hf>({yo8~*(L5BltOy9464x3^Vi^w~?V!4{tE@9#@(ZLJg)6?qTB zD8hna)6;*`dJhQ+Q3GM2rKLq4dZ_moLKFy(LCCBpG#iT!eO3dojCifDuPe@u8uis>9*y9(E9Wetv!@u_F1fm>5&T zDS^l!JTU!qpl>) zqvJZ<6N_x6bfCAatW57vj4`kSD-Rw#kox+1^@#F1KR?&Q$sZ$zQfU4V9-(m=Q3hxj zP(-O<0G?tkaVDl*Soww+RVuSmux zCgfmsO)MzKD|!G75MzKjIXN0nJiz0PjSY<@*^GCvR$gANUJy^i00#xa6F$V~A{HCs zIeosbuTQO{7Z67hC^a=zy`cx-88M~Tvnd84#1jTW<70I#5FVC|fI;6vfeN5zVSs-N zOG&cG$VlC!s;Ww=tE;v7Kqn7-2()!=dz%EO<#n zp^?z@8CK}v9q-9(k`18=u_29xwLtj0ckimcnV#B+pa$AWDEa||1nZ%V_z_d$jW zLozltrtu^XU<;uH&2&RA5Po)cR&{@13k(wC*xD4~dMEU1gpOsztRds`Q{H#uPkz+r z@`k#9CR~2LdXLxS6wq+P>5~Bbd$5!3aJu zVnV}|Nf`D09>6dL)x^S_>KX}w3Kq;f_a@X+{i)(zd-wdFu1Ab<=6e8-Ih23)O`?;4 zgc|{m6VG3~5L-!gg_}hZ0!qxY5&yLh{pLA6E?H7iQuJGaY9J}0p0JScujVGb`iQNq zt@OebxP)+e{|kc8l=av|Hb{%RDzD6|8yBENG~y(|D6$ zutpfNv$K`Oo}M1rI@)iQ(y~g`2k<*Bf6J_;NwaXSDhH@jsltzA-Z+bCGD=sR-Kfz`%fPAMbe?_^G>F Z{su$1kFU^e(=7l1002ovPDHLkV1iJLA{_t# delta 1410 zcmV-|1%3LY4V?>+8Gi!+002a!ipBr{00d`2O+f$vv5yP zfP?@5`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u0n|`TR7HM%eqv%`larI7p`nF^ zg=lDKadB}_P*7}aY?PFggoK1tR8&q*PI!2Dj*gClgM*`|u7AbH%gD;k(bLsEJw4su z;oaWf)796ftFT^PURzsRYinzAa&l&7W?EWWf`WpTm6eK$ioe3g%+AnEOia?$*4NqF zq^Yori;G`hUw3zRXJ=oqc_Mb8~Z5RaH?@QCwVHOG`_JhK786e3zG(d3kwd zWo4Y4oTHu#7Qh!odSXh65e_&u>M@L80*4SBD zS%`>;Q&UrqkB@0-X+S_ghlhuOfq_3iKc%U!prx#$r>&=}v8t}LsjRWc%g)!>+uz{g z*xKCB(bU)2+T7mY-{Irq<>u+>>h10B;Ns)v=jiL}?COMX`K|w)7 zLqqNE?lt1$<-*0u&(YJ?*xS_B*~iMx($v@8-{8;D)u^knrK+&!>f4SaD^~yj00Cl4 zM?{R00089Nkl{=~LQ37>74B!72zy znjp7;WF>$cf=9(Fv^944unR#Y+-goEy zJpd4jOC+UiyWHNPQg>>!x-LCUV7|hzhHhXqnJpA$wE=%Ssp;u-kUFPJ-;0@I-5dmt zK99-Ddwrz8Kj009!cv6+%qmm?f=INd!x$da4Dm{Sc;xEfXl(4-IOYkCq2s_#CCt}v zOm=vulBwxv=gjQQxp@I|I>Q>`AVGMjVS!)B8Yv*;G>TdJ*5Yl<;XJzpfn8K4)yr)* zAKzaHWR-tBq`Ax;%%Oay2!YArAnvY2e6|HgE;6{f2Hotuh`Cgj-mso5R5mn9|4Mkm zTv!FsIL(xOnAP*F8?{JnlEP3n=jc(0LOU$leZ5T#jp)7 zvH5$L!%P)j5DR{PA~>VHPXv^N(exm0U^79?TbX~Va~4=q(-mTSaz<(MXamX86nX=f z#=Kdjouj}J-6FRm8-3!6qCyOj)6hUOJD4BR&MqAgqIR!kjohJ9=0_t@YXx#{R)smG zcR6(+yufQ8i~Zglkt-FFB{GgGcrZU{RM6>kyKrxB@9FOTvs$gYTWTTuz#YUOaH0HN zbn$=ri#eu_@^_=n$UZRK;S$iJ{9nF${pRganL+up4EkgrBmiS5|KpQ)NAEwJo}v61 zv<O{Q%};67R(kw%vcVTVNDQReoSlC8dc1$gawz|A`q+1a>_cNvH2O0qxwh*#{I0{11v& z%`2GlsPg~-03~!qSaf7zbY(hYa%Ew3WdJfTF*q$SH!U(aR53U@GdDUiH!CnOIxs>o z6`PBk0000bbVXQnWMOn=I&E)cX=ZrOV diff --git a/src/main/resources/assets/techreborn/textures/block/storage/lead_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/lead_storage_block.png index 7c05ec3edfeb812140b7b15d4e5a20808250be50..b3f170a9431a92d3f5dee059f03072c0be1cf685 100644 GIT binary patch delta 410 zcmV;L0cHNJ1+)W@B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPNl8ROR5(v{lD$d;K@^22icm?w$Kh?w;A&ZuejkDu4R;d{B_r z1G-x~VYAax@&4{fG0oA-aH!ZjI#fLF_rn|ung^%nDmLo%u(!Wmfs$4p zOuv6h;i4!M5g<={eM7l>GEOD|&htEiN8_>n9j&f3N|?G;P5^98gV&l(^|*d{brHV5 zijXmu4MV^*GJg@EVU+rTA`c9E0>nY&hAm%Z>A@@*k$a7RnQVR`|3ASjmqEAznu&I;q0Q@BH}upqw>()hSW*3e()?Va?cv$s-SFVpJN^tFmE$hLJt0 zwOgGDO#r@{6h;Qgf$?Z?cJg}w8yLb!UR!A`&O`VC1ryl_<^9bU5C8xG07*qoM6N<$ Eg3ge#rvLx| delta 641 zcmV-{0)G9p1FZ#+Bo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;EJ2>ggSbP8g z0y;@VK~y-)J(J6hTs07ezbf13xLYIO6`~-GvWb+iL}J6+vtWUQqA-dOTVN8Vqdphg zRmI};jCZAS{pJ5+`RT`>LsLRf%sK!bhP#vVM1&C$m>F(?h#Ylv!XYEV{rwwaIFc12 z$eIa2e*g#CzS7MYy^}O^y?$kyDjy$yM*)c7;nM?Co={apgfeCFlsVOjQ$2I4l~M|t zl|TRbMC&^OsGwxcynputZbr!ybFGL7Ne}$FR_5u<-T98T@4S8c9(PAn$pD%Xtu-_y za#l(y)KrN$I3K-1>&B^8_SR56=xT%!?uZBgf74W%=b7F++qTf#VB0pnwfGX<;>`v)*9~4umcbv?8tE7#vu+FK&bQxuM<2&4tQ)x$_I<~F5VyN}Sd~a6 zp(w32PW4Q!m33J-)yn7{55u}qQh^XIPfyqwWD%iTCv_#)0=?t-ZIhF?%=vuB=P!@A zJH0jf7|3%DY&iS6^6PKE@ZZxH%m>S|XP_dqwy`V=|33cnGCamO{(veTL5?sqCBA?C z26yLjxlpEwr|T6}W#2n)hN#keCn9+L>Yimi1kC_{JbZW&(!xlRFn69af(XP-Hiu@N bxb^=B=lp^Wvg0WY00000NkvXXu0mjf&6qOf diff --git a/src/main/resources/assets/techreborn/textures/block/storage/nickel_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/nickel_storage_block.png index b3793f78fa734af6c36669a6b06df431148e3585..dc5703c7aa66473ea11930edf58e1d9da1f39c78 100644 GIT binary patch delta 416 zcmV;R0bl;61-b)}B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPPf0{UR5(v{lf6pBP!NUhE?Vi5Y^UH42-=8^uwpG(iM_?XfcOOZ z7}jEKZyB@}ELR%^#UIda6ILq=Y?{Q&D{Ja; zJf1S6O;6P7LH;17apilj;8xj1v

Hm;X&(Qe@B035=Qdc)ER4W9>NbNv=8_^L%Ul50000< KMNUMnLSTX~SF_9j delta 634 zcmV-=0)_p$1EvL#Bo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;F13D3(@0*LNfi-Zy?RYVpsHjh zZ7F03eE^*0{U-gd&h6_xB%Zt)WFBl~M|#jkc^@uUD33p{)(o z%7+jCV#7c{RiW0(?b~1QNNTOL)W5W#Pq(3&+`c_wJSmqo`0}cClfoDy1m3 zRaPxzCL+SHL8RiITrVrVcT_8ppl%5S2#|AHe`}3l&T)1;2Io20xAS|hs;E{n6O90X zT9ozDAcN!R^xkoI{`>rdnIV$YRzaXGjXt(nhrk$)NFmYyuwe{ymZegg;_ie8r9wEE z1wuiPiBT2Yo$F;qR0t1joInsUQAPk6B#E1&Wj3xhf_*<}waqD|5E)#q3&+tB5lShv zf2JHq2LUr9Gv^9PQdH&<0R)b{6CS*Ld4rivGu^4RGR7bx5E79@-6yJ|1yP~*&bq9u zYhyo7)^)|q2#?9W766{UJ~7Oxr3mhhh;wNRHUNS?jELauCpR}&9v&Wv3~U%?oucz6 zw4cVdcmDYEJ&%uHad(d6Kt#Ut|MKO5V93CIVAlET?w|QL;nYYdD!lpWM?8}A+c#>h zY}+HH2%8;v41|JthYWsx`vd#FlbKWHzu$kN*6F=_Qi?pY&Sytt+WMTE&GiuBe=8b? U#7wp=HUIzs07*qoM6N<$f;u7~$N&HU diff --git a/src/main/resources/assets/techreborn/textures/block/storage/osmium_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/osmium_storage_block.png deleted file mode 100644 index c483bece26a18b6056f31ca5389d86e9d1a987b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3VQP)oUW){r|I0(|HL99^UhdmeJKuEA)gw%ilvETxroSV7H6L7dNTKV@_y zWx*UG83ZtJoZ5C&JGFK~$gI~VPScs6etv}jn8Gi={mE%M5ko{GOsC8=XO?B+yquYr z^SfT)_dkB6YXt*wi$uxXefb5wIXP#hc_D;A2myd;UYMsF&dUqRR=B&nqjx37NCLS~Y6fS=SW; zEK3H293y6im>Fh5kmGcv!IBkq;n1LvEW-upYyj;d2i z=ED~s@cQ8`ZbzK!P(lje18J?XUU$C#?pywO{T4N4T`v$4qi?M1g@?Z%{u^$}k3YO3 zWkGz9@J33)%iCMb;qmdAQ%*czo)7`qpJ>gHB(&1d;Jp0omZ!^3({$wE{{EgAQXGMhUa%3d5sMJ)1Ro zHs?nd76_SsOkIDcU#{?w-P*dn-nRAmZsrTX_2X5stH|=yRI(&3BA&@p>ITCT+gkxt zpquncH6Xs#+9>{cP^YM{0wkfvTGxpnaWM4ld!hSkgpkk^bw|P|zjU8JUR{1P`O%>e zVtgd<#b>@|bAMZ{fQS!;ek{WZ#0RBJn<(Kr9)Xl)?$Qy29FK29lp}CZ2GNloODAc& z{llK^fvW~}Vz;0~pb&0{g!dj}1yJiGb9dZ5wNJB$NLgZjq~a+PtWyq&yYM5vR1b++ xWmN1mgfWu!5*ugZ-NpA??SuT6&Angu2YyhXhI4!Zy9@vT002ovPDHLkV1km^v2XwY delta 887 zcmV--1Bm>s1C9rfB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1r`z!04sT79{>OY8%ab#R5;5e)5&fdWdOkO|9rDKc03+?Vml_OE3#B+ zs!+8;v_OS=;85U#)K`EruaKug9Jp{PYk@+uC~4Zpj?*NzlYe*}&&;=Q;P(zc>+^3T zV>HYa1zH)#eT6Lq>$jJXDkIA>gl*A2>QgA&__-XDNsP=4GBr2=oxK_L6_3kK#?rda zV!ckZkS9$N;@F^#B3y8gQnUZ-72%>oubokDxHw+UB44uUzD?PB6!P%nduTaB2uU(= zvF##9haEOIn|};PBcRXmPC~Wmkq-q<8XIOK#oGNmPriJNBP6$Oen`Ljj=!J(MVcu- z`Dhc@tMIC|i?A(<;gH{cxTe11VXxlLZ-+I9CtrLD~uMaF$ap=4u!{ms^PuAu3iU9h+~hsYGQN=Px+BrM!vKA&U0P^4Bbae8)6C2H{e z_k9YHg|Q4mstn7r*w|d*=76F4G=@6?c42S<4L?jiy~7=--%>=}*a5MvBp&OsD| zd6ZHVihn+?>rxI@(MBQl6idv5<)ZW$TLk0_bATXCQ7JxS zO>hsR!LHu)wvYdf391gQodiEnyn1;>P<4otl&kA8sZt!i7$LRd>~%`@eUH{Z|BtjD zJ`IiIS!iYOd_nIdrPlPwmuxIRWrj2{47wRvVyG;+3@#)|tQq$e{{fRHhdMThcl`hW N002ovPDHLkV1o1yqPYM7 diff --git a/src/main/resources/assets/techreborn/textures/block/storage/platinum_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/platinum_storage_block.png index e1e9a2529839677c9ef4d54351ce10e08f9e5512..107348484c6bb0b962ecc8587386e13a8a494a71 100644 GIT binary patch delta 418 zcmV;T0bTyi1-t{0B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPQAtEWR5(v{ldn(1P!xsV8YCbZCIG|2K%qb&2?;2~Bv^t#lPL_6 z;P?wr7??w&kP8_K#g7aFh>;4wL%uUk(^tAL>F&F?_q^VB+JDt{4^MtVfh-#+rfFRf zTr<8$eT>D{#(G#@YN~j5|D;&X;ilVDJlNYF#-rom1~i|ZU8*=em4=}z;R@vlcE@W=Eweva@O1{P6^Qws@&#c&Da)`M;_3`s5F#c zl?_8^G1wz*KvTDOt8uHuK;2Jf8a%>-T5G?pzcUFVc^hrYwKxyq7k%3fM|ineV*mgE M07*qoM6N<$f-P3FZ~y=R delta 675 zcmV;U0$lyP1I`7IBo78+OGiWi%>bqVmMmX@wvj#;e*gz`Nliru-~<;F2rHP|7Nr0H z0$WK$K~y-)O_EEFBt;NJpNB_OMrI8o1oxOlixKSlKpX~fArKqXLcIXZ0&V~_1O2Ja z%8Z{oi(G*3&1GiK&r9KJahlk9Ra`$e*X10rj$@oLVzhHrYSK`6U(xY z&kIvbOi}po;TKvf;1FCC)x_;rU((D;DUowVL=X`Ga?Z^2ndQw}_HF0(_LkNMs!9Yn z1?Y7rAp})YN~kLCj)+ieC76MA=JT1d7gAK*f1H3D9dJke>4@LG_lbT{ao zQVYFxQc8GCwAL775L3i}(Hg2kkU$I}K#0^3b;HaUW8gTUcib{&MjHb~ zf9S0f*{)n)UpVEA+Y2EC%#55f+rA+PQ6n*(*!LaB>AhnB>crtfNRj{Fwr^PLeERuk zw0hWYV~|p!Y#X!+2Vue(1D69GKq-Ye&*WuceO<{p(^@;Mw?;gj7(w~?_(G|jsH%7? zv>=@4iPnzKW!o6;?EB8!HwzCR|G`G5f7C`D9ZmrsgHUT_y>9&Q-S_?k& JPDHLkV1flHH2eSn diff --git a/src/main/resources/assets/techreborn/textures/block/storage/red_garnet_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/red_garnet_storage_block.png index b7de7484260f98a9c8f8d22c34a24fe2d8c20be2..be3348f0ddf84ffb7b9c0f6435cb6e1e924fae89 100644 GIT binary patch delta 415 zcmV;Q0bu@?2Cf5;8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01|Tm01|Tnj3T)Q0003)Nkle;a2TtxHj?F&4;@aY5@B6&p>wk37!G7@Gx%a+v&v(wb z_a$!2r%U%w#HICOi3LTtf%zfXIZO3~Ikk8YQvh=;p-KQav7sFIDW z<>__cYUgJhGXPY;Me!t716co<&;4u#)Ni^yKl1^&DN=!5n~4Y6NSS+V2^QNEWrq#T zRy)o}{n)`vPJb4xsRTTs&uIEZ%K##Dvi;Zu1B8xJMw(DU*Ps1KNI7?~PrI=MfyM!C z2#HI8qZ)*abXl_Lw7V=7IR-dtpiFoQ+6WK`-L@!;bua+bpp>sv_^5V^lqH6eUM7>( zzkmrEwGFsXfBpqzphktA26hb@>n0`|$4AT0#eyHVB^Z-Tx*zd&p^Q?r+*1Gm002ov JPDHLkV1kbGw+jFO delta 778 zcmV+l1NHo_1C|Dm8Gix*005AYXf^-<00v@9M??VU0O|nS*2Dgq00009a7bBm000tn z000tn0p4aGcmMzZ2XskIMF-#o77`I2(RN>a0007`NklD^X0Zl9?+eKRsE=@!kq=TnZKdCRbEI_vP7A{buJkX45AJnWw=0CEXRERs z^3(zOG7PSidViFLzx@0x^6A0jV-|WJN0&mEhxhh2c6Md9j2LZV^lBjj0_0H?ZU*$H zXWuttue1M!$QF5#-`~HRrs*=zlWM|}TDe}%^KuKLPo;*L)%9lG>SFux6Gw3_WvjJ8 z2=P6>)7hTgj3_76qx;?V)R-zG)zSF6 z(b{^|`@2Cg)((tP81RF;d;P(HGXU<>+NK&0fpOMoBY>oup8S5&X{OFOpHoOGu`#CN zdyKJU=Z>?+78!&wrp)GRh>|D_5P+0YTe~bJEEh}0*xC8T!QsPkzh}$B$=u4qX{ECj zGWuq*e1H1GkLNdwwba%j(y_Ww@^G)qq9BT++59%HBzC>9xj-1NCZmZchy8ww!pY^0 zwTOHhhXz@nl9VFt1rA_1=o^5w5WRQrgmM}|c02$0;Zl|cTTIg^{%0|7TwT{fFR=(? z)$DYC{q3c-_N%XtmY=SqL8otfqBIwodJ;wCn16B%=sc4~2q7}7^y&Na3ZN>bFJJ$` zgqU4VhRgClA$K`nDNA-a|4ZZ>oSum?G3NC8c7xM0lk@r7DD!r*veNv!mY;L}=PFmm z;perKBW#@WI9y8E4S1CjgpqQtv~E(W(ztEL#!~0nPL25=g@t~9cnq@&00000NkvXX It^-0~f3W>WERpGB&8IZ1q-rKN?FV=@UQ#?vR152_I6^YP%I{tQWC}_i?PA;^4{(_ z?mTtpJKuM|_uTKi_fBPduk{rQblyJ{>%&8e;F|G0>H{p+SC+%%_^67H&##JU4yWf= ziW|)}#jX9r-wkL!IDa};ac+7lEH-9xA)?P-FPiM4eWxDC^!rCDe(H1;0U_6XV^+C) zGIl0GJW;Pj;+y*iJsk$C)m%*7gXO|kcObpchWTwF* pJg98$?CS4K!bo15v=-+fd;?5@5qZA(+dKdO002ovPDHLkV1i~2wORlG delta 578 zcmdnZ{DftKWIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn706de_6YK2V5m}KU}$JzVE6?T zYIwoGP-?)y@G60U!D-mbL#4?OE+$(9zJ*Z+-qm!%zbZfjlHj(dmuujgFo-X;!9=X0?9rZGmkIk@Ud9h+c9r*h!e-k zIj1uH+U|VR5f9dwKFMptu^q2hNcj}k&rDX>lJP?A&=D1WK?jlNYnzH^a&+tyyi*Wf z-S(Y}$@$4$NqJ^E16c&QjVj2+}Kd=$BOdbbn z{0V~Cm`0Fv)*|+TjVM})O=L?`SQtoWVG(m)=B|$+DdK_IH-9rb^X{9wv!&bh-G2Bd z`DZsw)7d#au?bJ-;W;d9trZboTP=&_>axX`=J_xI+#Maq-XHHb*QSyUqUZ7cDbx-d z*0%(xz|!7+p$5!X+HY|*1oiylGLB*bHlaowRf(XQS}fm$nlV9&_e9mPAwOt@ZmdXt zO!3en4|6m&(0|f3U+vtYB@pQ%@5eYSLAp@Nl!+3q;}J-?Qq3%mJ%YeE(1w)a2rQIA zRHVz2&6mUG_J;L=PYtTXzJfLaiE!JaDn?-mP|F4xSL$_ZI=e^860;+Hbb|d%3@~aE zxXM@lU*N1VDs>wC92M&(md+Me`@NrUdpRj{Gqd3r-xKMc1j4x@^#A|>07*qoM6N<$ Ef{4DeM*si- delta 853 zcmV-b1FHPA1OEn)Bo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~|>E5F5A$nz8@@ z0}M$-K~y-)J=4oh8&?2;;eXCKGoG=>9^b%R9YI1xLPA9oC90HGt*S1%>Za-oR9*KK zc&|#8vWXH!id2;l8kB+v7<|EiFL*9z&gr63ci#(q&M%E63s4b?+*&U43?T&fmsiL$ zO_rrde@F1~vQJGaeBWm}n~_;dVhsY|AiiawQ}*Hsp^&V#7HAejs=iOCTznjw%EMZC zeKla9Gxp*s6O*G#jwF(j<22@ZwaJ$|Ptb9K(3+_mAj=I7&rW&JUSm8S!zH{+rnJ2R zRiTjEL3y{6C45mV^W%5lQ&JvVkDuTc0!~iPf0-tlhwFElyR%9oZUU~fR^|v$&0W0@DV|p_oo*C|MY*MY(7|&v&N)@*jk&MP%Cozi%&UK0y>Wq55 zj)@bNpFPDok~p=r=2}SU<9j7mm)96x3~{B8QXZQNOI+qTkyOZEAMNaxjNqczV<8C9 zf4QVyZBS@0Q`)*m;1>zY6$<%Abi~%9e~0w;4>56yoh6u9V>6AJOu%Rcqiddj^A$%o zLnb=I0OI}GDaV5gmg)_L*Oz#{qT9b9A5X~pLv-&7jAh&%5TiMIzt48P$v^2WBco9T z$05lwI)g5?LJ1=jj#TWudQD@o1xQXhC-`ANE)3SOob=CWNQK6ts$s~7>nj@Fe=fB` zkqQPUGc?ff+uW)h=Q#tNvgwy-L^T?v zGQBt^k}iSk^R{!$M!80;V?Io7I8A4?Js*R``MKJ%2l14RLXnP6cv`H`)0(ZQj$=V< z%_vPcPG>B-E`KMtta|}}&L%`sJK_9Powu&zkX!JD;53bCdp?m=0ROk`XDNxbEV~7I fI_1{n40Oi7qbzlhoY^Uv00000NkvXXu0mjfr3Q{x diff --git a/src/main/resources/assets/techreborn/textures/block/storage/sapphire_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/sapphire_storage_block.png index c28690029602ff19556115ecda9820483380749f..82bfa3412d9514488e59604f995dd86ba5d98ea5 100644 GIT binary patch delta 407 zcmV;I0cie*2eAW?B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPMoC0LR5(walfOy>K@f*G;sZoMhzMzf6#nb95F7IViZ-@FnmmK8 z_F9S{*jng;51@@$c%7UU0UJRK2%0yD`R4Ywu1iwH5AJ4nZhv-uGjn&9X8Wq|{>kUZ zo10|OZta>Q=KiVYHdd;^!e#bgc5Z&bY<6}~CV-{x z3W~v}7P!)w?|-kZSxX?&pm-jmumowKlqnM>re5T?_DsrC(>1drTM!HmbRZ?PK%fRh zMVj`^Y~3{$*K7^EYEUKi7IY9u#I$2n#V{-ZYGmBoS$A%5srMKuOH3`<&%}m7jRT+Z zpMQZ~l{K9-#6Bw4msnZeKJNFr9eX$~)mp>-0GeK${1E delta 861 zcmV-j1ETz~1BVBYBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~|>E5F+OS61o5Y z0~AR_K~y-)1;N=)8&?2;;eXC79%FmFV_c{av`8#Xs-$hAO0-HZyQo)vga;u)I^DZASg?5Y{16G@r*s|Ij7%e)OTNMv_j-Ov>}o65yBEIuWgYgk~B&&gvsdU z9Mi4hf4VN=e1=vjI*YLYqPr8E#yV-xBiGrW)o!uSY!Le~ItY=5#!4EfG~?moZ>-W1 z>7i^(ssbe#5D)V=kSHiY!KBpW+#3*Oico4IsYsQ^PbHa#>G+-(-|X_C zdr1}qpcJBa{*L?WD{6}$F?kr{Iu66Z9eyGiMv_68p)}n2J|q$E&M&F0KPKs4pu#DZ zA#$Wa%>7lLoL5C?g=rZ4_2!Uvs}4ZFdrdL#B9z3?n&J61rdx+J!zy|eCO4j$a)j$1~DVm%{3EjOKU0Y8m@v!9DKECgtTi zg;t%&A7B>C*lwQw;VVij8)QL5aCS;^_a3L(0j)5d`s!ZTe~VRY68DafhR4I{Ay%C+;i#ALftt7&BNgm$g)H;}jG6>KzMaMCz nKSXCSc6pgB7@(3layH_BEz^nRIibuy00000NkvXXu0mjf?>L?R diff --git a/src/main/resources/assets/techreborn/textures/block/storage/silver_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/silver_storage_block.png index 59ab6d712b980510c1e758d371e70c01579967fd..0ba73545edb15a6875a846bc8ce7ba581f181d03 100644 GIT binary patch delta 405 zcmV;G0c!r=1hfN?85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkPNl8ROR5(v{ld(zzK@>$Nix`j)Wla#$L{Y&`#Ku4H-~0g^d;cJf2&PIJ zD=h>OwFyW<&=7>!sOREccE-(t&71f3-Pt#HH?@oFo9|F!y7*Mg>uZYOn(;mA+Tir) zFl^LUReWE3DW-opJd8$)Cp+7U=lyn zvEicwjw2JDl*QmP-#$JmXU)Cxln@=E%55&zjBPP__lGi4!#d!!n9hnlqq@qTE00000NkvXXu0mjf0$sF% delta 573 zcmdnOe4k~4WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn706de_6YK2V5m}KU}$JzVE6?T zYIwoGP-?)y@G60U!DxgKg(8bZy(# zv1wb|hAq3VTs?CA#=h$}`nK;nyKI_8pZt2DgBX*%-CeX*c0S>lXeVCJz+U3%>&pI! zT}DV%+Ns%#8>r&2r;B5V#AV&S+eL>Acw9oAgicQ?khy(CO?S$Y8K?i(D{x)@ye)mp zEY=^l7)`1(W^K#fy^q}>Lq}7G-Ta5(fp<)SJ)LV#RD?KoF54n_()*ehhvL*=%d;mp zSl7KiDssx-Q#B&_PGw8mrI=^+5;Jrp_pLB6eCg~IqFTB7LX4W*vv?=-m_+>_kq0wo z)P^10(L3wJrm3#3r(ITPZrrq{K3Y|wGoYaE!C8<`)MX5lF!N|bSLf61t*T^Cu#L&XZ v*xbsbP0l+XkK8G{T& diff --git a/src/main/resources/assets/techreborn/textures/block/storage/steel_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/steel_storage_block.png index be64698f5a4e986409801d90304ee05d62d387fc..c57a37ce0960cb2223ef510abf6d439b476e5973 100644 GIT binary patch delta 384 zcmV-`0e}9~1fK(t85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkPG)Y83R5(v{lQD{fKoCWHhKGtc8aOg)Am9>K_5Ffb4= zu*<96FX}oEoa!p;x7AMc?-=f@(tdsDH62%hE+rWW{-&E#7nJ``%(z zRTk^I{@sA)wrzi{7>1$C^ZXDZTG#b5S=V*e18@8N<1U`2$s!=+N|MBK^}N}c1aTb4 z7xA(z_H+n>;1E+6#{`JQlQ>ON>ruUF8n^Gedoz{{1H?2k5kiUK?gv~vkXRD{8<9&a z^ePVzK8b-`Ye39op6C6a;FFk$2xKPM2KqoGJ{u;n;G>vg*4#T! z36~>0xy{9zu_Y$Ict8`Q(r|xOG7O=_AdhSVnucMpai7FMT~B5jJi>!lmSy&LCSfG4 e#l3dTo%;d9%?*cBrW4x$0000Cj_ delta 562 zcmbQwe1&C#WIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn706de_6YK2V5m}KU}$JzVE6?T zYIwoGP-?)y@G60U!DXU#_fMEGVaALZy}i9{ZEbaRb6X?dR**8!cvnB?v5qIqh2tI9+>@p=aK5>H=O_DAe8LaNeE&0gF<75hA0977~7 z>z)a8I;@KjDbg7^M_o2n{TKdqxx9gW&s+u`hGU;A%J@D!V)o41vqbZ} zgT=%cvE+`zedic@SI?ZOduF3W!;-7fdvl+e#>yU;`gLzq>Ib{K=?&Yi<}Nh4@H(08 zPg4Cc2f@?|+348N5POZxtRFp2lU6+nEzXn(@#xiVZrd@vEzmPDAUO1Hzdlc(M$i3} zQ`MGM=gOy>Wc69TU;4jf$DGS`nyFP&p1=S6qCkJ`)^FFV|Fcg$$2TKFG29O571a{g zh?11Vl2ohYqEsNoU}Ruup=)5SYh)2(XklgSZEj^`u5DmoWndsWyL%3bj@1R5(v{lR?WxP!NXCwUU&Qva?bC|4(3RWhrGN8zrSAyYK6n zdWGx0b(%9{o;h;{pSrI9+(rAon+<}%EK*F;GvZdDC<+%vk$(l(bv66+(LB#)^E@|O zRh9GDklgpZt>ZY%2V?FfYldV`ZBu^h#@5{G-VrGX(}66pv~Fk&9S*SB(;fnarj zD1UZ-@C(KQAq^8*0ev8XuLBb-@zEj8!V2JAVWc|`!(cvp zo?W{{w=29&o5h~C1>@glKoYHz@O)Jo7@%OJ8Ce06+P1ZJ-(W;sC({ixBJWd{rTxx0 g0NP8>*xh&TAJtbqVmMmX@wvj#;e*gz`Nliru-~<;FAP8sS$$bC- z0dPq~K~y-)b(2kwDlrU%Kj&uKdTd3P5X()*8Kc zp3f(Lqm)8xZ3|##G1Z&b^4v5tLsjE#10W*gf1E?_8pQYRgG2-~qo^v&vTTmVX|4fk zt&uxO9Ma!rKb-x3kC_FVloGAAkOPq140qQrvep_Gx7P2&-tYIfw$>V^IEZgz4LHwp zu-TZ{T0>PipU?4O+!Ocb^?GfZFPBR&D{jU#P4Vk;&H>hY-)z9lI2;Zv%kpdD?RMjT g9I>YBAnWb?16olqmNe(5O#lD@07*qoM6N<$f{|y<5dZ)H diff --git a/src/main/resources/assets/techreborn/textures/block/storage/titanium_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/titanium_storage_block.png index 29bd6a5dd515d8d31d080a70c8bb85d82f6474fe..dea7b8c820305cc749ff0f41ae27778259e1d690 100644 GIT binary patch delta 401 zcmV;C0dD@^1h4~;85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkPMM*?KR5(v{lfg>EKoEwf!IK0Gw4g#UH?N{c1>Zp5P9H$gi)ZWENP?-R6zrPWPi?>hzcNh-08ZrB#=>W0l5+CgEdXDxlE=M+>mzK~L9tgxF z(h)+5A@&0T4&zT8nrujLm)lCN4NAz>((Dwvv%LIEO=FGMG_n*$5v+?4k+k5t&nmTRu zl&PyGOlL^zf8Lh9 zWftp?TZ|^v8MC%!@7~95kfEcg!*2dV@W4B!z@E-ECn`c5JC|({Jn4PSi$ig0u;tm4 z8?5VI9~C*}@2MJ*e5bOd?NZFMdWji2lKWN|7`}9N3Q?_GeIZ88?OD8&c}$}IkH~`= zGit*Q?&zI$V$)Pt*V8U5G&gQqQy;CW&>2urck(swuHyF*H@dIKycex{f4AsF<&G!E zKW|+1fhn7UO=0Bp^J+wDE|xPEnc5hg#A zP}Nv7!w@iyOn(Gu7^Qxo$OFTk0I?CdVarEZc(4dYC%4BA5t-Y$nnM zenAYE4Kr-<(jgv4CORp@$j>}{c~;Jvd*vxn^a%6Z)-_!-wqf$f1DY6>hV-ax7@%Qf zkMu3j^w_^IjwXeXL2_U`!h_28PD`IN2_t!JrL{N@;S~>xLbqVmMmX@wvj#;e*gz`Nliru-~<;FB{)1!4U_-? z0yjxSK~y-)MU%~HSVs(nKWS#}of{kc45bt&n?llUq0rYa6uKxWB%x#-*Es&Ue>0N0 z7{?K4p~Xl?-yF%Wzx^I5ClJM210dXRck(n5W<&&LhIt?&L~q!N*S@DW#yQhzO+=%2b%AnPpk1wNgqU zrNrldKhe$u07aCfiMQ{5!MagOVO|zQ1Qi8fUKZxMaPjJb<2d;F?K|8ZRV4$YoM`7k z%88_jQVO}wM2ww}v!MbWPMs@fJ5g040u3|Ve;g43V5*fmPn@l@ts7_S9Q($$Z9`3+ zQB}$_FO3L9g_H|(U2u1v){XPn>DKx0%NKg@00S;Cm5FT|3^G9Pos<&c2Eciom>W4| zQcCpJad(oAsogr72J9>%hzRX$yt=$ZL~wWZhaFFj`^X>waC6KIK`=A2TW4KYrZVyL zfB1mPfKzK_+qOYEXHrh=`#uyruY^F3h?npB7TdPr;apu^(OSdZ>8(?y!f_mU@55*? zAZk)_$q2%Eo-f8(pH}KzY3KJQIb{Oj>)qE;iwM1URFt|@T5AL`Cb_d8I~SK1+}_^e z?wrT@0x=@cZqB~0{PpJ_+}+(_W~}QvWYp|C>$-AtbMyUi@8bqkA)Fj;XwLk2{RVgE z{{Eh6o_KnELRC3h!@8kKhq?%U`01K$+lYwagAf0_A03}hSv2A9eDjDZJeMy%2pgXH YALCDi08@@KdH?_b07*qoM6N<$g7&8-xc~qF diff --git a/src/main/resources/assets/techreborn/textures/block/storage/tungstensteel_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/tungstensteel_storage_block.png index c20a3bf00965463a327b1e7eb8a0cfaf782dd500..0bdea92400adb83f3480f45a9a0890e941607efe 100644 GIT binary patch delta 412 zcmV;N0b~BS1-1i_B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkPOG!jQR5(v{lQB!fP!xqno~y_8$NRfb ze}9FDv1}M1rhk!%5Lygf1SJ`;5P7LH;17aqNH@E&zuue=w1U3`2 zfjeP^b@BRm*o`9!}n2_t!J`n7Hz!WA!pg%6W(7G3ZF0000bqVmMmX@wvj#;e*gz`Nliru-~<;FB_J;&mBIi3 z0!2wgK~y-)MUzdB97POa=ooFmF1*#nA54qQO1WoI+f z)mozOGQl_){@ z=EZmPf6@t47)b&IpaTK6>qe(jYbAuh<$NI?j(oUzjRLqk@7}*7rG%;?BBYc^OJa^Q zhr@woSx6}nLg4TBf6{9PKwSfYz)wHFq?bMlk0(R~bp;?DPo(+8X*sd)JKz8Ea*U`- z1PD{0*G!m3vzQW7Ot?EDLf$)3jZKUtEtFbNe^uNar8cY@A_71>962tLtr+=|*@{v3 zD>)Cz^KnL1nZjcOcSoWiVJ6Kd%#4rMomN(wH~#zgA6jbw11>OyiFF+tivX=PLMWII z6(tusohXqI0&Q=Y8DS1MPVu_b;8)-@G z`;M2&BaQ)4lM?5Mm{3Z2GS2#OWl0Nl``jc-#8A$6=f}4Qtu@q@<+M<1#nsvKj+wF5 zjnlIecXxM~86}q|i0+P-4*TWG%^$yWa({nM@11pB5fkc~S=W`@+uP5@t?}XQYg85W zMii^al=%9^kC+(`mj|Z9#P#8ds>jl0000tuJ*fk5dvz0MmO@mjzKCn3 z`OtHDzA1BY02Q#Gt(R&5`=K_7D+THo;U%u312rmS93P2-Xnd~WtBpy)Vr#B754#Cpu&#eYK<>`4kE13c-Oc61~TNP5WDV-n&ZJxFDQ2_;nhuBn}%@>*==#1se$ z2WXH|rhtPi5F+AbsrosW?XJiipw)npNEc`b;0V>WbVD!B{vr;b*7gIpwX-*Rv_(`P zRHhhGdTV_+`I)dlp{4;>xp87H5^`ms(n=P U&H8cDWB>pF07*qoM6N<$f{9(YI{*Lx delta 789 zcmV+w1M2*_1EB_x8Gix*005AYXf^-<00v@9M??VU0O|nS*2Dgq00009a7bBm000tn z000tn0p4aGcmMzZ2XskIMF-#o77`II_pfiz00086NklZeJ007|kv>o5M znq&sAu#dZ$X~6S7Ym{iSQL9&6 ziXhU8K&>TLO8;}ZKnVQbX9h*YGGO51-he%S9RBvp6Om^~iG)%dc%9y0bG;QWVxT5R zmwBshgf7C5*MAFNM*L~pe)HE$hmx(W9g5AX-gT1X+dtl~*4EfEa%@rwz{iuMU?Tjq zZLbu`>sNnNJhRzcPv-M9NguY`p&v$Z>U%!5i}^B|E%HVYe4Pq3jYO$fQY>4&_e@Ke zCahMjVt_4b+-a;%Z-xY50?EeR`eZHx2jjQ9j~uFoUw=pSu)uR!3PUSwIgKsbvK-f| zm4e~TO}WDG`c!gBGWuo zJkyekEPn<{e7lXF|NdupFkhrXX@Hv*k)>?A-J(Xpv7PDU*7baq&J{}lg7NKe9Or|6 zr&dDyhu;(g_}5KaN@W>1w1EHx4bY(1kpL~0$?@rb3DW|g<#Kj)ea)nV2$C>x&w8`+ z_@?NYeg>f6m0IiF-ky@`r=Oohvo8#Q!;|AAmw){+f41%5oecv5&>b?#lO$OxEe_AR zo&^Gz?0xu`qGUQ94<`BLn61@~I8%77ZhXE-s{uLc<-Q{i&u^Dr7Ua?SEJ z>SHW+ws*r+wWi|R`%p2>(PR5wadTr!@$hK>cLSQQTbC+Mj8BHOmGvA1>JNI+WOom@ z>Oq;#e@fx!URMzTax@l~l)EQmXAqEAs$C2Iw``)&)n`jDQC^K;*=bqVmMmX@wvj#;e*gz`Nliru-~<;FCmBKze@FlT z0qaRbK~y-)b(70(6)_M*kKdEammuCKi!AtTHf&h104a!wh=-8)1_)&Cb?(@0H;d6Y z0g0AImNlyC>guw2_4=iH7f?E_H2`|=^xpB_(|ZTtcs!!27-LXXq*VYsz=Qjb5Rn0J z&T+R&e<_FvRSMn(^38z|0vDI>v0KM)-@o9T8{ilcF(gu)h%u5^6*thG4n@!n&trT4!6tLwa~ z%I@SIwN|XPsOs$q*4ot+?@1}qdq+g*y;JH!f4(^Y5JF&6-FwGxE<5Y-Zk3#KUI|)d z-d_`A1Q;6#Au#W+Z?~YTs44&=!cva3)^N^YjG@+ws*bKAg0*)0EXEj0T`2wpEOgQp%7XLKycdWf0oUxPOC_b7r^O5n~*iaLyqjBe4K> ze`DPg)LKVya?YeU4M1ycH2d}Yic$(b#)ybuj3K2on3rW)&vIm%CgypjN};tj2vrrk zEDK9H^7i}<^E{)foz-2L}{VZeN~ep8x;=07*qoM6N<$f~V06 A;s5{u diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/osmium_storage_block.json b/src/main/resources/data/techreborn/loot_tables/blocks/osmium_storage_block.json deleted file mode 100644 index 60ee9e991..000000000 --- a/src/main/resources/data/techreborn/loot_tables/blocks/osmium_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "techreborn:osmium_storage_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file From b22cc3a82722f4d352c4d5e1913682a2e5b4993c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 3 Sep 2019 20:28:13 +0300 Subject: [PATCH 12/17] New textures for dusts, ingots and gems --- .../textures/item/dust/almandine_dust.png | Bin 520 -> 364 bytes .../textures/item/dust/aluminum_dust.png | Bin 423 -> 357 bytes .../textures/item/dust/andesite_dust.png | Bin 474 -> 332 bytes .../textures/item/dust/andradite_dust.png | Bin 512 -> 361 bytes .../textures/item/dust/ashes_dust.png | Bin 490 -> 357 bytes .../textures/item/dust/basalt_dust.png | Bin 409 -> 321 bytes .../textures/item/dust/bauxite_dust.png | Bin 504 -> 360 bytes .../textures/item/dust/brass_dust.png | Bin 486 -> 364 bytes .../textures/item/dust/bronze_dust.png | Bin 508 -> 363 bytes .../textures/item/dust/calcite_dust.png | Bin 533 -> 363 bytes .../textures/item/dust/charcoal_dust.png | Bin 403 -> 347 bytes .../textures/item/dust/chrome_dust.png | Bin 437 -> 369 bytes .../textures/item/dust/cinnabar_dust.png | Bin 509 -> 365 bytes .../techreborn/textures/item/dust/clay_dust.png | Bin 513 -> 378 bytes .../techreborn/textures/item/dust/coal_dust.png | Bin 400 -> 333 bytes .../textures/item/dust/copper_dust.png | Bin 504 -> 365 bytes .../textures/item/dust/dark_ashes_dust.png | Bin 414 -> 322 bytes .../textures/item/dust/diamond_dust.png | Bin 518 -> 370 bytes .../textures/item/dust/diorite_dust.png | Bin 483 -> 338 bytes .../textures/item/dust/electrum_dust.png | Bin 511 -> 363 bytes .../textures/item/dust/emerald_dust.png | Bin 515 -> 344 bytes .../textures/item/dust/ender_eye_dust.png | Bin 479 -> 365 bytes .../textures/item/dust/ender_pearl_dust.png | Bin 499 -> 364 bytes .../textures/item/dust/endstone_dust.png | Bin 514 -> 332 bytes .../textures/item/dust/flint_dust.png | Bin 424 -> 327 bytes .../textures/item/dust/galena_dust.png | Bin 503 -> 362 bytes .../techreborn/textures/item/dust/gold_dust.png | Bin 496 -> 360 bytes .../textures/item/dust/granite_dust.png | Bin 489 -> 346 bytes .../textures/item/dust/grossular_dust.png | Bin 513 -> 365 bytes .../textures/item/dust/invar_dust.png | Bin 489 -> 360 bytes .../textures/item/dust/iridium_dust.png | Bin 376 -> 0 bytes .../techreborn/textures/item/dust/iron_dust.png | Bin 449 -> 363 bytes .../textures/item/dust/lazurite_dust.png | Bin 468 -> 364 bytes .../techreborn/textures/item/dust/lead_dust.png | Bin 486 -> 358 bytes .../textures/item/dust/magnesium_dust.png | Bin 467 -> 357 bytes .../textures/item/dust/manganese_dust.png | Bin 475 -> 365 bytes .../textures/item/dust/marble_dust.png | Bin 511 -> 385 bytes .../textures/item/dust/netherrack_dust.png | Bin 436 -> 345 bytes .../textures/item/dust/nickel_dust.png | Bin 515 -> 362 bytes .../textures/item/dust/obsidian_dust.png | Bin 455 -> 342 bytes .../textures/item/dust/olivine_dust.png | Bin 498 -> 365 bytes .../textures/item/dust/peridot_dust.png | Bin 519 -> 364 bytes .../textures/item/dust/phosphorous_dust.png | Bin 487 -> 361 bytes .../textures/item/dust/platinum_dust.png | Bin 513 -> 365 bytes .../textures/item/dust/pyrite_dust.png | Bin 520 -> 365 bytes .../textures/item/dust/pyrope_dust.png | Bin 465 -> 351 bytes .../textures/item/dust/red_garnet_dust.png | Bin 524 -> 364 bytes .../techreborn/textures/item/dust/ruby_dust.png | Bin 515 -> 365 bytes .../textures/item/dust/saltpeter_dust.png | Bin 480 -> 359 bytes .../textures/item/dust/sapphire_dust.png | Bin 524 -> 365 bytes .../techreborn/textures/item/dust/saw_dust.png | Bin 612 -> 365 bytes .../textures/item/dust/silver_dust.png | Bin 435 -> 359 bytes .../textures/item/dust/sodalite_dust.png | Bin 464 -> 350 bytes .../textures/item/dust/spessartine_dust.png | Bin 513 -> 379 bytes .../textures/item/dust/sphalerite_dust.png | Bin 513 -> 365 bytes .../textures/item/dust/steel_dust.png | Bin 442 -> 342 bytes .../textures/item/dust/sulfur_dust.png | Bin 471 -> 359 bytes .../techreborn/textures/item/dust/tin_dust.png | Bin 387 -> 330 bytes .../textures/item/dust/titanium_dust.png | Bin 433 -> 367 bytes .../textures/item/dust/tungsten_dust.png | Bin 480 -> 358 bytes .../textures/item/dust/uvarovite_dust.png | Bin 509 -> 365 bytes .../textures/item/dust/yellow_garnet_dust.png | Bin 523 -> 364 bytes .../techreborn/textures/item/dust/zinc_dust.png | Bin 433 -> 370 bytes .../textures/item/gem/peridot_gem.png | Bin 516 -> 357 bytes .../textures/item/gem/red_garnet_gem.png | Bin 556 -> 461 bytes .../techreborn/textures/item/gem/ruby_gem.png | Bin 403 -> 300 bytes .../textures/item/gem/sapphire_gem.png | Bin 509 -> 387 bytes .../textures/item/gem/yellow_garnet_gem.png | Bin 563 -> 447 bytes .../item/ingot/advanced_alloy_ingot.png | Bin 690 -> 353 bytes .../textures/item/ingot/aluminum_ingot.png | Bin 569 -> 343 bytes .../textures/item/ingot/brass_ingot.png | Bin 627 -> 346 bytes .../textures/item/ingot/bronze_ingot.png | Bin 627 -> 375 bytes .../textures/item/ingot/chrome_ingot.png | Bin 553 -> 343 bytes .../textures/item/ingot/copper_ingot.png | Bin 624 -> 346 bytes .../textures/item/ingot/electrum_ingot.png | Bin 615 -> 347 bytes .../item/ingot/hot_tungstensteel_ingot.png | Bin 630 -> 358 bytes .../textures/item/ingot/invar_ingot.png | Bin 598 -> 347 bytes .../textures/item/ingot/iridium_alloy_ingot.png | Bin 628 -> 522 bytes .../textures/item/ingot/iridium_ingot.png | Bin 455 -> 357 bytes .../textures/item/ingot/lead_ingot.png | Bin 589 -> 386 bytes .../textures/item/ingot/mixed_metal_ingot.png | Bin 827 -> 486 bytes .../textures/item/ingot/nickel_ingot.png | Bin 627 -> 347 bytes .../textures/item/ingot/platinum_ingot.png | Bin 636 -> 367 bytes .../textures/item/ingot/refined_iron_ingot.png | Bin 569 -> 346 bytes .../textures/item/ingot/silver_ingot.png | Bin 569 -> 352 bytes .../textures/item/ingot/steel_ingot.png | Bin 571 -> 358 bytes .../textures/item/ingot/tin_ingot.png | Bin 528 -> 325 bytes .../textures/item/ingot/titanium_ingot.png | Bin 569 -> 353 bytes .../textures/item/ingot/tungsten_ingot.png | Bin 604 -> 369 bytes .../textures/item/ingot/tungstensteel_ingot.png | Bin 613 -> 369 bytes .../textures/item/ingot/zinc_ingot.png | Bin 569 -> 344 bytes 91 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/item/dust/iridium_dust.png diff --git a/src/main/resources/assets/techreborn/textures/item/dust/almandine_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/almandine_dust.png index fb995081c60463a0aac533b88236896eacd058a4..51cada69c76c5530f9eef43fd28231829e3f5853 100644 GIT binary patch delta 300 zcmV+{0n`471ndHkNq=(y01|Tnj3T)Q00032Nklp!$`yu(uU|8i zl@u{p@bh9dgb_-E0ZcOtzzmtTV;6&>xH#A)Cq8~=*!k);Tz?P{IJ@G*DoHG{7{&{0;&j%};;)LJ0#D13&=g yKagKx&V^|N0VQP3Ab?>244_9Dy2il*7#IMjLV2%Bw|i*-0000+bhFi9EbN8*k;W3+rct(y1|7J7bHW99BM|05+O#J zEmo7HMoMzJnB1&fI?kco$dn?7Q6d*|<;LIe_)WV|7;ap6>VLg>d*A2N=lhlXbKKfQ zMl^aN*Wckx5IFVpb2re&u%P>0NLYCBFLFIPz+R_~kk?JPP2@Q`;g8S0X&$EB9QQW! zFyrCc)5q;l_xDZ0^FA$kxgU3MkMS+6W-J3H&^oeU|J>}O_i(on^% z$4tm*Zvm<;&D+Vi3~CJ3S|i$cCgdz=!NLdl#;&8&D91Pv2v zH4Sn(R+&7y{2rTBM!i(}R@WL6^Ke0E%gS` zLWovv3w05OMiAoK_ycYtte801(M*Y)QP zy#^3K=-4**w=|{oX7e>k1H@^TRRH%Tin!kTe${6(sBcDI7N(O4-SeFGVMsI6$J}8(treMqCSx z0b=67M4}@F#6vIwNbxEPt_5WWh=v_NAYz#vK>T<cZQJd>;M1&07*qoM6N<$f<6I>?EnA( delta 376 zcmV-;0f+wO0;dCzBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1BCg>`Q5&!@J zG)Y83R5;7s(92H3Kp2MMua?@Fl!BlQ#EW3%jd26&1qg{75;i2g8Fy^l5KM}PN+SeI z$|Q7-zbhIP5)Uimx0=oSWM+W>yNW*w2w(7?L)IxDfOh$E1z< zKC+3me=(HIW(AaU{xz~4uNW&3E(G0;MszzI?jQ%-Z$59e@RB4@O5t@r2NB`Obuo@2 z0Dw{oXU!%qyItA=9NWfey^cl@;BC3YNv($a$pniuh3|PV#vo%1oO2wOO2rL|lhhg+ zV_2jqD&;aB;uuxmhv#`1M-e#ZkWzw6iCl;RUa&s@LDl!s2m-jSi}iX9r4*#rSY{dW zJjZjA;HurW_5uKK-S3m*I5@6UV2pun+YmzFX*vZFeTer0n_YA|1OP+?%d&RDzq5BZ W(%HYATR?>X0000;c3N!p;=m+nJ60Ia#)O19t{n^#n9|C&F0HI1LR}&vl6jwKDbAR3pP+MzVO@cSTXm~6L zlsP_tY>WxsASws|+z-2QT#DdZ2CV?n{AEq?R}lFC{*-=RnPHvy00000NkvXXu0mjf D)pLH1 delta 428 zcmV;d0aO0W0@?$RBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`q+7JmJiAOHXX zXGugsR5;7skxxq-VGzcDJ4xQ`7R*0vtMs5=#FKaop$933HYBo zS>}^vf5lcS(4(U|B0|6Si|y?leE(Sg3E=z3TCabn+r1->V>Y+eP*rw!_h_|(1&H%< zcz^#JVHkoFQ7o)891bzYFo}K=&xFxv#QFKDvv5J9aj2g@7wB|4%w{tlr&Fx8hzR5H zA5fP{Wfjl!sMWse0zgE_$O>!g1yq$%=?jBFe@K!f6pLj_WtW?qE}2Y%h%BaHttCz8 zTz3Z;5k0^>T#xNc~FrUwt|Df6Q)$;_;DnEU(R0JPhe&Z{XrRkd1E5y4su@NDb*(qHe< W5|R>apOmWr0000z-*{62Eb|nNCQZtma{*Y|McxI1_yNptcGA10Mjg?rqA%=))B77ytq=|AG7p vb1qCH2q0?)0U`_oU;sVJ&@~Pgz`y_iJ`#1)sMu{100000NkvXXu0mjf7f5or delta 449 zcmV;y0Y3ie0)PaNNq=+z01|Wo-ew-7CXU9EXqDv{nBYkvn;=&iS76d4KwxBmOzoiZCo%6@l&V zFls{Z?6q)vRFAn_`8$amczvAY`lywil}avMoycth$KNAge7PIq!PAL*qlO1>H`lIa zZVn7TH<91_>>J?z%!F@W$J0dz=WC^09vE?q7U1kp2>vJSl3-^bp3~K0ZcbWo&J^)< z+=O?df$gz8c7G?b*tW&6Y*Zs#_E?$ z85FGdM6=ZwhodW;IZFgn&1&oh72UN;N>YP_-)Slom^w59yI#StPQiGi5?fs;+Dw6z r{zLd9 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/ashes_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/ashes_dust.png index 2134e453cd92339752c65cfa0ed0cbee6f16c272..25cfbed9d2f71dda6cbfdb6e45068d965f9c95b7 100644 GIT binary patch delta 293 zcmV+=0owlR1LXpcNq=(y01|Tnj3T)Q0002`NklST5JfLZhk%9#QNRp{ znh97cnS&*0=;#=Lf|3dfIvPZSD4hJ0ZJC$>qC5$m@8ti@H_)F`mZiWW+e_}UT0j^C z0VPSoYdN;KG=KoYD2lkBriqH8xHNgls!?L!_i0^M+P00dEPvzbdERpvhL_yRoD7s0 z?EB6pLI`S_hT=FT$8jtZ9YJM=2;juJuDMUslw;(1PS|6{Io*Nlx-`!-uaO@D^j+8S zY#c|vR1hNq=+z01|Wo-ewJte|`fv*gF4U`hn8AucoQi>E4 zA4v?vz{tq|d9-#B_v~9&cks0Le)nGQde?RshVd`7;x}l;Z-3B=Pr~6ap->3j-4m@S z`2Bv?>owc$mS8aWtBF>Wg8Ti>ZntAR9&zk4ILk73cGr>2#_Ln$0G)TFv$+uZ_%Huh*GOChYfndcB@n7mEe0R*QDK zO}ShqpU>m*cz<3dFM~iJz+f;?-Da~H%jJ@8x65!iWHcJlXf()VGGwz^yk4)}KoUqy z%d+VA`&6q{I-QOhK|1GhIn_OpNZ@oj?FNFRNTpJgN+l|l3dLfPLZLu9ohF$~5{X1` zxm@}`cw(9+KA(?xJWebYQ-#rJRL$*nyFZGBkHb6CNhAs+?$568XvJ^Pihsv&JOGzJ V6fr#@cE|t#002ovPDHLkV1iq;#O(k8 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/basalt_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/basalt_dust.png index 840911f04cbedc7d0c2f55391803972778fbd39b..86de5847457f1213eea310f5c25095400b8a7c76 100644 GIT binary patch delta 256 zcmV+b0ssD)1Hl52Nq=(y01|Tnj3T)Q0002iNkl1pyFqvD=*>w zFBDwGjUUv_4ArE9njB!52O*unE4!ooIm0k~u>3K}+wTz&jWJS|rPlsBA{hVyV$(Ew z-uGR)u1khQ0hIGRm*Y6(JWuKS9s$Xam){l2gdx*3Nl_HqiFtDlD|n#;&I}3Q%i}oe zxvp!K+qTu9YbUo6vMiH%p0&pO5O7|WMenw4ld7t;CLzFDtF0pBIzMCt0d%phtJdW9 z251eB1%WbW2ax?c1n(9AI3Gl|OA%aU5CxFuFMEo=g2)&0Gjim0Dwd=G0000}>rfF!N z=dVpp0tVN0rRVcWec#jT_2MA35jFX^z`QIAZ-fEnuIo4;%Q8xm)@|D+MN!26U`N+=LL1k085kYM;qU%! r1|OH7U>KmT$hadEuOJlvj&yqii$jOU1VSYi00000NkvXXu0mjfcyW{7 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/bauxite_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/bauxite_dust.png index e9c81060f81fce4918f0cbb7ef29eff194bf0343..a728022f7d33318ee180798d5f289fa43d132c0e 100644 GIT binary patch delta 296 zcmV+@0oVTc1Ly*fNq=(y01|Tnj3T)Q0002}Nkljxk{*u3AV=rQB<5DQ7h2UB!Q7|Aj${jMnXYv8!fsmO8=Vs=G{+v#;_`+ki zp7`yz3y6B$pj08xwSDZuGXMg_WU0jc<^G^XCgvI93J^JxPJh#NyCusssori;C82wU z`0O_$vLGST(U_v4AWt$mm^9d&9nYCSc7_D-G~5!RGRlod2xr~Pck zHTH*qe!bf8*>1idLkn;%I060Tkw-`Mmc9n5O1R+b@D~9LD=2unbYJQ*w$~)Rq(>M#d23ykZV7YO*;_ zA(nB$!Ypls%`$FW_~$;}cXQ`_Q-3Ak)@yiMe~12Z6_=Yn zZa0P*tW^KbL>9cncSwe(I1+ofi7X(ed3*jEGVwXKPAa;{d2oP-qX5a!BzK$M?~}-V zpH5b|kIa!=ALsGF&!yPSb!eK%Pz#X`!{;~YFV7+Btm9(F$=&u8QExk`Egy-c5e_8r zp}Ud&Ry}LxVt=gp%J(L&id;^;ol@^v67#)W1wEV$Hxcu;5%YC%*k>ka(GjfIVlT*i zZ!lP@;#eZ>^_Vytb+GF+a_ng)F1pxt=vk@Pv1-vWYbwN?oBnYPcbN*mK_F}|W3RoM zuuaFZt%QK72+>%;SdD;1lkxQ-yR=!jO0p4a1?CJI7BVE^M2(t8L5W5E${?`b0aJ4e~!o1Bid__FJ&n%d6WM#D&?wY#4wWu>Q~|uv0;XAp0Mr8DtO$ zfL!tN?JqDJ21-!E0OT}KV1YEiG{gK30wB##Uj9M}0~7;50OmiCUt!LLX#@de%^-kb j01Ti<8M?;70vH$ot*3oE*!UyI00000NkvXXu0mjfek6uH delta 441 zcmV;q0Y?7p0_FpdBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IFgH)YrG5Ya z0dq-2K~y-)-IKj9192F~KX<+MS}$!*L%pOTA~6VqNK7_^MPf8bIv^6UFf*BGf*2+K z1_KL;-6n!a#XG?{cdfq2_3nN)LR+(V*5~K48ZN9&hX3vl_rtPiN_aLv7T>8TTiri^dX9Gj7(0K zg~&g}WAn?HFHhvMI&JX|%!@;W@N;!?Kz~oH1o8=3N@!xBH^%+(K8|Cf-yKoRo1oTV zrgo`S3n(H>SKQC^P*{{s;K}%!y9qUPlhq&4e z(zrOUV7p-CT~4oytnXx`vH*a^QB4GEWLhFV92Wu#SUHcAYa363we8F|ja2E7W`@H8 jABRuK%1%c5oB#3wR+yOTyFIMh00000NkvXXu0mjfMXt|L diff --git a/src/main/resources/assets/techreborn/textures/item/dust/bronze_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/bronze_dust.png index 0bdcd50bae4e0b54bc38be943ef15f99d49a5527..c07292e0289a1a4339d5b92ae8c09c05bf91fa09 100644 GIT binary patch delta 336 zcmV-W0k8i21M32iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP07*naR5(xFk-ZMVU=)TA17bkpKVcAqMTZUsqmetX38U*VvbqCC zi^O0suo$F+p(qI^49I)Z)A+O(AfBY@IbZU;J?AU^IlY$t!hd78p7`yz3y8URnDkPS zYx~%RX8;6|q3v)_!!f`m+#2E_tT zo@8YlXgJ$Co-={$3<==N!$FVxayGzHpR!AnYv>f-j#{Lk{ugn{tE!G=K z$D>>ePQY}1yladPUUY2 zv-*z@dJ38~rf0seJU%E70x}aRna?d@mJJ%!GRdA^Do1%lLj21AW@M;`+c&ueEPU>l zPeTccds{R;heDx*S2NMVofP(d5>XB~4fHo*eTUo002ovPDHLk FV1i;Y)B^wj diff --git a/src/main/resources/assets/techreborn/textures/item/dust/calcite_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/calcite_dust.png index 64521743825b9d2ba52823b1c34cb4a4cd128042..cee10b42d7bb470fd000d3e0d12c0c4840133fb2 100644 GIT binary patch delta 299 zcmV+`0o4AL1nUBjNq=(y01|Tnj3T)Q00031Nklz0OCuUo^zA$?>V>h=S)U} z7ap$-CF;EcKul$`R4{5>d&dDn10X=m7Y**O&V%~Bc4$Z-K!4=8mY|2@lIvWk)#*~T ztcQj~yf-7VAR+7Jf-+j1C)w^T8jhyE=T9IzLjw5nY%=D)Vw6~}H=3lUlgcE@3JEPo z=cCCr_J@FeXCC(a<8l9{k#*LJ%&#y~gqM z5XM=|h5Ta#nX7GNQeI+{vOzGvOrd$>({@SF?d;>3Zw^bU4CW^6l$E1Hxxj7EaM ziVpFkdEDRl5q}QMAa}EcWNZyVuL&Wa5nHSpD^?o4?G2@nQoxv|6eTSn@1 z714kh+@Y0c4nfa2Sc?+u3=LIRBPl?F@Wwa->kPPk3w%x;B7QT@k6HLwEnHS54~^N0 zPIOCaD+2`d+7>KMc4Bj>zhH7NsNl3I;h2)cZtQ|-ginIJO-%lSB13&mVEUW+mt?RR zWU%vr(+mZ=qaF&XuFNb@Hhiat5~HVGT&Sy{zAFEOC{_be{5ztWPZY39`n5o)rvLx| M07*qoM6N<$f*8!y@Bjb+ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/charcoal_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/charcoal_dust.png index 73014665d98de6a22ad86b502538898892c3604d..ba696d97c60abc808f2b139b19585072ae9aa783 100644 GIT binary patch delta 283 zcmV+$0p$LZ1KR?SNq=(y01|Tnj3T)Q0002+Nkl4nGHYVkX7 z4-oUYG&SocubpEL+5iX;+l?ykZ}x*Sskk=86CiS_kfX)QqJQ~nOZ{G#l8Kl$#OJ&j zkp&4EPo@+$g51gBc&6R{p`!>plTfX_q(pEB?S h2;aZ#Tl^J>-V|*9ex|pI5HkP(002ovPDHLkV1gAYgg5{I delta 339 zcmV-Z0j&Pp0+R!fNq=+z01|Wo-ewON)a*5QIg+i=Y@hs0S4y!AFQjGy&s5Q1F4`!Gr(* zm(+6~k{<#i^19V--bGuKPrlDyXw0~{8A3}z0+t_@+-_iFy zD9!Wwy{K_rSB&F`s;V&0GlPDWgc_D*!7vOQf0`yd9uGEOE*FGh_!>fQj-m)GXAjy;RBYDf4!4^*jNAn002ovPDHLkV1kPMn7sf1 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/chrome_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/chrome_dust.png index a9d98af8a55b0d9bbbeb69cfecd68fcce3ad26b1..85f7df07e032e41df45447fee10d42cc6a57d91e 100644 GIT binary patch delta 342 zcmV-c0jd7A1MvcoB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP21!IgR5(v#80O&k=I#GM7|JCLfHXe1boKwo_wVrU$Q57Te@_InVE`ozKu(iZRRL>&X@>b71VEZUym^fh1}FxA0L*_Nzrvgg(+C2{ onn3`=02n}zGIWiD1u!rG037IQ~&?~07*qoM6N<$g69E=>i_@% delta 391 zcmV;20eJrL0<{B>Bo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IEiTl@VWI#4 z0YXVcK~y-)-OxKuLO~dY;g@R=5W$Ej#tpat3-{v+w9?MPm>7u-mDU!9Ran@X7$a&V zphOV?10K1|nRDj1f}oIisf=GW&HH3#;D0Zd$x1Ghm0!ijJNweMENNTT&yidvE8-f_ z%9cv8e>b*k*a2MF>{0*#002ovPDHLkV1hb-u{i($ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/cinnabar_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/cinnabar_dust.png index 606eee21cc4135c1d9fa8ae21c8f8451da878d6d..f4bccadadbf8f40acab1441e58a5415c0351becf 100644 GIT binary patch delta 301 zcmV+|0n+~c1MLEkNq=$x01|QmUS(V300033Nkl-w(pm;%1SBv4?_T6AM$p0V>ApVV~&%t8H4;*FS;ba4|VE}Hx ziF=R0P6Zi)?0=AEkU<~-a>bYLzrbu5KnVko(?Ed*(g4#8^E(KDG(UO&0VNDj3;+R` z|3H3)ITxl81SXI*g8+sBFn}Iq=o$wLU|;|Mpptp|D&cIn00000NkvXXu0mjfZ+bhFy7{>RvIAu;D$2lak{b(`@iRCy}%t~A4&?d|r zqb=q%#t5~!a86Sg7ep>xx$(Dr{C?#^VR9$W-P`whp6};U+;}I@=V$z`L<+p#91-@r*qyKv-djSVd4G;9$@p>+;32rmp=*f8gLSU`bA;Ds zekPIjeLmgcZr8)5cao=lFDD|wmEX;Z*}!63?e{lnR-~~a8V;NmZns=)+D+VV%yI5^ z;InkFY1Xr#tAAizt3*hS`&`nhNGCAV!}az&XVZg(+@tJS4Fv4n1c%M|x*Hj;QZZ7g zq&y}5i-O!#wvA0JcQz0lFtVVpW5;6Pc*@4SPRm%O3a1#hmgb|3kNSEIy+~mb4emM( zp2jL>YXltCD(spf`pXLFD$b!KAv*FQ>ob#S&Q76E$Ty=`tzbY5nv^+|CB>pnjENln oC_x^LApR!ds^#Ax{{hKlZ=-6-(F1SLMF0Q*07*qoM6N<$f`&`hRsaA1 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/clay_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/clay_dust.png index 34cdc4d7208fd78bed3212114300b30eea3553cc..7048921336aeb2f07f3a7e61aa9105bf53bab85a 100644 GIT binary patch delta 314 zcmV-A0mc4-1o{GyNq=(y01|Tnj3T)Q0003GNklJ#Vc=l?*YNboy+)`~FkpnzU;xt$12982?YqDrE`P`jcFE1N+Zj$C-vieN z_X5n%AWa|uvU$Op{b0VcwF+3XpOXOtC$|`icTmEBo1KT@@$<)EHpu@V4IuvBqj$h! zC(mDIkkc>*vta;kz@a@`z)l4jg6w~gW{^Q30CL5n8)w067(fXFkkizSJ;54anqhti z0g&eJUtghw0W*pLAOQ0p$geQx!Zd;avStv#FaQS7;~ib&U;zva0LHq3Rdbp8!~g&Q M07*qoM6N<$f;jkxPXGV_ delta 450 zcmV;z0X_cu0)YgONq=+z01|Wo-ew{Ba-rvrzJ#1{*T7%@;r{o5N$h ziIZ4@Su+nMcz;4sc*Ex~Io(iOY?$Zr2POl96^RU?M4IWAyuCxVSVG_;j&SlCkyHkb z(-3w{7AW_vSXdT}8;}Gfrrm#nU_1qj+lS-mB{Kr)tTG=k-8Xjim|5hE8xTkena&8~ zkrQT@7y3g7G*&z0hCN8N1_%{O%r0^1f6#{`6oDs_Ks%z*L9Es?h3nfYX6`u-Z={$o sau|kmA_XMw&#uEz#Yv!we}~Qb27@>lb*7qHF8}}l07*qoM6N<$f)HcH82|tP diff --git a/src/main/resources/assets/techreborn/textures/item/dust/coal_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/coal_dust.png index 3855523a619c9f714121a0aba412b74f5bb4c396..286ef148f7ca284a93edb7e54c20a8a8e58bfa87 100644 GIT binary patch delta 269 zcmV+o0rLKk1I+@ENq=(y01|Tnj3T)Q0002uNkl3A-Up5y03Pc}q!*9Wa Th#6r30000$%=ze5Jmk9688_m>|NoKORFObK zI;68}`arbzQk5nU-ZiS(X^b5owwtNs`w|6h*=Le8%;9Mb~w>TrLcv zGmSxjFbv^&9u9}YGepxg6h*p95ac$e?u9ju-5?`7hl4TjR59(x^CL0M%bH6oz i*Te9r`|m#|LHGhy$%^avGTnFp0000V{1MLEkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP0!c(cR5(v#80KJItkr)IhH|k2CMb;oKpKT5B^Z<}?7(cOFb2SC z07wH!qpXb&nE(F!FNP>XS*(U&7y#4EC#%Nr>G3Uwj}LD#IDf`vF*qxWV>N^kN`nDR zGYr5CIlF%kgCHjx*d=@KzGPT-{xMu1+yyW{gEWBv$macvrh)k?N^)S$#*Quw3Ig0H zE@v!8bJIz_a1@8?wvTqpe)P-X2Ss7fHhYhgPjU81lj)}%^-t7 z0OX3hZ@+-qFiU_E1|X+_0t=)8rWxjU5CCa@@Zl>;7@!yc0x%Fs0q7Qny&0B8<-uhNWk&;S4c07*qoM6N<$g6&j((*OVf delta 459 zcmV;+0W|*Y0{8=vBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IE)%DMesBN) z0fk9KK~y-)-IGr*BXJnVKfl?Q234)yWTQobwsUZEz|!|%_u%3pHk&vg+Qh-JXP12| zvai9#L68`Kl9gy|?VxJ3hMDQi<0e7L9ygxj^L(Gr;rV_ac;8jX>5`w!%3GSyYlFqH zLHRZ}e@(l8i-^e2jU&}er!{LXPh@0utw?J~aZ;%LsaUA6JHf5aw|2H>2q!&u{VwSQsCWFPR=r zw>N3{E~Qc#|HeXV@1nG`OB*gYHhMh5)No2(e*iQzI+H0ndWW$8{3X@>k&6eHGJ+TM@5YjYmyny}l zF&e%I>&DrW9rap}ru5H(f<^!zl(2qas{iv}9su{So4nJ(VpRYD002ovPDHLkV1id= B+|mF5 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/dark_ashes_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/dark_ashes_dust.png index 4a8fe9c834f02d9296e3e19b1faa3a90b3c8e75d..b9498d85d1b1c3e67a9224561aaa3ba4dd3098a7 100644 GIT binary patch delta 257 zcmV+c0sj7;1HuB3Nq=(y01|Tnj3T)Q0002jNkl>$hMI1(>Eu@Avy20PsHC5Cj3mam?!4w#_ulve-}jG=ob3kY$*3R diff --git a/src/main/resources/assets/techreborn/textures/item/dust/diamond_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/diamond_dust.png index 9f7ab9da58ac84697d6a02dbed2883ce9e38e479..affd09b37769bee1ed63b64c260e9faccb451562 100644 GIT binary patch delta 306 zcmV-20nPq~1o8rqNq=(y01|Tnj3T)Q00038Nklml@vowZZkly?+4Gtfip>)&v48KYe6y zUA+;^H*hurYi%Fs0q7Qny&0Cl90BN!v@@c;k-07*qoM6N<$ Ef^>R*BLDyZ delta 455 zcmV;&0XY8h0)_;TNq=+z01|Wo-ew=_|tl7{~W-xRM+(M{>N7#NbYPUt+nAi7ccI}<@*eSSgfK102}!??$Xkj6j$8e!4&_{7A;Ep3hiCa><$ zxPA1UoqwN1xOe{U0sZ+k-EJ=vH}}*Xx)}7FQf4+GSzh@3ClPfuNY)ln?H!=?UQ%hX zGH`QC=gASJ)_+xswydO^XGxmU6C%%fZxYp@K;f`6?Df%bd`P>;O|gBO3db%=r=9%G z6;elaB#-F`EtJ1E2v;kR+bqadmne7IkecQwv2D=e+9$&_LyBRLB;ybXnl1vQl8?`b zY*rAb?zdLi#|ucjzSSVMB=e14Z;- zL{JY#P(o}6>yRLi$CAmM$ag)yuL|k3DWjtS z3}YSBf3)OR0MoQ2mD*!|K2AQLXL)%A%Q})D0W9lCwzqe%?K@o8C6P!VA{d4-)QRu2 zcyn_D+qQXls4z1#O{H=VKrWXf5C~wJ85s&lr%j2)Vq9Kc(Q37+)oOTNA4O4c90yI) zSX^9Ue0+?ptz8-F;P$qRu1_H%tgfz6DCDVDe;0$(Gg^7(Y#?hCWCb2v^7P19*K8njw% zdc7X18l+sl=HlW^843W{-#-vl4dV9)0T0jfsMj4joelu!=cgYu%2yAPOzw!!r_k@e f8|~};)V~$4s?VCEK8rf+00000NkvXXu0mjf;dsQB diff --git a/src/main/resources/assets/techreborn/textures/item/dust/electrum_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/electrum_dust.png index 338b36e64fd742c797255ce6623fd26d77c0f98e..28574d4bb84beb6f26baa3840f8614edf6a0c783 100644 GIT binary patch delta 336 zcmV-W0k8i51M32iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP07*naR5(xFk+BN_aTLcNWsoqOyB=x6?Hm2s+O{$Arbe@h%89RWNK3} z7vo8mn==iqz2|uo$j*=ezHFKU?u}Z8<#y8`U5hJ|C@Z9L6*{ghuCYG^^!DPyXY0kB zG%d-s;026l2T2|kA^!a#BM4v$$GLMYD0hI-a9I#UmfZp5qw`emKnVb{A9j^-MFf5s i1OkNbU-m8j3Pd050(>Al*YfB90000i&vma7cQhKDvAcH4#d>ynAl`~PItD}C|wrM@|^d57VkL+9(LvJwB)iWxld!< zHJE86H_>1d+uryQ-c}*K5vZ2jug@JdKv(=$nTGGTHgM&+AuD_&bwpz*OeB zyctYzyt_sa)+ijE5MH@x>oJAx4VtVPgcZ_#e=$aflX5FWji#kLNpt55D#ZfH?oJAO zTWB*zJRYZVafVa!(Mn-zb$bhnkiaW)u

&(S~z&KwEn&O)c#l@2umxRT_ZUh;Qh!miJ6e-i4jF$ zI2f8A<%sP=k1!OLR!(nt)Ln-(I@Bv@2m)wm5SCUP^?&}$FCiD1WXKos-2eap07*qo IM6N<$f|PaDtN;K2 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/emerald_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/emerald_dust.png index a55fb5cd0ea9d4f4f5f47bf4fa1d76a2eeb5caae..45c9e2cbe62cd6c4a63099dcf20ee1b224d11568 100644 GIT binary patch delta 280 zcmV+z0q6dM1lR(QNq=(y01|Tnj3T)Q0002(Nkl;Ikw)8coNz-)%8n*XsG z!U&}y0BSP~o5SQ$`&cLu1p%38&sDGb9nn2*%t9uNAGh)De zaSuzdX2-Z_1_liY6z?Eh0JR;YQAsFq8Z53rxM1ZKuv4*V2HOk*AkEL- zL)cJ&8U`SzIcb75z-@-v3IZU_H(sEG0jdEY0P`QnuTp|wCR`&3AZZ2xOaov5J<8BD e4i><`002s$bP?BalHuY20000+be@{7{~W-I3+p6HfNH<97@vWrOde;qs^G6Xe3(O z)Wlw-kkU*Jb4r+-$*E*>C`rnd8-K`$w_GUa8y7zHTs-}L-+%A(eID6AM{X=2t}~z4 z_IE_6G`BC@?*PL!>}dd3~VB$d42vG>7(oM81Z(OZr?1EcV4W4 zRfaBqkVM*d?%@E(%@zaa3yAl7=#HEW`&X!Sn<-q>eSVWDT`q;odfI$WY}e~FdaPJ( zmocACQ|&QRv47D=w!4v(DJ@|_;(L>rb`>pNJ0mY~+fPJ#&St3G>8IXnqjld->AH#Z z(MnRsw1k%@zc+|9WFu^wP%jy&+aILZrKf7UkFG-zm8*%gaV;qmS`w@pf{NuIuMus` zLg`SGIp08@yM?s58q&vWNph4CZxc}T6cMaeetpP@<~Vu1MLEkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80NsQx$Qp)L%CQ16O_gPAdTV@-x-uO4};lIVGMxP z0FVZdMkBL#VE*F=_ZS3p46z!5VE|0CnyM1Rt=sn)zPvYKNPo*?XHYaZ#%c&7lm-Ks zW*C4Oa$vhOgRFuQ*d_N*o@MxOFsV=S~TM*&zReG=TVLPCN&T-MwzhAS|s9X2Ss7fI}-+gPjU81lj)}%^-t7 z0OX3dPcMSmFiU_E1|X+_0t=)8rWxjU5CCcZ^yCjp7@!yc0x%Fs0q7Qny&0D4J&6PdZMYXATM07*qoM6N<$f@G$C)Bpeg delta 453 zcmV;$0XqKe0^b9WB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1rQ1V1J?Jwp#T5@Y)M2xR5;7skxeT^0T_j!JKTFkGgne(isWNuvXC0= zEi5EoF$N{Fm4zQ*;it$(R?5bnGLk4_kQn20W|(oAxn}NbiGSRYrJU`1&gq=@z(2=C zNEjcIpD4uzFTp)IwW894pv*9fnfMm1QHo zCWx;SO(fCv62wXo$Zq0(jf18-tRO-%YoaFhsrIN`KV{f<`>7~(v3vWBm^u-qg>(wY zWD5MCuUqg|p&BJj`ZidJ`FVILhukaV^N=#(^c=!r#Xi{ppsQ0*HHs@e=#s%KGBC^= vo-Wg1Sozn; zR?0%QO4)b;uizEt6}*d5wo<0VQY5TwkR}_F@H@?!X3RW*e096$-uixX&K>%5lHJY= z%Q=P;b@l)d(?)@c^%~dCb%4+S2oPhf2A>}nn-n7(8WIQ)`F~a|Q+&20`*@<9*`s(V z9~u&Ic1C1DLY9LOsak?NxvjSJT<=}a?LcOR1n}jZ+2?bnR$;l^ZjzGHe4Y44NThYT z564_%eh4@ptU2FpCKjo>#7niWP8a9+u)Wdx`0n5(Yb8-(f7jK+b1jD%CJ2 z6rnCxKxRV|iFpZ@QWYwpfawPTx~D2eayh8-j~I?b&>anctc~gz7SI_yg(Q80scatN zKnOF1A{6&`7=Ma|F_4U-BXj~f^nu1@btFt6PQ; zzl}EkE@;mS@@#(JxgBhXtUt#!8Kim^q}71d>>!5?gY4L`A$BCuiqZfO}bXukSIW8AR)y}@dV#O`T*G(62Qw4(N}fD^|Dz} zQBV{TO@P-B0>^yb#`9Zys$u7y6poDE&u6Ne10|DK3sJCv`nM|gn zX+{t%5D!K;=YO-copAc>CA#g~IumgJ-VMEQ{v1&hM_`YFldw}Qpn0gt9EDm>CXKl`NmK6a65|ru6#} z0F{biHyIK|F%{#JrU_+{?2Yl+i+3V|E-%lsc+z1i$6*-63H>a?+A(=iFdkbrH^1`g z{pa72%HLaP-@T^Qs$+g(g|Y-=3~6fl{_P9SDKFoC`lAoB-o~L?ne2gyu00007xK3<*HImL=~G zQ$apYBW=Ub=tL*U?GPc&M|eyHTwUl6?sd(rx@6o8Aiu|v*Mji|Xbq1AL1eiVKz?|4gEzKB64}d3m^3 zbw0gm^7ZWFq_RtR!jB|k0~u2_D<;>^ki#5G#JVGr@{H$)w7Zei21NZcQ4N>J@gr4LF@KB6iwdXNVEXzBXeui>UVs;b zQu{DD5dIK$W6i1c#P`@WUD1D*Q4cmyiX@o zMGi_MrNLVJ&8YS2a$|5>J7}#b%MxsfwH86JrNLwgd9qNo0RRWRp@1eg=F^}QQWcmi sK}3GRwEP?Pb^rhX diff --git a/src/main/resources/assets/techreborn/textures/item/dust/galena_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/galena_dust.png index 2e52f59c27c9a1bdeacb4d3afc29482c7d8b88be..7ea8bbf054ab0460d0347c73e61eb44a89394674 100644 GIT binary patch delta 335 zcmV-V0kHn}1L^{hB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#7|4BqaR5(xFk--W9Q51#`Pas5LC>y0TJBc@t>?TVKZy{Mo-bHqj zl`PauvXfFaN`oTg4d_43nOrjuAYV;$&aLmCbMDZe(==KyJbzB>OVD|HfT*QYRIXIG zc8)#x20(yVt<||d9nYl2Grl370Fev2PMh_bZ2LgHL7#Hjyl+Urc{3sl5;7W&D49y| zB)k2V?90LR+zDi7NC02%wmaOH%0-rqhC$JARGCCsLDMocos7B0{t(bFtreeHrb&@d zjBCLSm@j5LDo8>;_lJxifGO_JE7yW@2N(^P1wmxl9YDT4Zps}f0YLV{t}?EO;8O;k h0O9+WeT%;W(HjQ9dA#>$s}cYJ002ovPDHLkV1gjui^l)} delta 477 zcmV<30V4kD0`~)uB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1rQ1c6>VakHvj+ugh@m}R5;7slD|tEaTvxw-@6#ZCgzGA96}5x-bEvJ zZ$SecIy*@Jm2Up{H@b9jsY4MR{4ogaUWh+qB0@?(TJ}n4(fTiO=*d z&*ym_c;RU)H(rpDu_^g4bH;ov>&u(6`e{RQqp$9TXm=*(3$nGgL{D!Y2gg+wX5V93 zFXf*Ax$%OmEPdp(VNCl_yN1|i?g3~tl=~pE9*pc zMY*(3c4&nBUw;t&_U5;fZ@6?^o+n~#ef`3D{S?BG%263jbX>=!ClW2z)Y>h_*&c0%IM61?a)=vIwHa6ON9;1YBM-}mv_9?jM{ z-y0|DP5?kUZAz3VMt=+fh0-+IzDKjwB#?j~^;(xl-S;5L!IS`q2pU>f>f_QipVXom T$j1(z00000NkvXXu0mjfDP-Ba diff --git a/src/main/resources/assets/techreborn/textures/item/dust/gold_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/gold_dust.png index c058c94e5d5752cccd5dae5ec638c2eabca4f07f..fe8d6b928e89379e907056b9d05a3130f91ecf95 100644 GIT binary patch delta 333 zcmV-T0kZz^1Ly*fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO{YgYYR5(v#80O&RM$!Ku4CRsrKpKBt^ZNhyYdl^r*EP53`SLw{hJVHjozNHa(dn;~#7 zfD{O-nldnPG=lkmAHHU|JJT4nVTBaDU+zupuB@|NW>3y8@&cWDp2|TygE(KQJ2x7@;&6 zfSi_|CkWO6(?-lI%>>p60wB$Yk9=h4zVQ#P55)iwfcX#PSD15Q8bJVAGYDW900Zcu fjjnO900ssCEK;3F6SA%600000NkvXXu0mjfdk%!* delta 450 zcmV;z0X_cc0`LQnBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`SmD^POuS^xk6 zeMv+?R5;7slf6q@VHC!H@AY19$cNTMxJC#lDS~8FMCjVN&_xh*Py|1^X%>azBmpTn zi3oL7{{UyfxnnzMQc;OtiHW%}re1SDUN=FLI7`oZp67QCJmTSJKQ+C09nO1YHd{=UG+o;c>kZ}2ouj(#yT*i{F42CO6v`Dr-HT5c*O?xP$odUD1udK)fAAqewRA~1*hk@fAE%Z^(+#lxadGWp zD=vDgs82yrKz%qRpZ-fA6eE{Ep*>3Qi}ekcl55yF28!+b8h|q@0?42PODLQ;IrG0xPR?a17faRqiV6hwSBGe zF#rO@Od`g8+z5XS(E>z{nrYgt=45$7RH`?>hPdpL5m}Is%bv6+ugy-drbft zJ3|8a^RU<9-pJ-zPNqzX1pLY*$_mE)NVD~pYwQmJy)~WiU4JyDpwG*-pafu4ggEzy zj39t1PS+dPf;jdDGOEb3JAk}DUz9gc0)Xs?U1eMmfl~%rfZ%*6@GkxeL{D^1Zqi0m RsAK>D002ovPDHLkV1hX`i?jd$ delta 443 zcmV;s0Yv`V0_g*gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`q*9zSP?)c^ni zc1c7*R5;7skxfe*VHAa*_ni+Di^iC-;0Fk9MCnEgep69V5elx{xDs@se@Xlqf}3{V zP3cY-jbKb1Mj;}NX~vm(=elsw&_r=5p5?vgoXfcf-Zu``=jC91US8tZ&nCI+Q9t*$#(XzChXcsWl$RxHfn7kSI>t|6q4{S~9Lpt}~0J z6Ul1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80KJcs`Y;mhH|k2CMb;oKpI7r)ELZzL&0pQFb2SC z07wH!qnfiHn1AEN2L?ZVDXfNI7y#4EA|%i7=iNhwd*?4QB!AboFzCt&Vl{*jN`nDR zGYr5CSvYkzgNB3v*d>=Ay=T~T@flnn+yyW{gEWBv$mY4tHDJE2l^Ixbe0C~>ybv#n zOHjO^WT?+@Ywsp78{~hG1`z-7u~T5NlWSKq@bR#K*)RY%VD+i{V5fo%LH0jLGsqwi z0J-ARmp@=O3`?Md0mx~fzyfK2X@>b71VEY}zWa<41}FxA0L*_Nzrvgg(+C2{nn3`= k02n}zGIWiD1u!rG04t4quo_*9f&c&j07*qoM6N<$g6AuOfB*mh delta 487 zcmVmwiL1Cd=%9jMh^Vy5i+>f1FUGvr=gWJyQ?<2E z=h8FYdpMkPE*Ji9BnMk1F%XyMI7Lq_#(HD&e&hpXVj?0kyLPDjcmcoRcz=t0n)ys^ zG)^Y#@^O5a6Xj=nVtSICam|IEqV{zZ(=bqXE(>!@Ja+PjgTz2wMyHY(mzU(T z->I*w=j!l)(tq$VW=Z2e+ej2gqvDu?0iRF&kzY$va`B~ZRH3RDR3;l-P$-x5&SLrLj>hvrO(-1 zp2xg4IN9C9bD^fGldF>>(q|cpr9jSdupGy~#6(|A8eqypR8_o03x=?*JhuY2>EL)S zS<_`tH(1?CsVA>6-1A04nh+^3#YG4PG;Zz+9Heh>MOfKRsb|ml3q$P@ApivrG$pL; d>gwP8m!B`=rViy2XUG5m002ovPDHLkV1jkE-)R5< diff --git a/src/main/resources/assets/techreborn/textures/item/dust/invar_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/invar_dust.png index c49962ac2c1d4e698f024b5138f3e3ec43be3e6f..19118e51b9e55a43dd23b1803bcd1bbed60232f0 100644 GIT binary patch delta 333 zcmV-T0kZz-1Ly*fB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO{YgYYR5(xFk+BMbP!xtwtq~C+(ojS#4Gz*;LqjgTNbL ziwzDn8V(LEMbywBA`#8SfAC0GeSqi#@th0a?>Sfca~7-R8-GvI7E(^$IUs7fP6N~A zIyuf!7ytp{cr@fb3PT!CCxs!o0FisWE}c$iy4~+IpUk~br=AR&(9P(#yr zlFRi)PfB!Dm5_L}>?VX$mj7S$VdWfEnDR>HF4x<~?nBvmS{G^;LLmv&LwZD}7R zCA&Z#AiF?TaT5t@7HPzZ75^}3bY|@6&7!nW9kUKO%X`nce4GpSTiKnQWOs6Mo5z^9 z*m{$Ze|#>F=n4^$gS~wfCWUte=8>o%?9ZRR(Cv1q*XyKG zDf<0BBEpZoU8YI2>F|g5AL(>D*tX51$0;r@f1(7cwk38bb30Br$$V`cvf2I+SCrBnA(r&j%B$ugHtAuo&$kGGs zc9&kS_s45!vjh`_;q`!G@q|JDno{`;0Mj(7)h=nYexa1Y@mxI54=!;#pOt7VN-P>f z*9`{V0N?%1$R9BtPjH70mSu5#c%3j$l9}M$(G9k#qF~aLlOO;9002ovPDHLkV1m$I(76Br diff --git a/src/main/resources/assets/techreborn/textures/item/dust/iridium_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/iridium_dust.png deleted file mode 100644 index eb86285fe297fc8258e3ae6eb3da03d8607d8846..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4ZNN%jv*HQ$r8^TZoB-q=WyN`!6-cC7=uD@ z*tIeq#=6D?vk(d91XG433)d~5?dTIRq9<)A;b!%b diff --git a/src/main/resources/assets/techreborn/textures/item/dust/iron_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/iron_dust.png index 155e6190e42954ecaf2504ae0ddff634cd21f3e3..9c23fb3805439a155f37d4b8b7b89e6f2e8fb20b 100644 GIT binary patch delta 336 zcmV-W0k8hS1M32iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP07*naR5(xFkwK0`P!NV|W-egi09M4#hNEx;2jBwJj^PB@I)d1+ zvBL$dEF3_h^H*NIj3&MA%$G=2J?}4n75e97S$5!2;kE$; z5JpkN^|o!~`~F)e8i=Q9Isjr(6r3kXa@;lfQjw7_3y$N^JkONpIT?n*PMW5nzVEe8 zk03Kc1cqUtG)=hJ~2Bo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~|>34+!fHv}phU z0ZvIoK~y-)-H}0x>QE3x&-)mO1|kuM&Rm2m5pf63Gy~V+HpB%ubp;Zg#snk-i6SUO z<4dB}pW3b6P0v36PV1dhud3kxj_bPOx~_cpru0=|Fc?U;+r_dh02zQ|i)hl6;Y zC$rg1e^#s2k3abU$8jva@5_8X7vJ~A^E_EDmv1HNGdvs)Nz;_;^-8^7XS3O0+cxX< znxZIJEEYVE^XD0Ex7&naNKq8Tag5d)!!U@Vh-$S8K&#cF)9J{IKtymH2gh+Zolewh zHKHg&YmI4|WLd^;w*#PDF7qN#N};vJ_kAvxc?&@hkmor{Dfat4+wB(9G&vrRWLfrp z2cywQn$0G*ZBwaKNYj)&&pDsZ6h%RjBm_agbUIaU1pxhiUo6X_(P(hH-7pM;BuNOv x5P->KqQ1Psb9%j=JRT43_dBIh=>`0E@)z2VxA?C+#;gDU002ovPDHLkV1jgkyG8&2 diff --git a/src/main/resources/assets/techreborn/textures/item/dust/lazurite_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/lazurite_dust.png index 61d96cba61a98bd4601ba3d686980a3e2b27e17f..f8abad7ef34a3ee6fd9b3a76eacca688919fad22 100644 GIT binary patch delta 337 zcmV-X0j~bk1MC8jB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP0ZBwbR5(xFkxkQY+khC+bSh90MRgEax-aKlcX;6{?OQwg8c%L5+6jE3MWWG8zWyv7}>&%X~8;3lcKub;+Yg zc#{2gMW;#M@~jDDXGj2FZg<+;$5LsQE44a#{Q+eXWrbuSPQ&S(YwQmJ{dT$Fv(ao! zJ}u0(UA)ot0Mi9Uh_v?{sLAe8rhRcE=vg{5ZKW-Q04wL{O`(alZS48kB j16zRb{mZ_^UxDZiTUmK!#-FgK00000NkvXXu0mjfReFn) delta 423 zcmV;Y0a*U*0@MSLBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~|>36%8v%x;+2@ z0bxl*K~y-)-I32q8&MR-f9KAh8!CvDb}0l6C1nf}DY&#R(2b_d8+0YqN}j_9k>We( zGq~xh;;K->IGJfCleu?Jx0XbyJMr5c&f#~?_Z@iI8m6Z@Oi%T(8S_vhIXu?QtsdRp zI|ic@e|-{QFgnrUhkcAOlx0b;|DN4+tp5cVq+{I~?orKas)c8L<27D|?)Emx=Wk08 zxnJz2W9=t9G|tgDM<=!ve`Z8+$TZJsy(gRe=KB0hmM%z+j&8!027(s)GdRDTiYrJ;^QOxxA2RBz2 zvJwE$|MW#o93!DcRWT;OFXmK}UkJ+2%kT2w7w)TjaHN9Jsz;E2wmvWY1$O?I=rPwt R4KV-!002ovPDHLkV1jf}#P9$B diff --git a/src/main/resources/assets/techreborn/textures/item/dust/lead_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/lead_dust.png index 076c45b74c8d2dd42e70fcda3daaf52aa990c786..32d7f8a9aae3e10da7e63816b259d75a0758f37e 100644 GIT binary patch delta 331 zcmV-R0kr<+1LgvdB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO`$K4stu5Waue dxA-d%y#W)=cg&Ml^R)l~002ovPDHLkV1g1Wla2rY delta 440 zcmV;p0Z0Dk0_FpdBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN15G)>7}+yDRp zb4f%&R5;7slFv>WVHCxG-v`sg*1;NE6R0*KPzC}#i>2wR;SCx#P1<$i^K{YYFq#+@ zXfzR!>VP^l0_iZ{l~xFZ|!gJ0)?lMfq1v^tQx{bY99EWteC_ zeMahEfA-X@Iz20x%NAwx<0h76an}7x))% zRU_)=1R}!K)sU^NZ3d$OwOS1T+qP-7PU!Y}C=Eg2V~qJtFm)OyQgPL{r)AVZd=VH07xb?5>*zqZ6gycHw-KQ0000To1=d;kCd delta 421 zcmV;W0b2g$0@DMKBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`Sq1Rd0rUH||A zU`a$lR5;7skL`YPSI32&iQcMxsbx=|+T4%!3})Qwncx9YN87_|yb zibTv{Ffyae>1#$i?ZVQEcG0^%=XuZ13;$c&wk_MXE#LJ7zbb5{)3TCEF=<%XTRx&%WZoLUWYY6^h)M1s`P zk_;J$2-90p%U25ermQu8vO{QZp z%t(Zm-D&GZNvs+r`rw_vs1$<%LeC!+E2@exYED zGyvF0CdCSeiO$Z__kDt)&^rjQm(LqtrZA}0`J9-1eU$5iOkh44h P3jhEBNkvXXu0mjfWQxed diff --git a/src/main/resources/assets/techreborn/textures/item/dust/manganese_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/manganese_dust.png index edb66fe14f123c5cbb0f330e356a8cc5a53e6e8e..62e86772ecff22d7829d7376ee2f9cb161f99eff 100644 GIT binary patch delta 338 zcmV-Y0j>Vq1MLEkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP0!c(cR5(v#80MgV?$rMv4CP`4Oi&sFfHW%0D>4{p>4Di$VGMxP z0FVZdMk5^qF#qAx#|!~6p;!&UFaV}mRZ*GY_WipIpTB-)D1S-IV^C02#%c&7lm-Ks zW*C4OvT^rT26<^&uuC4?y34R($!fShxC>x@25ABTkj*`_CV}}*R(4>`{;u8(;?j~R zE@v!8bJJg#}0wTE?m3Bz{$-8X2Ss7fP?!FfSn351lj)}%^-t7 z0OX4AU%!FbFiU_E1|X+_0t=)8rWxjU5CCa@`SdwT7@!yc0x%Fs0q7Qny&0Q1p*$3Sw!+5i9m07*qoM6N<$g2M2E^#A|> delta 430 zcmV;f0a5<#0^0+SBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~|>35*P{9$PoYl z0cc4?K~y-)-I2*ILje?qzpGm9z3NumWmkO&JcURkA|$Mc5UGfS#0%Kkc>q={NGwER zV@Z?{(x|Co=wL2)Xm1@mDJ^0r{_Q#6e}*6aw+1F+GB6R7?|N##D)fyHOLu!Gnok9g znW<^ze^-;UH#ynZjmzTdvTW_`{J6;n_#%BJ`^ki?tgp#_G9eqgaoOD4u4=_v@rC&#?*?f2!AqRj^5CGXS{jJe4UZih^mH92_MG z)Hjg1%@Ga+QB{@eT!x3IN4#DyxA%7xEW7#-h9*ZP5{aPu8&Fjh!!WRIn`h$%yI3Hf z&vSNo%+lO~Qq=&UH`XtjrV$K>a2yA>+x-p#EY8j=U#3v5ww?~*RVbB8xLmFZ@bBmi Y6iaNermX<89RL6T07*qoM6N<$g1)xDBLDyZ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/marble_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/marble_dust.png index 2da791e1d8b6396d844a3f282824befcb4bc3d76..05ac28357340cc1a21ed4053a1721d77b8ee0ef1 100644 GIT binary patch delta 358 zcmV-s0h#{)1AzmOB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#87D+@wR5(v#80O%>!Cn7B7|O*8n4mNU0BMwzlx9#-RtK}8!WaOn z0U!+^jWW{mVE)IC?-^?93$Pl(45i@!rdd!>nBo2Vw+vsueScvv&^KlH`Qtl-ikeKr zp@SzHp-RDk5lVvrOfw9?3^{x51Oq?6AlN0R&mL!JX`BGp2loQZ&mc`80J3?{-mPH1 zhK3GUv$2r{gPg29ig!@LfSZel;mOm7U^dAAAPpe?jT=|MVt4M|WDpmV0<&QNZor;> z+rUl*8G`J8kY8qyK_CEf#miUEz-$n+a07*qoM6N<$ Ef-bI-@&Et; delta 485 zcmV6>6Hr7fv>FB!1L7SJCSbrq5N))yG=C)!u}G`A^M7(Ob06p2$F>V<9t488 z+O_#uY}QiK_46D>9!J!_1+281(heGO(2d^DXa^0sHhTkjhLUi&FfdsR#R>+E)mBud6sdib{eG=vsbV4cJ-wk2xtclS(v{|Y7^2l zW^(cbgF%n7EPv^CLoUo*eQKoEwycY^ue+_3*Ya|N`KC7xoogh*~>uf77$0CM}PAu;-L5?YG*_iB;=Uq`R-hn)ORewV4G>K8fh@c|40|&0a znTX;>U4PL_$mk{%U;da0=?m&cPAC8Gq%M^S^+b;lOT&1N#x+ zqF-7u8qwR^<7%^S-vV51_HFm%1Q9`IV+Q;CtTWM7+FQrRc;^TqAmuh@Mll+#G|}bd z!Qmm%IimMuy$69hcOD4K_b5fQxRfSfs_`1gGfQZmk)%=_yL$ZvsJpF{E zi=;HqNqRZW1b>nw!A+;2N+&ebno~bbP*p_at3d>!_cYJ1SO~buWFAnZvN^0E&^8UV z_k1z9eR-2hFcYCu6m(;Y>n7CWG2S_1jHFq{WA(;Euulb9?!tL*!%|g}4^0svv@Orh z0dUs_S;M1& diff --git a/src/main/resources/assets/techreborn/textures/item/dust/nickel_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/nickel_dust.png index 8fa86e6bba036faf91fdb4d58e5ac9cac8d0e1d5..97b1122de5c49689a045658377a854800e1e9027 100644 GIT binary patch delta 335 zcmV-V0kHmq1nL5iB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO|4BqaR5(xFk--W9Q51#`Wrb#DM`22_k&PldPhiE0EWC~K7-GfB z6WEE8$c9pbVrQo8Ea*SYnOrjuAYV;$&aLmCbMDZe)9-a(cz@hBkg)sq0WltrQZ8TQ z+CBCW7ytocxmxG`?mVg8ss)Dl0z^)m1v*;_lJxifGHgN&b6T20Y<}RK@eGX2as*&q1=HI0AxSxD&vX>K4stw h5WauexA-d%y#aGgeM>Sw(rEwy002ovPDHLkV1ft$jN1SJ delta 469 zcmV;`0V@9L0)qsQBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1N32jwj9smFV zkV!;AR5;7slg&;OaTLXWGyi|PfNCvBOp6;E7k)edCN4=Z)<&?nGBJLHFtifm)(7Af z3~YS?%7#}^7j8Atl(vvmN()Zsg3?M}o;{ct^Hk0Ls6?%xp6bg-#a-bSYDcw z+qbS!+xbEe`ZO910^cDXAERFVj#7d|1FmK+f3aA&E2oxd8Yan9n$$#wez#5f$`rfx z3R=fWBog$xN7%Ll259wr?%MkMKMDlFb-Gl(ea7wgs8+s01mj~DXg7B_Z2drMaNPl( z=L0ZvJ;MoWip%$9>hd_rRFYUM#=vv&{E)y42%`wc@u}4hC~ti{?mOk}i)XVE(*_fh zI~NfVlv22Ez}{YqVI*vpKb+_>&N`&R!W{t^4h2)eX8DuxZ~n_Kpthm!ogfv500000 LNkvXXu0mjfq$gGR5(xFkbASlf68Pwg3OtVLoWNJs=x zl+-=bPMhj|0CAG`{`EU^=9d0k^>Q!36D_sMMPo)G?2_9U@P9no&PZzj0ARN^;Pw4+ zQEx+Qk}(jt<+yb4_Vjq(Xfm9VZC2H3*2IWLmcSx0S#K9)TNO@n_s{Aih`Bg{^b80> z<@svH>vnU*aKAIAykV--BuVTf)d5P*9}M2!Ke%Y_Fo>)MX5VL zG+Y({fu$-0_%t2(YL?u=mjM*^hhEKs!#fEGB`~Bh5Pko$H25nb`T#AkaYti>DMbJP N002ovPDHLkV1mbyh;je` delta 429 zcmV;e0aE_f0>=Z8B!32COGiWiNdRsD9u($U4gdfE32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1r`T4Ew`22)c^niR7pfZR5;7E(_KsBP!PuP|C}ambV;RleZlpjiq(rE zvWwsUqiFC#6kD4#Nt2V8GhPUyv=w%B=YD=XGt9_jGT|#__|SAoGvC{NLY8WRw-EgdoBwI#P1jcaiz4VJQ5^6T_a)+QK? z`tlgfv~o+jCU~7ug<2b|%TV+~^9lfPFd7QL{mtv56edLwj!q9`-5q$FE^Jf7w?ESh XLZPZp`~}3i00000NkvXXu0mjfT2Q=Q diff --git a/src/main/resources/assets/techreborn/textures/item/dust/olivine_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/olivine_dust.png index 7c49ad3dc9b8f864e1729a9eed3de2d31f9b0775..a9e927b52bcfb044fcd1409dca0f533a0d61359e 100644 GIT binary patch delta 338 zcmV-Y0j>V>1MLEkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80H{(o!Ng7hH|k2CMb;oKpItq^%%Uh6Tob!Fb2SC z07wH!W4L}knE&F=Ck8`HUaW>-7y#33Aa2WW;pJh5n=j5WOn**W%^(#hjnxoFC=CWM z%`gBnWbVdE3=%4QV3#~w|CHhU@y~F5a2LS*4AKMwAe(b%g@XAu<~Cr>$^Ll^{JQ)o zE@v!8bJIbCy#)|wq9Mpz^%dqX2Ss7fOFl~!A=Dkg6w~gW{^Q3 z0CL6GJ72(T7)wA21CY}|fd$e4(+u-F2!J$yy!;U*3{VUJ0hs?leuX&~rV#{?HG=?# k0Wg3bW#}3Q3t(UX0DXCU9uJ)#&Hw-a07*qoM6N<$f;ilQ;{X5v delta 472 zcmV;}0Vn?L0`dcpB!32COGiWiNdRsD9u($U4gdfE32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1r`T46`z-6O8@`?e@R3^R5;7skv<VHAd+dlRoFm3XZnDJDa$OQn-I zb}9%(a1dOylMYfRC)Xla>JKOeML~4wR&eOnrBHNG#HiqCX@8-jrkZ+9G;Q?W`+dhj zETl;Xoy2#4-t(Mu;C`oiIxco1F1Ld1(K<;uvoe?-5qm6lvl4qECST5$Wi6MKfulDv z>nuoQsI-Yu1W(50ea{>Reu^FM8_%q#r2L_0oW0#EV9b9fFLY1y!{24!Ptj0T z&vJf+=87gZ&VRSCUsV$sEHwFBQ1z}(YTKiH`tuoAJk~F^cv113N5LpFnR$+N26d{j z8bgFSYoyq~fYxveuOr=jb+6R>ehuKL6T)VgtjgkkcR>k;WtLb$L-Kr+uESpT{S+UZ zk7&`fJ$T8|-YSR5V+a`dX&;?arH@!O9Fst_9P5ciuu;;)J5s1qjpQ^sFQ}}Cx0xfq z=otU~LS=tcFinDw%fSaDWTG=3?)Go+qyR2iaGg-cLje#0!=MPfJGlhMf~P^M+9sX= O0000or^-+yyW{gEWBv$mXiP1~A{&)c~wHB+QRNL`)FH zB`97H7nEbzet83!4e~!o1Bick_XV)n<*OGMgq8n**)RY%VAGtdV5fo%LH0jLGsqwi z0J-ArT^2AK21-!E0OT}KV1YEiG{gK30wB$AUcE;N0~7;50OmiCUt!LLX#@de%^-kb j01Ti<8M?;70vH$oadUc+0XRCe00000NkvXXu0mjfopF3& delta 493 zcmVBtGjUS8hWF}e@qW!seo{G!JqqmftEZMVt!ofBS`vfH(@8(}IJF;2j@%=tLOU5NJ zJWalmq39gbRDT~~zqn3I@IFV@H@f@cBxXCMCgAC0RC@Yi?B!Q*amiR)L>jxe9SE`d zbB?kqQBfw5c#y%-h+F`O4z10-L|cZ)Rnmm&@A2^<$(dW^rXIldOiryMlqcNq`!0Uq zh$3Tdv#|RT)5)@x`-F(l-qg?T>1Pg#>-cmHBj-{!+-BM#CQ_XeZmT17CyZZjz;g0b zJQLee*ky&0v)NuQ@Zn8byR?Pj*X^SFHCj6w@LWaUmQE?_u=AyW@`R=7w032Uzcldp jt^g=c&@`>;>h;n&!kV{GbBjSv00000NkvXXu0mjffr#s@ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/phosphorous_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/phosphorous_dust.png index b321a37584ff311dd5f662b6eb191cab300da7b7..c3ed5845be8214bccb94f09c93ab61983ae3736b 100644 GIT binary patch delta 334 zcmV-U0kQt)1L*>gB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#7{z*hZR5(xFk}ba6fJxE7QUgQygA3%9Ku>b%707*qoM6N<$g79pJ5&!@I delta 461 zcmV;;0W$vS0_OveB!32COGiWiNdRsD9u($U4gdfE32;bRa{vGmbN~PnbOGLGA9w%& z00(qQO+^Rb1r`T3H&g5s?f?J*bV)=(R5;7UlQByiQ51#0c{|PwI*J=aETSfCqCo@8 z2Ft|MR#rCt1sjVrK@bPD3L%w+B9qcTq<=t`wNT8u&d$!fd4Kb+g&?Av5F?UPpZjs| z;T~sv`ZZ6H;)!}*K)l_MII7D(0ph4GlW#sTIs2J|XkH!#h@-m9d{_mg(0QBM+!8-` z7UZu0@peOMjTLm>#u`mH{0eY+`Sv4+-xuYNfH3?70`@j%q<=awO?q{L6;0kd!hWF1^T#FUyWxxiY3!s~N_wNPr(P7`A^$*<;(VZb9x&&iStDz1+yQi?La9dqu! z^4``v3H%X;!YayjDNI4B3$#fQQvixq>xhlr%;^gN*hc+2C4Ml>U^osyo?TLLea=pg z5l8s)Ul1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP0!c(cR5(v#80H|iZQ6ejhH|k2CMb;oKpG`Qgc$72jlpcFFb2SC z07wH!V}!penE&PTCk88@NUVln7y#33q@%)c?#dm8TX*j>)PEMFGN|k7V>N^kN`nDR zGYr5C*}7*x0}n4B*d;eFUt~D8WjS0Q+yyW{gEWBv$mZq=v%!2-MFp^CZx=@fQE4d@ zm!Nn-O<9p)#m3!WHpu@V4IuvQ`wzfk2Tz`55E2pvvta;kz}aJm!A=Dkg6w~gW{^Q3 z0CL5@~07*qoM6N<$f<<0@J^%m! delta 468 zcmV;_0W1FP0)YgOBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IJ2gT&9hm?C z0gg#TK~y-)-I2dfS^*S=Ki+#ttkDz+8nq#5%dW+tYbO|pLrt7&j4)|pI;UXFBp=W zcC_mTf4;#{85VOm&N6%_ygm0Cdy@aa^fw2cC+l||KfH(XFZuhQ>sK)N*@n~M#MYp3s2i9i9i#FOvutAMhom;QhbY)3Z#DO#8_I0000< KMNUMnLSTZR`reKJ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/pyrite_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/pyrite_dust.png index 057369659770b0a136fd2ef53288aec3a56c5796..c3ec2549a0b7b778054447777b96539589efd555 100644 GIT binary patch delta 338 zcmV-Y0j>Us1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80O$yP0W7~hH|k2CMb;oKpJ_)#Tn#`jKOTEFb2SC z07wH!qlA$*nE(6hcZNzoTdam)7y#4EF3!*J^W{f|_fMZNXn%!xGXyA$VKsyiN`nDR zGYr5CxqJ8s11mQt*d-h8zG7(KbQrD=?gE&fL7G4SWb?H(TfuxGB?Yi%Wm_8tJyAXs zm!Nn-P+ErJ#ks3sHpu@V4Iuuzdk?^3kItQCP~zhNvta;k!0Jm6!A=Dkg6w~gW{^Q3 z0CL5>Pd~tH7)wA21CY}|fd$e4(+u-F2!J$Sdi@C{3{VUJ0hs?leuX&~rV#{?HG=?# k0Wg3bW#}3Q3t(UX00#Mf{KcC7lmGw#07*qoM6N<$f(NyL(f|Me delta 494 zcmVko=n_)hbygHQRV7eIE zOa(3Ox>cZyASh-LMB4-rX%^wuU4Kec|9~JuTWdxLRA`cB^nZ36run$vr=1myB1rUX z&pAI1=RA)pl}cPjnoH{60;-lNRm+s~dW^FQ>-Q$)e&sQ#U_cbVkU}^sMVNU@%)}#xwB(EGH`>_G4-dF*Jo}|iJ2VdYA%BwH3)hGx`xK@ z`2?}>BM|DX4(|_bH535w?ADAVQ515c#1R-Hnywd9b9#gkyxTwd%Ma?TFfA1)1r1>c kiG=WW-x+Eo_21L@3yRX8?Bmin@&Et;07*qoM6N<$f|Ow0IsgCw diff --git a/src/main/resources/assets/techreborn/textures/item/dust/pyrope_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/pyrope_dust.png index 70bd677c892f9cb5e8fb8d3646922918e812c81c..155effb7fee0c71ffc2f60ea23ed5d748d1ded67 100644 GIT binary patch delta 324 zcmV-K0lWUu1K$FWB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#7^hrcPR5(xFkzWhJU=)WB(y+yLL0Kcpog2Ax;m$XAFE?(a{9998 z3>is7zthh0+CG3hwRX;1&u{0vqd#Zl3|@GmHkEAjP5{v;=zr9xSGkUk6Ql+}fao|i z?hp49HBCD;BoQF8t{W5t7xMip4ZA(E@@8sCCVDd>3lcI}EvTwhcoP3{q|MQby?6rI z84|#k$FnK-?TXEEzty2~wx~>^tYBFsa@{@G*dGG=<;ml-?e0LioW`{f2h1;P9u*;< z`$I+$z!YJ4=RI0b?f|3VvLJ{oy93DQ=S{f-B>>2N*j2_A5q!!Z5g>g3vTyNMAbJB( WymSfbcy-1A0000b+JblIk3B)WCmB`%ZlbOkHB!5W~9#bBVtp5uHrq#f- z`cHs-ul4ZVTaI79$1}D572ughzn*<2@U}?n701aTGVk<{fWWl+<@6)fWkFS~dG&IF zcFM_{1X8OH0)c7u)6oa2tfDR}cDHxP(gGFbB3rQk?8OFh2h6VZV6aPiF{kS-X_;Yb zi)?w!7e5GHfPeJL$RAS9@>?XhJ(~E$@qocNW_{H$jz*ZvC0^hYg%NGlQD}t-fZo4C z({xO~r8G^?Y`LJ9o-hn4@{(0k;;T>VEWJ85CeZyz&dpR~e~7h$h*Fj{%QDA0heKIw zP1auVd@_~|0D!$nRwmb?zb5u0;09`4PiAu*`b+aB05F7m0|7{I6^}%eYFb2SC z07wH!qqd_Xn1BD}O9po_QLKhw7y#4Eqoc#{<;oR?hp%5Vlz){JF<9{PVl{*jN`nDR zGYr5CnYLpWgQB=N*d-@EerDMD>NQ*++yyW{gEWBv$mXt|J}}?g*buBa%fpR9nu86+ zB`98y7Zqi=x_>{I4e~!o1Bk!%?0K-*_VX7RWZBulY#4wWu>95?uv0;XAp0Mr8DtO$ zfL!tT=T9&j21-!E0OT}KV1YEiG{gK30wB##fBZrT0~7;50OmiCUt!LLX#@de%^-kb j01Ti<8M?;70vH$or$TwJO1FDy00000NkvXXu0mjfEX#!7 delta 498 zcmVaTJE1o2WsJCTj5m5s9EuL{f!P z{6fWcs1<}R{sYB9y4j%=RMd(R2M4FxwOgSbimQVzf-OW`M1PY83s&;c#MtB-Z|?7& zP7Wba9E;C-&ilTH^TPdR@#TojjStIhJ4H7Q-i{8)#OpU?^)#4D<~O&sJ15V+7?fz> zP|kmaCxSE>DMq`jQ`Lg0;`ukpv#+D-< z9h6t^SJ9&pGJml+6}1f{{Rg;P+tCjL^mlk!fAm-i8oYbfCp}&-VgC=rw7B>gq~>7< zW$r4@zJ5dfO(AKW&Po?kEp3u#P$W>-*^Ou9IhSXrxEmTd-q=8$Uto7QP`XY!97c&y zVzcG9U|B*k6vV&pr?S40Un1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80KJ;xyyeLhH|k2CMb;oKpI6fR2kF*g1~I3Fb2SC z07wH!qkeKSn1B1lTZR}u39N=-7y#2OV{OLpK^`WPdE4&0r`fiPaEBC=CWM z%`gBnWXp`%45|{sV3(YK|D0jTrx$R2a2LS*4AKMwAe(2zrh@sF4i;d|J{hSDiaY`+ zE@v!8bJKx2Tp*+Zf;n|Ai&BAX2Ss7fK}J8fSn351lj)}%^-t7 z0OX1fzrTaoFiU_E1|X+_0t=)8rWxjU5CCbu|K$Tp7@!yc0x%Fs0q7Qny&01)YWOjfhLC;$Ke07*qoM6N<$f+Yff7XSbN delta 489 zcmVVv;=N!%p|F_YTV zjCg{LuPgX#s>rU#@dRrr?|#Pbkx|T~jvIxPRUqrw#bTcrYweO|my4PTKW?8FC!N7I z42~U#yx62oljYn2F@0CLHifDB7V(Hfi?O0DfF`jAYQBV}X fLQvt-*88QuJBO?L&fe3K00000NkvXXu0mjfNdn+N diff --git a/src/main/resources/assets/techreborn/textures/item/dust/saltpeter_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/saltpeter_dust.png index df73446047b6e71586ede31189212a38d8dc4069..6bf454075b69f60faa6b76e990f3a0ffba1007c7 100644 GIT binary patch delta 332 zcmV-S0ki(#1Lp#eB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#7{7FPXR5(xFkwFf@P!NWP(xjpmZP?goV#7UbIEgrel{1J-u#vEF z1ba4;+DJrG3q%vr(0|ftJnaF*mo#tQOTWJ}uk`15$Mp+OynoFkAFnAOYJ~zBC5!9$ zI7Mav1c-)V^F9aynv92;A*le7HLXZt_@u|dfiTDNG@I(kp&4k`-i9-gF9I) zSJWSj5-;gMW`+dtW$(1-ec3cww(L5!TTP`CWdvQXL@)YWV}1zO->z3a3+`uf9EWQm z37F32+$uso=S7E%Ab>7h*X3GJ?f|XfvLJ{ovjfPR?M}G^B>>2Lm{r;p5q!!Z6(D^7 evTyNMAbJBUI))Vi3>tj^00001$p8QWZAnByR5;7M)4@s`Q544U|GhK!P6nYRGHrI9SOjTG z!G+M5ao2Y!v`}gbN|EBS+fb==5wegj#0RJw-@<|tWQfU3W`D>`a!+?bYlOCNOe`6pn1Z%bC!UZRx8C>!vs z^_-iMTmud|pQZI;6`5AlY7bd_^aK$hZpL$y=s#y(UTGn&q829H2D>L4dWE?RT$ch(D9G##&2ITfp-SMVV0K zIZ7#hdag zzkU?0HBl4+5QZU1l91;)<8eh4E%Ni|nD^V?)LZ~y_dm-UvDVJs#&{IPn3G?p0KDC7 wtIPfBrepf>dR>e$R8<9V<=4Lg?(LX<12{gA61Y|d?f?J)07*qoM6N<$f}O<4761SM diff --git a/src/main/resources/assets/techreborn/textures/item/dust/sapphire_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/sapphire_dust.png index 2c7356591d3e67fdd5c1006ffb077670e05bd23d..049d82947e31145cd824c24d4c9616dbfe3f3b35 100644 GIT binary patch delta 338 zcmV-Y0j>Uw1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80Nq!W9@$shH|k2CMb;oKpF*wBp7r|oxp6UFb2SC z07wH!V|btynE(3uBL-15H>`$W7y#33qbI;{6Vl{*jN`nDR zGYr5C*}rK4gQ%n&*d;HnZ)bRYYZqJ}+yyW{gEWBv$mZsj31GgOwi#HnqhA68hoCZw zOHjNZt*phca{Vzd8{~hG1`z+&)l*=xE2sA{2uP@b*)RY%;PSqiV5fo%LH0jLGsqwi z0J-ABi(6ne3`?Md0mx~fzyfK2X@>b71VEa9yuXVQ1}FxA0L*_Nzrvgg(+C2{nn3`= k02n}zGIWiD1u!rG004=5mZG2ka{vGU07*qoM6N<$g2UZ_ng9R* delta 498 zcmVm~1O8f8w`75(=Cn~QO;_~w2vKRy7$Ad%$@5@pmEvqR@ zUd%4Z+l6&$xiNVtMEiBnHuOj)Z(qZ-_V~Kx5Ui=fboNjMVf6VsVpBIuJbKCId*kw~ zuZQm$o6Q}UhJWfx7T15!eEux44V%t(gYfmzONxMt{ZYAMM3`So;pTK!5;hltXQ-(- z!K?W-GEMbO@e1#nU%&tX&s>nFrfdY?%8|G_SvS zfwu@K6o`G>;nV6Oja3z_BrO_i{ag;!F*f~~)OHq+u4`dh4r(`Z_!C=iO^B~LOyG1S z2`Y@vM=)RNW?KGJ$9}tx%@&2)P oWQ_-E=<1jKXbLpFWb41BpOHwh(=`Ir7XSbN07*qoM6N<$f{uIa$N&HU diff --git a/src/main/resources/assets/techreborn/textures/item/dust/saw_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/saw_dust.png index 5b11fbfd839759d4e691e8b6a0f041c5b7744d15..3f86e8f622327af1510e9005ff8b91c85b649777 100644 GIT binary patch delta 338 zcmV-Y0j>Vz1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP0!c(cR5(v#80KJpi|>CBhH|k2CMb;oKpF+OIT$1bgura5Fb2SC z07wH!qc9&YnE(C57l!lz9ju067y#4E#mUU@?fYMb@4vq>=znM`GU%&_Vl{*jN`nDR zGYr5Cx%c1^1E&BF*d-V5yk?lW;R;+I+yyW{gEWBv$mT28?}Pc0(js8ZN(yoe;zHag zE@v!8bJK#Pv3yWo_~19AR)vBX2Ss7fD>o#L!1gU1lj)}%^-t7 z0OX1n@4kWAFiU_E1|X+_0t=)8rWxjU5CCa@`R*%97@!yc0x%Fs0q7Qny&0Pp^LsG&ctuK)l507*qoM6N<$f-`S}DF6Tf delta 568 zcmV-80>}OB0^|gcBo78+OGiWiNdRsD9u($U4v{_=e*gz`Nliru-~|>40|7NV1pEL1 z0r5#hK~y-)#gjWvlW`Qrf9JiVEv2Q^QUofE4j2^^#RPBB7)>>Ca5H`Zm<@}Ylaq_a znU7%f1IT7#B8`Jaiy8=mZLz%6LMwgS_tw9If;Jr)JkvSDdCqgm5v3ISDUE&Bz5$Hg zCKL+cf4VLr0)U8+o60DF`Fu&{9?r75vdX8z7hdES34)-Tf#-Rcror^B%ZLb9&y1+a z@j*@;Ns*h%sF?>(h{pTLjE!)6a(s`0?3$=)f7RSLcUaxMehkCVC|Wx>uE#>5!hF6Y z_wM9a`p!pCk2kMB=2`)H1v=f~8Ai4neSfBeMt15O@2i0k>-Z682AefCl`(Rvw( z$lmhUP>g8QWPP)V=LOhppOV!eZ0Ibl*D1VRm!ju&dvNV+MqN5JOm?`Rn`sG%2i9+1zfCJrt+WbXYDm0B~I&KTy2@uijTg*HA?(_WR<2FzIB3 z&ud#Wnl3}hJ`5eKT9f>uB|RqUx=yFl;mYYzW#~d`AWS?O0$^jyrdDqO@MdvSf*@ee z{C@!i==_;4P7Eo4K!Gms`a?xT1QEe79t<4E=?3_3&-4rG2h)Cdpron*00002t zl;ls8!h;tjOqA4kq2FoFWXxTFd^O#3ZhgOd&d{GTT&`aD?0;5?-#$G+jEBQiFbuBk zYY)l*2oSR|o%{XqM6FI&8R7{LIjRNdYCY+Ezf-+hp?oT(3~>dB3?L&U9tu%!G^TVi zp$u^XWM@bKFGECM&SiLwTB%40J>m*+O@P<77n5u34*~sTv*Ww<;Xt|;%%}h~QHOo&e$d eZ-0xw0?`{^H-V82mq3dE0000kjO!*n+h&+E_pgC2<9Il4zo$ z1|bpK&~F2)t&E>Rf(0itX7 zxPK>CvbtVnNGU*M%W6^_-za${x25q`vI$9d@|*G_Xo8o z_V#~rKhg46z+{meAD=VMrlh%LBi`aJc|a*48CBg&SSr7d8 g8rF@Q>PwF487cIf5VnL2qMQSC?)uC@M&S*)RY%VD8#&V5fo%LH0jLGsqwi z0J-A+gJ)ni3|TNkX@(o0J~uLd|JA_%;XMPF7$00S$nSTLodT-?X}fgW%kDc5xCZT4+0|FMk?qV{88F>w9_ccIwdj zbS|Fp-oxd`Jsh~%%4JfLO^?cTo|dZ?3lEbrJwHQ-Z6S!f+}croKJ7PLOh1t2)fX5e z3BF%A%s!bXmr41OC_n7yD@)W$CB793M2F&>m&%AEynVICza)PVWYeRPTYg6Qq)5GV z#z55I^wSqY#(y15v%q+)pQnj?;(K6WEGe1cLClZaG`%MI{4wG92)eVIuNxbL%mVtX z%5YaFQ*lFl2sDvIg4>gis2`nR-0Ed(eGTvQCq0#Oyk8bY%fdxyQTlQUN?aPI$>zZx zk*+Ys;t%?Q?HK6^w%@#_Qf&}Win49f@I3z~W>ZOtgW|fSTj*xm?9*4e)+1uda>pj~>UO0^o|Ewc_33 dvHCyz@*DF5q7)_>HqZb7002ovPDHLkV1l8l;R^r& diff --git a/src/main/resources/assets/techreborn/textures/item/dust/sphalerite_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/sphalerite_dust.png index 73fab582bb82ffbf32d2c4686f17e7e4d7beea85..3f24fb3fe22d8304fa19189887f7536b653289fe 100644 GIT binary patch delta 338 zcmV-Y0j>Ul1nmNlB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80Mg%+xtHVL%CQ16O_gPAdM0d3Jf~B)?hYN7z1E6 z0Hgt=QA@`T%zyXh8-tCL3RXif41j4C6IW(<_3|#mo7YbnLVqGM7>rD1u^Pe%rNIEE z83tg69NNE|K}duP?2>b*A2S@;cL%Ny?gE&fL7G4SWb>L8Gr)W;9WAhCJ4aUrX&C_& zm!Nn-L{ysL+Lc3KHpu@V4IuutE7!ncS1uoA5SQcyvta;kz@F_l!A=Dkg6w~gW{^Q3 z0CL64=byoB7)wA21CY}|fd$e4(+u-F2!J#{eewY%3{VUJ0hs?leuX&~rV#{?HG=?# k0Wg3bW#}3Q3t(UX0C9tR`WW44+5i9m07*qoM6N<$g3=>;CjbBd delta 487 zcmVjy# zP~C~3yDqvYDt?qExG7x}iaS^SkuF38@h4cJS_-b*=q8Sc#ebw}3{{hvah&9x+f{|? z=(_YQ?>!tI&gH`Yt=a6b%w&e-K96zNVsb7mFJDh#HU@}@tbE$hqI`PPaQf{FSy)`6 z(|X3)=@k=ivdm_OBT2L<>~|j*s8-G?{K%6`S-9>64I->9uX2;*FM^rOkj%gT!1>uJ z73UY0m7-M4(SO$3!O3x+{^w7**~xXl#9Uei(p}g`yVUA+^4|+29(K`aG_$w&6(ufV z=wo%ZFf!gNw*qucBbn%-uV)mu`jb?9ob7MxxV}To)KQ^Nx$IF>Ld?)_6NH3RDkp4y zS;2EJI6T+~5xSoYQY_k(3I)uV;5h-8eh^*abS5p2l3-25^1OzpO zSFK^^N^E~V(C)m#tI0u$neaH#OkD}4Vc<9cM|K&dgsqL7cJCSgXk@Hg1W-!Qb=cal dwSV(pegi5&s}|XodB6Yw002ovPDHLkV1k-t-MIh& diff --git a/src/main/resources/assets/techreborn/textures/item/dust/steel_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/steel_dust.png index 442f907f1d8c3e309bdda7b7716d5ee1a4cd3a00..94d1105ac9bdad190fa9709da575c99291b3b7e6 100644 GIT binary patch delta 315 zcmV-B0mS~g1J(kNB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO>q$gGR5(xFk+BJcKoCX$T>)ZXAP9y=MiwC0f;E_0jeXdHU;#!( zhJu-a*udTWVMpBCE#SBZ;>^PP&aC)znx=X2F|C)Uc{@;y<9`@sSxRk=9lQY)C{|S^ z{l4!giozS>1gM-O3ASy+vMgxZ7HOJ#LmuWWsH|v6-}i{3NG4g=71K0b-Zg>lOo{Nz zUDrvU=efvrT_XqrYZ7aPEXyzqgVfxg0{eNM0=ff`Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1LCxf*PQvd(~ zM@d9MR5;7sk+Et5K@>$##!2#vk>+#4$JcAdD1+7+#Fbn}0jYd=|l{=Hn z*FV?mb(B&_DT$&8+qThKGnq^PNRkB0vJgVNZnxXF)DfkWlu9M4)hf&7l5)9B7=~Du zh3mSk*K2mW-N)2S<~{|jHE|rXTCFG)3e09Raa`BMaU7=8DTl*>Y&J`hBxtPx7z_ra zqG`9=#mmfGwjt#|+c002ovPDHLkV1iP4z2yJ^ diff --git a/src/main/resources/assets/techreborn/textures/item/dust/sulfur_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/sulfur_dust.png index 0e44975300b128652589f2c8ce8649d414b4081b..12af800bc31c1d84b057f8f287e6130af6de819c 100644 GIT binary patch delta 332 zcmV-S0ki(s1Lp#eB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#7{7FPXR5(xFkfXLpMLAULa%+;NWwLFz`Vb>6k^=3pCBxKwMP@>Wmg0CXNvKDy(pJNLfUqaZe_6c?(s6?Y?<|c8x_kUOfL^QEbmOb@3AATIp zQ4`;0`Alg(S^pOJv96?^X!#IOPqZvvOb&%2x3_X_cnpoQFNOPik5J9^_R|t?I)?l*i3k6I?Qc~>%nziJOk?GDIcyQW#40L(uWB0 z+~V4h7Z%l10G$19b9!G^0|9`8WhAU<7an!h7=)<$>im3#a=eTFqCnc@MX`iO4 zinA;e-}g`BoOa-Op7edMHS;5&Z`)SC@j3=ab^~H^FtO;QK#UQPVp$fgjnfW@#tsme z*k%XBoZ}8o1}I?j5!K?F5RPKF85q}Jb`|~#A|J=nmh?;VY)}9I002ovPDHLkV1mn{ Bf;a#G delta 340 zcmV-a0jvJX0)qpPBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1G3F^&#(EtDe z5J^NqR5;7skUfsVFc3zcqadOvq~HYHC}$-t6ut-@6_5Z$;yCtbC{|>FU1@)+)qd3! zes4S<{O?$6)mp2+g16hPI_K0m_j8H0Rz*a;_j)>=R7Acnxx*r&m&;`mdGEiLJi^Yo zN#ecNfBk;1yWQ@CBze4fwOVmLpNTPYyHD6=VnNe1BuPS+W%PZ|FbsqcNRnyqyCBBMFbs5EN0wzYO+%jN%;$3shXW#lh!A5$ zMDD-FympZ1Ib~UrrYRu=VvMLN&N;?$q-|TOI;xsD^IGI)vr%IVMNzyxFoqBUZQG)% mPw=OLd)DjqQ`@iL-^mRa@!0PZcIIE7#uxmL7PxHmZ8!q-r|*RVGB zUg4D*(CSdGJuDIkY7rq~&NlK7nc%93*NGo2yA$|k|Jl%!Gk>uc5msFO4~UMliuU`z zn@!U3t^lD{eI?T@a_xB=>VEX@O9C0U0_;cu`qn7A)+810jNB|}T86^#K*LX)45PqF zmP?O1?N;I?BS1DwFD!xWc1PCWi|ajQ~;vLC9x8c>_c%mkky~me~Ph-w%{GP#OT453@>K m5y7bpE*c2uzwBIm6o`&I9-1qZ+}&IN0000n0$~(}pYdag~!As}@yr!<8x`7I6qfqNM;YGNt3&@ok)JP!) z6K2EYd^4ZlX{DG3{j8#QbvDn#dtUh8sW+NZZ#3ms@X6_=1VJc45dK_JZ!~3UM3hRz z^9C|CfAW3F44xX1!N8x3qA31avIqx3IF~4u$W8lJuCCiFlGNhQwb~Ak4?}dK84i8K z2>E=DPS*oKYfZJf&Hll;tO#Hr2=>N101JFp-`aH^-xNYX(S0zq?x=W0JK^ytmO?Hr%0vZV%s*8 z$po!6acmfk0-`9Q-+$uhaCgpG%R?R>Ur08SrCi>?7(+UpCXQn~Z-|I|fIk(?vbTRG h03w2ASu5b*$vf~9+YAl)+^GNn002ovPDHLkV1fdLvmF2c diff --git a/src/main/resources/assets/techreborn/textures/item/dust/tungsten_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/tungsten_dust.png index 11b7269b4d45740de770513fb1da56036afd9ee4..c84d047e2673c8bb41e81ecca7284fa719b1205e 100644 GIT binary patch delta 331 zcmV-R0kr<$1LgvdB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO`$$xqFKmJ zN<=A=-)Js?6}_i9lh4cr$Wzmt^VRdtIp5Hq(`>b0c)T{0sDJkk05P6OP_a zn9rs>DndT@heV7ZfGJ$}&b6T20Y<}RK@eGX2aunSr*a2M0FeE#tBflm_>@5)K=}S; d-{P-8^aks{cm>6Ou=)T1002ovPDHLkV1lBtkMRHi delta 434 zcmV;j0Zsnq0^kFXBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1FD{$3w?}v%;&~nbrfJeRZ_w_v(F)=yB2Lm5g1*zt+pdfhiW11MLEkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tm z000tm0gNKK2LJ#80!c(cR5(v#80H{!zUO}shH|k2CMb;oKpJIvl^Gn&e86m|Fb2SC z07wH!qo;)*nE(388wM2*Ijn|Y7y#3(#;?k7>*H;PyVtKXRDUP7GRRnqV>N^kN`nDR zGYr5CS-oxngQ$!M*db71VEbKJ@|wY1}FxA0L*_Nzrvgg(+C2{nn3`= k02n}zGIWiD1u!rG0276KRsEH$N2gHRMBXhcowpMR_7e{Sym9j6wmS7-4Z z&v|)ycn=5Ox5g7u8H*3eYaY)_i;-AFzE00lZY&}qva`Ie+QKQy`3; zwV9cVF`kIJk|;Oq#KIzXd6V<(Il;~l4@DELEY??l@s#90g0c9J#NrEF-(@iiw{&-R zk-FNaw>ikoNq>f((H@?5@-JXG7LkvigY2buv9wL*?1FxOAFXwMwhuPR8#ydpp{cKt zfvJ!@3ow)-)DdQ)cM>z7;X|N}wcQ^)RPz`mi&b8>aW%|!-$4pzaUTCvaW!O7YD zIk@F`BduP%LiAf$@CnVGO*mTP_100%*_em-Xh%pTPt~hu{Hy+{pa>w2fC0zJGxawA Zx@25ABTkj*o@SAzLgHj-e?k&!wKBEn24 zEU z$Q2)6e*v>$07@kcKu!Y%7Dxk3GtBQG0Mh*C?LU+-KrsLWVEzO773N%+Mi4;O3<4Mi jzyNxbp=%s0fPn!3;vs#VS+nhu00000NkvXXu0mjfSgm|! delta 497 zcmVJ^%m#m`OxIR5;7sk5FHAViWL;GixJ8OLN`GVodu&~&@C#ZQ!Z(Vfq#;cyX!jR?2nn9@AvK0 zVcAtWM$h$qpC3FA{NI?Hye`k;F*)leblPENJR-M8CkT8OQCg-FpNzkDo_!pZ%t2D@ z^p0$PT#~)5xAG!BQZ-41>ht)Bj6HaXSICk({z>D7PP|+O5yi@@dE$w+GLBhBo`}hv z`wJ9Le&OdbG=DT-#y&{W($BT8y_oumB?EYrX~@oI4MLG=>n9z~?%QX}DT8=;zd z{QMCmzd+FoDEgYLnyU4$LFsZloFO!zZqxF n_y=P*djvpf!89my{kQNNX=S*vh^sO&00000NkvXXu0mjfv7X?( diff --git a/src/main/resources/assets/techreborn/textures/item/dust/zinc_dust.png b/src/main/resources/assets/techreborn/textures/item/dust/zinc_dust.png index b67b6c9adb2a8217b52efbe65b855698b7e70179..1137a81d3664db4e8041f3f9ff0fd3d1c9a848bc 100644 GIT binary patch delta 343 zcmV-d0jU151M&ipB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP2T4RhR5(v#80O%_nIr!}7|O*8n4mNU0BPjr;$hHG)dsVn!WaOn z0U!+^jXIk8VE(h`PZ|2Aw&QgP9Dp=``1t-m2!QCz*DiqB>wh+{{Ey8LMkoyiFq>h3 zpHG0{;B!8wTJ896Na!>{O5;FsFlD z0n!XI2n0Z`cu@c09heORC}99{nu44XSOZKm%fISfz?00Ef)K(2r}7p4&e pkTrt+uE4hB941OMkpHkV-{VyOgI zYR^nWf8R&OF%faI)tEp+hF>GoaWL>Fh*W|f9`E_~?q&vAn11v2)(+|~Rp^nzYpV%n z#*)2^LNN~j&{|_-eG|uL2Rs8rObdzl8dAwLy1fqKs|h@n^5}Hih&nEa2!7Cq5CT?Y zadLym_@GA$e$Yp!+lCwUP_CBXxiL77gF-P6X(0rZQjkhO$Z!G}pZ~yfV@M^_ux%T| z;SgGD=#j!(zlSgkQEODNw|i*J1pwgU>Vz%JLd;tM5y3P~NGVaRm%+>*;<>avO002ovPDHLkV1jJwtNZ`} diff --git a/src/main/resources/assets/techreborn/textures/item/gem/peridot_gem.png b/src/main/resources/assets/techreborn/textures/item/gem/peridot_gem.png index 3386ab066c69cb22e452e068e7d3f860783d1a26..f4d7ef987a856dac81b40452e8e990cb0741fbff 100644 GIT binary patch delta 330 zcmV-Q0k!^w1myydB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO`bk7VR5(v#7~H@$M(sZcL%CQ16O_gPAdNGp)-VVw{{ge1!WaOn z0Wi(mFK+s0$ zz~T#c&I22Ac=rW{o5w#hoZs~tt`EZnAe%t|q#0xoh=23yBe0mdwj7v71~>x|1VF9; zfwy;Az%(|1*8mW>eDwmDhJ^<@z%T%&p{lO|%+}R50P{fr6b|SBB@jUX6p)}02Wech zY7?r$P{Y@8hEX*rE_G0BHaju;yw3>6&2xq>*gR c!~q5d0GJ7Av&l36hX4Qo07*qoM6N<$f?H&K7ytkO delta 470 zcmV;{0V)3F0)zyRBo78+OGiWi%>bqVmMmX@wvj#R`=;f_@zukp&WnbJQ3!@-%kZCE2Oi$u5KX2fFSw z2*!er72Sdg)@8^f0$VM}QrcRqR@y*wmd)?G(?*oPpq|s4_u<9!JUmK7xQle$QTm&Y zKp^n{e;yk42*C8@lKS^^xm<+-0B*mR=Ja2&v{hoV=ouRJ$aP4;2yVX@yV)qVu4*y~ z9bJ!G=y+O>@AaUR6v1vbO7F`?9yL8Av~@_2&4$u}rfK*_1|+hXRCxgo?*kcq;{m|g z($8~8AK{;~XqQ5){*>lkMb8tfgjSAJPCz!Tf2c6(>9#tlt8uax{lNa|H)faCu~-f0 z%QD3~5D_l3e>hLY5D|*)=+`q<(7~7Fx#Hc1^uKE7?ALEjsr1qC1jknxctM;HV(Rlzt(PWnFx3u|jKfG|i7T|I^iFNw d6lP}z1_0(d#Yl6_Tr>ax002ovPDHLkV1g(jrPBZa delta 531 zcmV+u0_^?G1FQs)B!32COGiWi=K$&e+t$PWng9R*32;bRa{vGf5&!@T5&_cPe*6Fc z00(qQO+^Rb1rP~15J!;y-2eaqxk*GpR5;6}lR;|}Q4q&}Z%H;yH8q=Tp>1rpQZ_a9 zRIh3-n{?&F{4C;i%8>w3iKwj+3eYQe&G=SZx@%(a_My1zro)Zhil&j;Qr$U z1+emB@m#IyWng783>4M{fosMfMmWgF$^igB%u!X_-12uYzF(AR{4zmJk%+~(9*=WL z_Gz{|EP%Jxx=1y+T{Um_I#cm7-iMcDd+ka3qS5t}|-gAZpp^jDh>1R+ks6BfuCNV2wbAT9NacjBo_{U9qP)4zkkZI~{zSF3gB~Bl z8Vs@5IHY>j><_WDwgw$2Rcka3JSvqsU+Q)8`44!lV*q|_ZTo+rJY}oZQ&32&!%4eI z-ur!Ozvp!TM5HTR*JZ+Sm~b4D5kry@LyVM-k+N}J_gua5+s4>T@}IVSNBMvC2L)rd VS^A~CvJ3zK002ovPDHLkV1mEZ_o)B? diff --git a/src/main/resources/assets/techreborn/textures/item/gem/ruby_gem.png b/src/main/resources/assets/techreborn/textures/item/gem/ruby_gem.png index 8b05988dee2b315737d224f2e5cd2a5d234ae4e5..2d092ce7bec2bf3aabf523f42c3a867bb0d538a3 100644 GIT binary patch delta 249 zcmV$Qp0KrK_K~y+TV;BVt zj8GZ{)JkdmhcZz>^RpWm>M;aBnoVV87}NuT7-X!?z+z91o?^JUVI9M&>sJ_-e0qVR z2Ze)6^V=Jj!R$9TZetjNVSoTDCz!1&A3hpW&3tM6HiT~F}W&W>M*7+X=Gz4S;R5>O9N$!fN`G0xpy8mykUjKij zw&nkZ$i)BY>gxZSv`zoVN-7dI;811_5I6px;^F&$Wl${GMbjKz{(JBUfw4R*Cw^}@ z^6>v(?C$e_iC577SyDai|8tyN|DSD~`9B@#e1e)`0OXQcKwD$PWdAp58UIfcmHIEw z!cLrK7;xm_`R~ZV@jqIKmvqfA0Mbad=Ai-@7yy%Qd9N!W>Rtc<002ovPDHLkV1lwj BsU!dZ diff --git a/src/main/resources/assets/techreborn/textures/item/gem/sapphire_gem.png b/src/main/resources/assets/techreborn/textures/item/gem/sapphire_gem.png index 5863461495896ff2b35635214772e7d604f51105..174f062fc1df4d3b7daceb49417e53df87791645 100644 GIT binary patch delta 323 zcmV-J0lfbG1A_yQNq-Rl01FWTe`H^g0003PNklK&}C~;?>Qa@G!w}0ZbE!Ub+4l*ef9Cg8(*HU>E?>00SUbfWU_rx4<+u zfMEd0`Pcv~JkSA#0WgKlEfc^rvVkzKAOoz?sA}i}4>S+}`5nYRw5E}`Xav~=atX-q zFwL;=KnEBu06YOvH8-#zhoCZpfP@-2>OcTwJBUWngUtXKfEfhS2m?3`ARRC;0014E VpEzG5lj8sY002ovPDHLkV1oMDe?R~L delta 446 zcmV;v0YUzQ1N{S#Nq-Um01FZU(%pXi00007bV*G`2jB!33AnQRf03?|>asU5Wr*8be z@!|dd+BGM^hJWc=<^R|BZ2zxpkxJNrgbDlpPdI$#|B)BZ|JSTO@js?(8=VcvU3eUf zJ+kNg4{h2A_JU3Ly#HdFK41)rUSvHe27oZg5ZAQT|Gje7{5N!{{%;qxAt1{Wnr1p!zMfN3l?V+Kq1pJ8MK(Hm#ZCTxJby*)#k;w!MAfPW|tgOofQ!?iQ-z;Ymi z-dwo`X2SqR7=ScunFuj}FbF8f3WM1o!(tWxqS^)oCm zg8;~d$NM*c3IR|Im~~%_5u^}g2*@SR9{vIw zWN)Pgw*Af9e+&!n{s%`X44@eB@Zdo(4bliQ1ZE@13o!P(Yq!8O3}8(Muz&&u8p!55 zH$H*oK(-S!0F)A=s;afx*n~_0Ivar0Rsa7P(+=Kg9uSD P00000NkvXXu0mjf!I7gD delta 538 zcmV+#0_FX`1G5B>B!32COGiWi=K$&e+t$PWng9R*32;bRa{vGf5&!@T5&_cPe*6Fc z00(qQO+^Rb1rP~24LyycMF0Q+z)3_wR5;6}lTT|CQ5400FO8GN)FhMCBovZ3OlZ8+bDlS~Ra8U(6L_dOi>B3dlrMgfMDTSFupoaK|Dt}^YpxlG!Z2Z|@{PI^`!E@~~F0K|)Q5ik*+^&I-ocWvNc8D2gB+A7xsP zFmk>^^H+ylzJD$OG0?nvwZw; z7MEL)(r#ePW+>*Lb6_8GQQhYH)iE}z43J9tDR1txH4+(Y;^yiq02{R(nw_82s|_mO8x%ejuyQF*G%Ks%*zm c{$Kn7xf9y7aCMv1#sB~S07*qoM6N<$g5(ACegFUf diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/advanced_alloy_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/advanced_alloy_ingot.png index 7cd11339863beaa100a54783cb2b5ead8909a209..b000497e86238b52f61984b103b0c21f24b71a71 100644 GIT binary patch delta 289 zcmV++0p9+y1>pjaNq-Rl01FWTe`H^g0002?NklyQCzP2LV5yKSwbHOc2t94v-CD1ZfUvN@n=|?lV*x zKVTK&1=Aq)r&sS_U;=TzT)hRCzy?5aFbvXoZ02gPEAC!-1%ELB1kepZ*K~K|KCniR zt>O~GP*n^JEKnK@K!)&WtAW`dO^*(rW_bDHEtn4jdN%q{76gC|czNdugSd(eSb&g5 zklJH=u7lZC_ii!5V?ozg5o`!329OPaITxl01V9?0Ohh_BHUwnL<+Jx0KEM9~l||Kr n3{V7N=>et@ml~$Q1Q-|qT$6+MD_f$300000NkvXXu0mjfJ}q#M delta 628 zcmV-)0*n3O07&)qe)1=)#GpILm4=1>Hg{ zF*o)@O!_0eCHJ8!aZc8lWc}Oe4QF0J266P*p2%{8C!EN_ZEmC z4Atys;DQ7-B7f;w7wKq-?bs{Q(?c@enS4re%*W2ybFzUTU;27+A20iHojiWmTSIPX zoXyvxq~4CPv*0H)?UV6tI7lw^j9ehVoW7E;6+bpbEZ7enES!pzJx9BLsV12McOFS%hmhsQ@ojOR|e39f$9kUH8R$H{hTN+t5H84|miQA$Q zmjqpkBftMhy(ddqxmL$itx86&(qfz?N*NbQ{+#@5oh71-3tRtu1mQc00bCEMOUU>D O0000`6pHR5(v#7&>6q(xv}F7|MkMMktLHAZu{4vI5g*FJEQ|_w$46!!Q6{ z6E`02}b)%^L;@5fQKeA&nrlAisk^Rcb308cY~~fdK%cONZA7c7r7V0000< KMNUMnLSTZTWNwrI literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>(|d*yx2Zv%Cna*uid_V=l=Z*SFc{YcJ1MlC#Nr5 zICuH-yZ7%OJbrxa?AgBAvoGJcvH#ey=dW(pYoA;WbO%dGkY6x^024p2&90w7K4X%% zyNkBU&Lh*MS43W4z zwePl2lY)rr%5#l7Bv&p_Ra|)Y&wqZN)tRr>Ub}s(I_6NFtC6l-Q`|5c#>(jNmJt6PkslPK`%V|ALai<>8VX7sr z5hW>!C8<`)MX5lF!N|bSLf61t*T^Eo(89{t+{(yY+rYrez(90%_Z$=rx%nxXX_dG& Uq#QF=0BT_HboFyt=akR{05qxbO8@`> diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/brass_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/brass_ingot.png index c104d04fe4788b6ca3f2c9ce2af27711eb5c3455..246c0281d35cc9f451a346c591db204c14816228 100644 GIT binary patch delta 319 zcmV-F0l@zA1lj_SB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?@2^KR5(v#7&>55hUk9~hH~M65lUkP$QnE?B*FB#+iw}dTc5)9 zVHkj}iCM}L%7cKv&yJ%Q0wxG)LI=o(FoHD46-;7y_vipr8h<|!l5+slAoZsYZed^o zabBNjhf81sAUPNYY23NE1ni2l*S;{YK-GW^5w)m1_1KVgxh$a R!5{zt002ovPDHLkV1i%sc|QOE delta 582 zcmV-M0=fO#0`mlrBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1DE;6t@{{R32 z07*naR5;7kl21rfQ5431_s)GzG^FFaqzp%Ny+C&m=Qm9Q(l0mg7%~GPFR2b)e^-Ble$FS(b`uQQc;b#Z*L|}dSc!Edwb%>|_1i`nkP=Q`yaG~D&VD5li{qqc zsjMzDGBU>H-do{VSF#`ghI(y70F;4~=PzIdL)g0xkzJg^U2%vsx06l1WlQaLJgO;On?w5^AExf(t{EIR z2*AuI2c-;j9PeRza)f<{6V&ZIxDIb?Y+?TCHAZ zOKbcLbFW5;wx#*}<}p%A)C@!q^bjuP5WbJfO@Wb=t3Dyi`qjd>FEcdljuUM=#?tgS zfBTR0qD`6V@;oLtkCZhiFNL$3!BT=;K15Z!1T2B_fcolt%BxL;!Yyb6<@9STH;t5A zk-7xH;&rkQY?7xUyqJ^3BASWkEExjwM?5&17k_%T4Z%PnY_$3PrGHo70UWmC U;wC_z1poj507*qoM6N<$f?<;phX4Qo diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/bronze_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/bronze_ingot.png index 28abcced65e10ab51778af492547514b57b0d9a9..75d50ffe2522757181d7ad8ce5be845c2c490b80 100644 GIT binary patch delta 348 zcmV-i0i*u&1or}vB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP3`s;mR5(v#7&;)&UFAOrL%DFk2&J(CWDU+b;$Zs9^B)Y=%g(~} zVHkj}NmN7<%7cK{Z=RzV0wxG)LI=o(FoHA}lvXjkIK2%jjej3Vn0kR}kox_X?=vu) zs|Yo4f4aq>Y#+|><=JhpBsu_T;*nMbW01zpJ9jbgF#llKclj9u3seomXN(+GQwP7 z0Z;&oo##JY8zcC!S`3B5he*7^bJQiSvpc?>lE=&^$fHXpxh;)E#2*{S3&p$J~ u{`3e73pa{a!156_>O@j$AFaQ7qkAYhJq@?fw0000I47) z0su)wK~y-))soFi6=4*IpEK{&t+comMs8~CLl=fwaJA?gN`$)*0vCn-2ek>oRc)ew zAgE2tf?Tu;T1YL5P%lwxnuTCqZ<=CS&gi{&#+iBNZ4nh&(YAi8!};-W7UzNgCSBP& z)0M3=f2;TQ-=J^v*_K13Hf}{@%*9JrHv>yfYeyohq0VfrQ3xW!x%M^$Meuos^sYvV zv*U!m%gy`GxOU}w+G*|Z1mJROt+5m+g!b$SRH}ls(}-7iMY!yeb{cRehe@TYh=U@b zyTGjnIqvipL^`vzrn2LbONKSMDDOc2t9 z4v-CD1ZfV)OK14>;R93}Kj0G(0Mj7#CpYh4U;=R-UcLsGzy?5aFbvYTd+`deE1urI z!@vSn12#lnR}1bEWCMReV%LtGVEFtVBF8I;kb@fl0x&~B09_Lds2S)%Sr7m=;Q7Nx z43hG4U;#oJL27TDIs;}WHrF!3V?jbm9&89G2Cz97rU?W<8lg-?IzToAWXp?t4;enZ tc@33C)r1UC1Yzj`rV*E>!2}o>0J0T^_FN?ko&W#<07*qoM6LruV1oUFX^a2> delta 518 zcmcc4w320lWIZzj1A~Sxe=v|@Nq6*hWMJ6X&;2Kn706de_6YK2V5m}KU}$JzVE6?T zYIwoGP-?)y@G60U!Dsu z|KER~K73eQ-|_MN`}faZym;{N@aheJe*HeUa^3F5E7Eo?T0XC)<-~@q7xy1NzIprO z+js7qyLj!y>G`$IZ=O7TaOvu!TeokWIe+`?h3EGlTs?m3#;LO(-o1Nv@BZb3N0+wt z+&zEk?9RQ)V|wdO$s6|4+|cpEol;KX({{s|Gz;==<0h}``^xNmvs8q za4CQBfe)!3=5v}SEC_R6H8WxAiXC^Rv7F_5^2q0!@9ik3ozcJ7nOD_+XjGWY*Yna; z=J5nS)eae%bj#;2F5l2>x*S=*<8*+;dPN=M?Vi`azevwM{JGWZtjwCf6)W%E^|xV& zZ((1l;<0-V&{e7>t`Q|Ei6yC4$wjF^iowXh&_dV1T-V4V#L&XZ*xbs#vNk?&mmnJm61#We5X1ZLzrcJ!PBt(N z0&oLB0A>gXplgBw6(u<+3j)9fynX(HL0D1(EI>#jNbQ;{kHPF^=N~h|W5Gm52y6%_ z2Cz97rU?W<8aSa$L^?n=1Z2yZC+`>@eE15LMb(51Py}J=0j3d`rojXl7y!itgtr~` R`y&7V002ovPDHLkV1jPbbYcJi delta 579 zcmV-J0=)g&0`LToBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN1AC1^P7=>Px$ z{YgYYR5;7klFdt0VHAg-bMLLul$sRDAZVO5O&S|P5YF}XAlPh_7Kta*RPwU~ zp3BYq&$xR1T0GI+R~CRvCz8gp!A9uq?!>ODA$}-LdG0Mi*(KiGiu-AR1IB#yDQIx4Ab*nWr{Y4}exr2s+e`m$z5p#l?QIc) R+0+04002ovPDHLkV1nYe8;bw{ diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/electrum_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/electrum_ingot.png index 6696464d47cabdeb87f28afd25b1c1ec113ddcb6..628c4ee5fe002210f868a0e427b073d2ac9504a6 100644 GIT binary patch delta 320 zcmV-G0l)s|1lt0TB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7&@RRM(sZcL%DFk2&J(CWDWj~ieUQ4r8f-K6VJl+ zVHkj}iBCcU%7cJUFK(b10wxG)LI=o(FoHB^WMnaX{dgZLjej3-^FzD>Qon825e6m@ z=lRX;a0zSxBnQJFjjLBL2D{?Qtyc^zP&HsfB-K6PEd}mgQOTgSb&g5klKxho`TuSw?Aft$AX!*5ZDk< z3}ACEOcMxzG&w?e73pa{a!156_>O@j$AFaQ9qorMsU SG$*D20000%B?0_OyfBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN189_s~QPXGV` z^hrcPR5;7klFdt0VHC!H=e~CwQj4LIv=(NO3Pw%Es6nKQil9P@BKl(XEkp31Xw|k= z80D_jP*96NlA*;^R)%8Qq-mqc+-aP-b3fkuwup*8q-{N`!#O<9frlUbHyTQJn4xrs z`E_sqf6er5K69#N|c#$3NOC2Ix@rrV7|5KFjlegHvHD=&~}PO`c(&DoRP6h3)o zIFpy}0oN|K8%u#gICr`a6>A{ToTOBEfmc~3(UQbj94EfMiI^C!Ug`xf!=;34sCWv1my-o-g>aYq-S^xK07f zf3gUI63*u;FqBM;_fE!ciKAY3`oY67kQ`03x(7Z{`EMFTcvga7~l07*qo IM6N<$f{1$x!TZ_s}bhH~M65lUkP$Ql@3?ZEWc^M@H^Z)kQ@wyG`?6@19k<&@y`$gKmgqkbWQKitO08T*~%_w096I_GRO8bNA*t~?B8%g)%v z2#%uBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RV+xAn{l)?*IS- z14%?dR5;7Ulf7$GaTtZ4_uk*ly@@f@Vy&n|YbjEpROqHq7bm;44dS4Gf`W^avr3mP zwRBK$a&Xbb3LX7G&_P9^AYH6g38u!RxyjA_d>uqkYDMVa*`J34ha;-Wc4D#3{Ij4w zQ_=d>f6Au1=5J8r##u#`lo)sN9QmGMYS$-KCNAVdKNs#lKCYVtwYe#^uu)qmoxcpS zhp7D)&l@7{2DqoD2_DP^?&*sKAP`lhK3maDG7=|c*VHAXSjMt*#K{I}cNNbYBy6r? z+`Xh7pSZe0uy~I|LXq{^DJ@M-L+?qVa0Schf5UMc(j*{`KI57)Y1AR>`qUpUV8=F2 z*F~E`xK_oWpuOYh#v-P40^1nkph1#+!Ep}Id_50-fV5NG;t-|Xhad#q@bOox7(sxH zG(SS?#cjOdG2-Qih;5PP3)p=}Q7<72ee_!k3W~N`5N0H)ViYBg-eYooct=Kw-aUdH ze}ibjC95?dYGI@wJ8e_+deHR-ST?9d4*Ag_czKu7=rsA_FtK@pm>g-wdb*D7j;M#y=kwjFGhv(!tc-@1pxIc740;9BH-}+*3g!M|MJG~ Xi*W3EdGtgS00000NkvXXu0mjfEv_0K diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/invar_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/invar_ingot.png index b033b12849578256482ed2825fc2701cc1635745..1edfbc59e6d8ee716087ad2c16068faa7f5df11d 100644 GIT binary patch delta 320 zcmV-G0l)s%1lt0TB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7&;&@HuOITL%DFk2&J(CWDVx#mSFnEl`9MjX3T@@ z!!Q6{ldPm9lm`KipFc-21WXXpgbt7mVFYO|FD_xYd-onx8h<}fR#pPjAoaU%(52*3;h0d!3;prNA!WkCSgfY&cyGKh+cg9Qj_1gSlH_AHovVA~!>cq}L>D1i+D z#Q-+v!Zd*ZNI4^viAV>?hJb9j_uwAG`?v3*vZ$Jn0g50jJ-{^L(lnR=0|Nk?*M!j( SCaZ)10000aO4Q{gCO?LOYUk}BKKZ;lTPQwiEyvy1au5(Wt|SSTz2(COG@G8X&$2h7ae#p!kR#>%=J3(PLg zYXC_YJiPaSWYWa4#;DZlcy5nOCPTGaA(gstwAtJv0KKuYE;73~uSZ7GOy{R*w_6Mk zpCy~MD3>evzQ^e37|muAr8Mt86p3Sv3PS*@fAu=1Bnyv!xs307 zq|<3u*VgbuAEgwN*C(-CZF&Qbf$vjmG%&S_301_z_yk*9TR2XaPdg>RAh9Fl#&dXm zpBPQEc>tz~Qi|l6Nkl5z#){nJ7VEV_AVnnu=was3iz3rv5WC&S+@;Fr0hO zobSK)o_hsZmgzqVEQh%;b0rC!P&L#*gP_fgEspU-f?{XqU4N5b2K|u3JEP7Ny%x(o zCT#E*)Gwonu&@-8_YM!}rBGCV50}&D<%s&zqhlIzxSjjsqJ?Hd0s3q-`DecXS?o6c zZZ48keJW8}N>eVCBHlqD7^XSDpBC3vx;xQUf&f9ee4d^w6&^!Avp}Zx;5}M2ImNm6w<BDm}n4U?Peljan>Juhppip)}MyX5*+q5EfdEMCc?MRgNH4lwz1@YPDL_ zXtsVvWu9xh1Bfd02I}4d&K!0tt0|xkx!i7!xG8|wu|ycpvyTOVpQG_A(L_8D2w*=1 z0aS<79T-gjWNsz;s_PHS2pQFrgbAVs4uW(MeFM2E(T>hC{|f*B002ovPDHLkV1fv} B%_0B* delta 566 zcmV-60?GY~1oQ-uNq-Um01FZU(%pXi00007bV*G`2jB!93LrH@!~ORF000ueQphc zeQ3EwvDjoI)@bxXFCSWSuF>3*TA4x_g_-t3IV&UDKExP9mVacE&>E?$@PK_$@XG7< zIFDiI4HxG*hx>Ou_w!swskO#!v!Jxs+Nuaq@k9~_sdHGrI4YZTzj&;484U^>2u#|Y zIJ#1i$z%l1<#JF}Ro12tW9241vIpa-u@B2P{{(x+fN~N%S{0G6`A^iCH zt1ty8*u3~FJJW8F=O$7=Euod6)n}LQdNloKqH9%>%M4MVP&E2S&qvnSzadFQ3SorVguF zRD>vf3SHw9g%tS1&~e+hDhBq?rZPyMLgY9qDU2TMmr~$`F$J0wp-L%ig+pa2$dANg z3Oj0|rY{tl?%h!y*5B1gU9sV|6ttG=rB6ZoRHYQ<8t1!UPq|$?82|tP07*qoM6N<$ Ef_Q}gA^-pY diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/iridium_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/iridium_ingot.png index 584107fcedb611d14397fd868bdfc43d0c8785a1..526bc76eeb3b83ada056ae0bd004e6172e2e988f 100644 GIT binary patch delta 327 zcmV-N0l5Ch1LXpc7#0Wy0000V^Z#K00004VQb$4nuFf3kks%X*32;bRa{vGf6951U z69E94oEQKA0QyNpK~y+TV;DL>+eH6A2t&DWzzC(W0%Q#Vet}^6@X@0Thj#9U>%%Yr zU6Yuc43q}}uO2-?F$7Ey(u59>4PgXnuIuS$c=6y7R2n~!P>=)DAoXjPuVi2XaV{M? z2A9AFKyok)(m1t$y&LR`7q@RSut3#-4bii+g1ZFSK#|6I9FtS`da}g91 z;8=hef(&5JUA&XcR_%5*=5Q&beRGKmS;>}1kh9_xdXJ%O1PE=gGY0>J%y1KoJ#=DcWRhAqh@UsYW9eWi`uktv4Zo0s9Bpj z7chubGj8oxdGY<>$UO_QmvAUQh^kMk%6Iwu7SC(kwu81g_W_nm65r& nfq|8Qf#~e+IVc)(^HVa@DsgK_IcBT?)WG2B>gTe~DWM4fTnmk^ diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/lead_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/lead_ingot.png index b894d47cc6b7101184b3bdc90967ccd3db284c33..ed8c780615deffb4f127c4b9f6f6afa83144b9b5 100644 GIT binary patch delta 359 zcmV-t0hs>H1cC#QB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP7fD1xR5(v#7&<^pQ~y5*L%DFk2&J(CWDS;PHemYNjjIgDPac5l z!!Q6{6E80>lm`KyKYvCs1WXXpgbt7mVFqa~E-GT+938Ce>bMMWhV82&Odn3x$byn6Wtstgr?G>J=yg7M{x*BLf%*}}lj$Io!- z@>vEJs2YZ2M@}(V*_eS9fB;An41mP$-n+-}=ItvmUqo08OoIU201$u~0s`ooU_eVl z8_I$JMo<_iD`2WKh>41V1wa9aPvfiCuNf|1IRj=tcyx~u9t$u-&<%h&7p4gWKpLS; zL^?n=1Z2zI`!^ZBef$8zt=Z>2x~0di|1mqpVcU&D%?3V-y}ep?T0`cw~f` ze3tF4GC>e9e~)zf`uFg}mCHPT z_JTnak!a1G+w&Y9wg`fND2nj?eH?8xI!?GbJIA~Ct906J*4Eb%5!N?0xHUIN7={>Y zIoS760*N-9bB2DDSgTiYU6;&_3`Ngl>ER;LAjbE74v&sViO}oy34&u%;-F1L{53)$ ze>m0{dfh&)R*Uh8aW;!Z8aulTq6jCILMI6T-Jp$*6F!zcaMHd|Ym}Aal{S^u+5#x0 zh@y}n2ymPs+Q%KjewT7}n^V8usH)#Us?vAg$o+R73{{LFnetMd;=% zh=NmRM{(0d99;D;aL7={N{51Nu~OPVDM>152{=`Muesz}TYvR~%gepH@0TMa^k4S! zxdBEn4N-zR5n0G&Hn>(R6}q{+4!s`%E|cdtED7|t z8YzdntAlo8oqyyIFipxOJTewlvOS-QHJ9el+?jo$hbFIwVyRRbHog%OussZ)YMl?B z^9k1U1>SJ}JkL!qD*0RiMCbjJ@AHK#QY_0F+@Bqg2m!JHWCFIXZ2ZON0Ob z0?0{3K~y-)jgw7ilxGx$pZk5I5TOQf;owGR5@sQYh(FUB2x!BkiNQuB#2=&@vT&in zf)vC;_ijqTwpw?E7F?*&XeVSAhS)-IC=Dd06JZi#5}js#>NuHsGxL4#`*vX+sHN1q zy4=gTf1Ja)2i~y`pX{-RPxjci=YjtNz3D${Yv;Yj^;m7};Ey-uUk5%v--p$P$N7>K z*TEHs-kx3n3WYq)%}p#Vy`a6lgJS8GeK3>|00HPee#8QZ>+tcxL#$a7ps6X$?9+KF zDi%m$B0IwgtlxYolc`vg8_74Is z!sYJmod51y2F?yJIWxuL;v#p3?qcn07eCotq^1qK_wGjJ8mOuw<(g({PLP52X4}_$ z2<=t5aPJAmH;4!)Hvfrhg&lkL;HeV$e}?Kxma8Kv09;2ndhr`%bad4I@WpA)^&LaK zTw><&@9b#VkMUMf*(HoITp4;)m+nmd8APK|j4_;vZNt+V5#i#s`-ljkPzc}mb^)kV zDojjF)Y)`&bcg^X5((Sd+KN(&g@pwokqE{Z%H=WutBi$;rm;E+xbRM zJRY~PSd8iEX@bEZ$z&2^3;4=|0mGz})ezyJVN{DpqX SAs}P`0000HlgCCKcPP& zT11PIY*Vo}{=*XCh{ijmEQmS_#6zid(!9Js;KnTIH<0p|qV%tTM$qdEf zGLBp0&h5KgI&;1$)jLoY0D~7!7$F5p3JxDRN-WkuGMOQtU%+*25{WeV`~sWejRb*1 zy;fm-`~lZT9|EY?74f9p0@R_5{C8i_=jQu#Al2fTgrf>1{U z{@P|A=RRR6DcIM2kX-H=9lN?{ZfW}tH*HDs`qe#L*C*5wJ3IDbSBtowjqkh6%`ahv zVT3W79qqfBo}M6`E;Bnbg;WyBJGQrX;&~1xGL*io01_PrY_K-|_`>4iGU-$snaoxe zf95~XxhIR(0hRJ9cC~~M0?(^acPc2U@H|5h)=^4eX{|B3K&{?HV`G9yzo$@GBJe$w zQfRFKs8nns9r66-6aY#IZj3$_*5xbr#ksSg>Fxp{1T{zFIaQ>xu&ZUNw#UTe46x?k z9D5>u3DVVT4~6fCCVNQY`w^>!5|g=EER0#Z_Smhb;!k1w$rw1@V}elscGADAuSX^G US+i!A^Z)<=07*qoM6N<$f}3|11^@s6 diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/platinum_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/platinum_ingot.png index 5c3d4529844b68316c2a8986ad148c50fb2d3c6f..8ca7f408e754fadd3240da1f551c52ff3b4011eb 100644 GIT binary patch delta 340 zcmV-a0jvJ}1n&ZnB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP1W80eR5(v#7&^c|z4$)}L%DFk2&J(CWDVxVreON^{Ra&5+biJu zFbqJ~q^7J0%(52*3;h0d!3;psJ_@b*pY)#8@MtCg9$t!~m0mT3|=fX6B07xU0iAV>?hJb8&^zbgj>!;74vZ$Jn m0g50jJ-{^L(lnR=0|Njx4u>GiySRS<0000 z=gAmZdaw8M>Q2894IN#6<*rIvn;TeMPO)`ceV*0X1DT**>0MJi*U0j6z}%9?Bu8U>XnpOc`42o_w)YR)BNWU1V< zoA~$?pArk$QlV=gy<$5?CXG@sJo2b$Xd&YF21M||K#y=7=X(nRX&J1WJJCZyl4%nw zmu2k5vmzq|@%y*LFGG4d*ee`Y`hGx1HmU;4$ra)+NAdjPj$RK9ia(9*r{H+gCBNW& e{q3iJSKk1mr1L=opO-EG00004NF&x9>5eM+Ct2VHkj} zNlcI*%7cJc??0j#0wxG)LI=o(FoHB^g!?hPc=HY_jUPye2!Uyk`h%y=GcbWTmu}yO zOJD;aIT!|MT)BU3FW41#9zSDXfvN!;qNl0|cL}nAAhF{YuQB}k`4h}%V`m4`AOJT2 z1Ym}M0J14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>+iq+Z{NKy@0<1d?YoCBUf+E1c;UvKKY#z3zkd6yl^bWS z*ih0nb=kIkTMwOBxoz*|n|F?$zq0Sd+0yQ5_ny8udFAG%8@CUgy>$58Fdh=h+RfVRobc9iyJ7^>*?YcB5`?Y z-)*5L1rgVk=NflNu3Vt1xbW_u|NK0wGheN}cKcR!+Ih7n{0#eeCu}(dy@`}bw`-g|59FEN#`H`7$kNxt8bLq>MF=F$sC z7Y4TUsy{qeo3^83zWd42D^GPxCU5=s)$?f9r)zb4Lf*eqe`maw(|VfXPCcN*R7+eV zN>UO_QmvAUQh^kMk%6Iwu7SC(kwu81g_W_nm65r&fq|8Qf#~e+IVc)(^HVa@DsgK_ TIcBT?)WG2B>gTe~DWM4f?(Xfz diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/silver_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/silver_ingot.png index 19302bbe3b6b186ced6a34f37eef0ffa28f7ac37..292aecc37dc030d3de4c313b847792db1a96c584 100644 GIT binary patch delta 321 zcmV-H0lxmZ1mFUY85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkO^+`lQR5(v#7&@S9+qVB84CTTBBb3GpkTtmK=z{69x9>8fI6J`gVHkj} zNrZ<7%7cJ6U%sFi0wxG)LI=o(FoHB^+S@aH`1uPejUNcGvw>-l`km)5GBANSciz5( zOJD;aIT!|MTzP-uG}sk4pFf8f00QWSpldpD{{dJd$X0oAQK%{ggaIG`GX$Hahc91) z)flTPGl=l?hJb82|L7sZ>vtcavZ$Jn0g53YEIq(9;?gvj00RR6m_m!f Tpc*Gf00000NkvXXu0mjf0SSH% literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>T zchOea`Gf<=;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^kJx2|RHdDoy|{rwy`Cv)Yc9QT zbYWmiulmDtwP`yl=DVLPz4BDIWb)R3Up@Z=IjyHD?$iT1Otr){ zq9i4;B-JXpC>2OC7#SE^=o*;o8d-!GT38vITN#;a8yHv_7>Lg9o`a$xH$NpatrE9} Tlw-yUKn)C@u6{1-oD!MEYX diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/steel_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/steel_ingot.png index 4c30ce31f1b4a10628c07c429a96471568c88a9c..3dc2047dd7be4a27ac1ca114e68cf383f871a944 100644 GIT binary patch delta 310 zcmV-60m=Tm1m*&e85ITq001BJ|6u?C00DDSM?wIu&K&8HArq4j0TqAyNkl_^IUpQ0cXkcJU-g#`~DC@pKsC`HAF)>NfH>xkuQJ7 zwr#4oKg%*;j^kXmZG(Rx2w+`TT0Dc2VHngSXv1yuA5gCAp5acWgeBbB29SWGH2`tN^iEkqAZQGXm_p0etRpCp}D~J#kaowUQ zs3Iux?&Cke*Kl2zLhzJf7+_fzzIv2Y4wK@45aK)OmjJi{FIp0SwH|&bdH?_b07*qo IM6N<$f`2)Pvj6}9 literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>| zNJvRZiHV76X=y1fEzQZvF)}imI(2GIO-*xib5T)INl8g>Z*O*Xw!OW5et!Of1q21sKVp{=Qk8aU_TmN#^?15ChDcnV+IN%hkb;Oy z;7;+IF3}mHOFY*8{{Me|Nbf~++x&F3nLLX14llO{I+)G0>%D0CTtQ{U&5WKb5e}vu zF)JRWaTb+KS-onV?!r5^zm}O+?fuwjFomxt(=;b}dYNj6jLh*l#a~wDi`?XAFSIFb z{U_rjsXE;;KL4V1_Tkr)y{2+stJ@Ru{+;?eVN;I(nI^~20^Oxr;u=wsl30>zm0Xkx zq!^403@vmG%yo?{LJTdejLof#%(V>+tPBi9XLrv*(U6;;l9^VCTSLk*V+EiF22WQ% Jmvv4FO#q4h!Po!* diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/tin_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/tin_ingot.png index 84dae2de50d6c8144a51995cc32829cd02c17888..397dd6c5839e85bed0da42d1497bda40c3edf86d 100644 GIT binary patch delta 298 zcmV+_0oDGH1jPc7B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO+DSw~R5(x7lD!IpFce0wog4(gS)6?WS9hP<-8Trhh>IYCAmY~Y zUGI%C+IDRZ#QdHwA%^~kx~`un(zOIq-{J~+o^#!G9Ti1ky?;x9FNI+!y`62_P9gmH zCi%D_0pzkQX`W}9{!ARlTw}d4h92k)!(b=wz?>F{P1Eox#&O&OfFI&ZZQHVlU6Uk{ zRdfUZ4Y`x1Y2r0mmQfT%+y;CHX`0$WTp*67f&vjN%ff-6s;a>L1r6~7^tdVkh|)aX wfg6Hd`o5=iT_a`oEV-Np^*yNgPWmN?UMJNR5;7klFh2xP!xr~bNsswBCWw;;41#rfry~bP{l{+duHGyWO5Ooz$gmZiDI!; zH1Q-k>ENQEZRxb#qs`u|y%uXP_;1Q}-Nbd>2!E|^ADfIw-3ON^bG_crKH>Kl1in>X0s@z zxL&UqhQaA{BA?F#(ChV>PN&}iAsoj^ip3($W|Pb1LMD^p<>lo8tdv4)jpuoUVR%=& z+wDk8DQPqs%w{vH)#@+ItJMnM_eqk3TCK+Ue|#nkL!u~Rzu%MATBEh5QmL?5EU+w# z^?Lp8un?5XWuhno;CMVDr6i7Hq?7=p0S<=)rfFhX7Msn6Mx%k&n)CTg5Ci}yrBF&C zgg|Re9LESD-VcOfc$a)*isSgiHy^d*`%;$4Tr4mv~ zNR(0pLBL|M;P$2Aa43EoB-^%=R;$H!yQNSluv{+DS_3c|js6(8hlOq1$<3f=rhm77 Y0%dB{-pELn761SM07*qoM6N<$g1aQ@@Bjb+ diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/titanium_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/titanium_ingot.png index e6fec857642a7ecfe57b5825496ac6f19524653c..84e7c97fd173e1dfecb4a901d1af2e1bad761b2d 100644 GIT binary patch delta 322 zcmV-I0logY1mOaZ85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkO_DMuRR5(v#7&>6;wAKGX7|MkMMktLHAZzgUvIf&fk6mPlj`D=-!!Q6{ zldv#9lm`KC-+n|f1WXXpgbt7mVFYQ;$_!!n^5q*;8b9FS;R4ej^_w;yVqgMs9zJ{y zm%s)QnP3@lI@3_ym+%S(dU zAWi4a-(q<3wL?@L15%Q2`qQ ziUDK;V9teU0s)XlC=-zmkPQLZa^=b$hBt3MKxI)iAp;^5L0Ec#X~d;zFaZVz04Jq| U$Cb;{dH?_b07*qoM6N<$f)q4-3jhEB literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>UJ$UH+w(Upm+`sfBX$`fRcWVYFK(bvucwP+h{WZo zeYb_06hvHCo@?A8xpIN3;=;Rs{`2#!&V04@+U;A_Y3J3R@H6b=ov`WXr%aw}a~4ln z5w_XzLdXRtk(j)YvdylR)>BhMuTNtr@86f%d+)8azr<9&-b_lc{hjezPU~rkJN1ALQ!R0g zC`m~yNwrEYN(E93Mh1o!x(4RDMiwE47FNdQRz~L91_o9J2BNdO=b&iF%}>cptHiA# T<(RPoPy>UftDnm{r-UW|&OYy_ diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/tungsten_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/tungsten_ingot.png index 416a24d580b185b9533f45d505595e55ff744797..90bdf6ba72baf69c9937e59192f55e6baa768f22 100644 GIT binary patch delta 342 zcmV-c0jd7n1n~lpB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkP21!IgR5(v#7&<^zL-RifL%DFk2&J(CWDQof4q*D$^=k~rj~s;S z!!Q6{leCm1lm`J%pFKx01WXXpgbt7mVFYQeuBv9Zb@v`r8h<}fQ&s}gAoctA?qy&W z77=au%fQTFVxZ6P_WgUXBsu_T5*88!W01x*Yt}HZad0wRx^Rwx1*(Q&|KXzyj<(it zm%wZS0g%|`%U2lQym|@di-?JXX%K)L00J;WKmc7645(>pL0J$04g(D>T?QdxVXy!w z0P$&j_x3Hr#ZPl*!0bm4?lHn+0cHrg0WjynG=Ts}Bb13q2grtiY`JmmGQ-awKcTXy onvemCAS^w=G~&`Um;eI<0Idap7+VduZ~y=R07*qoM6N<$g1r`kOaK4? delta 560 zcmV-00?+;N0^9_UBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IGa0x$`*HvP z0qIFZK~y-))sj6=Q(+v%f6voflZK^bGF?Q0wtyglFHA}Vo9?W94tGC*v){v@!Nfs~ zF?KSfQA%4{iVC&RH|}jq?|ohz2pUo2DrfrV{PW8h&VdV~$>~`;IX!F7`_8|hv-{rt zMWV4Nf5sTQ{^U^%I3CHY8gU*~VE4dfV=LDH0000`TS1VCb!FJET(^8OW=&m$-Xra=I100_Vg0RePPFrc8S1!X}1I1I#O6&OTBM8E=| z0K}*9&6_t24^OUL0JEPyxXlQU1(+e|2Ed#P(*yz_jZh{c9UvP5vgOs|2Mpgne}KxO oYC;Amg0S=e(}+vcU;+#b0AdD$9J<%=Jpcdz07*qoM6N<$f|L({R{#J2 delta 569 zcmV-90>=IE0_6mdBo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~=2IHUOa~r}qE= z0rE*iK~y-))soL@6Hyq&fA?luYe9)tL~9o*Nm{goswFlHMXX8#?$l*p!WZxjT>BWM zsEE`mNH=k#FqYVM;#gDDVAC|o%ygRhbFYg~#HzT}v-&uP!-4M{_-~NS<#jff*N1uI zZ>EF$f7wQ(8(167Ju-i4_^mK*>m~q77<~P_E`Ax(hE*1E z9BU~hN-3J#O*X7DQupGk8@Bk<*nSd5A4bQtP~mTr{#|?rskiaimyI=%00000NkvXX Hu0mjffg%xT diff --git a/src/main/resources/assets/techreborn/textures/item/ingot/zinc_ingot.png b/src/main/resources/assets/techreborn/textures/item/ingot/zinc_ingot.png index e55ba6c0402d5f7d1bea3b710955a96b19563bcc..da6691cec107e112f500d28805aa087ea31a1ec4 100644 GIT binary patch delta 313 zcmV-90mlBh1lR(Q85ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000XU000XU z0RWnu7ytkO?MXyIR5(v#7&>6?;_3fE7|MkMMktLHAZsu)wgl6+@7`nx@(qXU!!Q6{ zldQBnlm`KipFTt}1WXXpgbt7mVFYPTipgO3_~`>w8b9FY69Cg7_4^L(VqgMsu3Wze zm%s)%(5 z2*3;h0d!3;psK76WkCSgfUn=aFmQA6fCUI?1gSlC@-UcPlwHXPj|FW_U9cgb7{KOS zm?jVaX@oKn=>XXfkS$lQUxtSV2q0@h1}K8C^Z?U{OVb%(0t^fQ#aV{`B6z>#00000 LNkvXXu0mjfKUs7+ literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>EJIG3VFspa1^-`}pa@#2H;5KE8kb_T`gjkGAjG^!v}Rt-Cg?-?D1m z=9Rru+V&jWe&WoLy$5&Re|Y!mjZ5b*o#~s}{^HfMn|H3=dvNFSwF_6SUwr)Z;kk>a zFJ3wK{=>URPad2)cWmmMzH2uxA3nbS`K#NuQJ+PD?qDei@(X4VVB+Vs+4U31XH4>T zchOea`Gf<=;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^kJx2|RHdDoy|{rwy`Cv)Yc9QT zbYWmiulmDtwP`yl=DVLPz4BDIWb)R3Up@Z=IjyHD?$iT1Otr){ zq9i4;B-JXpC>2OC7#SE^=o*;o8d-!GT38vITN#;a8yHv_7>Lg9o`a$xH$NpatrE9} Tlw-yUKn)C@u6{1-oD!M Date: Wed, 4 Sep 2019 11:32:15 +0300 Subject: [PATCH 13/17] New textures for nuggets, plates and small dusts. --- src/main/java/techreborn/init/TRContent.java | 2 +- .../techreborn/models/item/emerald_nugget.json | 6 ++++++ .../textures/item/nugget/aluminum_nugget.png | Bin 684 -> 270 bytes .../textures/item/nugget/brass_nugget.png | Bin 728 -> 273 bytes .../textures/item/nugget/bronze_nugget.png | Bin 729 -> 283 bytes .../textures/item/nugget/chrome_nugget.png | Bin 695 -> 272 bytes .../textures/item/nugget/copper_nugget.png | Bin 729 -> 270 bytes .../textures/item/nugget/diamond_nugget.png | Bin 661 -> 240 bytes .../textures/item/nugget/electrum_nugget.png | Bin 722 -> 273 bytes .../textures/item/nugget/emerald_nugget.png | Bin 0 -> 233 bytes .../item/nugget/hot_tungstensteel_nugget.png | Bin 390 -> 272 bytes .../textures/item/nugget/invar_nugget.png | Bin 653 -> 274 bytes .../textures/item/nugget/iridium_nugget.png | Bin 376 -> 291 bytes .../textures/item/nugget/lead_nugget.png | Bin 706 -> 285 bytes .../textures/item/nugget/nickel_nugget.png | Bin 719 -> 284 bytes .../textures/item/nugget/platinum_nugget.png | Bin 712 -> 273 bytes .../item/nugget/refined_iron_nugget.png | Bin 706 -> 274 bytes .../textures/item/nugget/silver_nugget.png | Bin 692 -> 274 bytes .../textures/item/nugget/steel_nugget.png | Bin 687 -> 289 bytes .../textures/item/nugget/tin_nugget.png | Bin 670 -> 270 bytes .../textures/item/nugget/titanium_nugget.png | Bin 700 -> 272 bytes .../textures/item/nugget/tungsten_nugget.png | Bin 704 -> 287 bytes .../item/nugget/tungstensteel_nugget.png | Bin 707 -> 268 bytes .../textures/item/nugget/zinc_nugget.png | Bin 633 -> 272 bytes .../item/plate/advanced_alloy_plate.png | Bin 573 -> 477 bytes .../textures/item/plate/aluminum_plate.png | Bin 545 -> 461 bytes .../textures/item/plate/brass_plate.png | Bin 743 -> 485 bytes .../textures/item/plate/bronze_plate.png | Bin 723 -> 476 bytes .../textures/item/plate/carbon_plate.png | Bin 533 -> 445 bytes .../textures/item/plate/chrome_plate.png | Bin 590 -> 473 bytes .../textures/item/plate/coal_plate.png | Bin 532 -> 471 bytes .../textures/item/plate/copper_plate.png | Bin 671 -> 481 bytes .../textures/item/plate/diamond_plate.png | Bin 748 -> 476 bytes .../textures/item/plate/electrum_plate.png | Bin 680 -> 472 bytes .../textures/item/plate/emerald_plate.png | Bin 755 -> 488 bytes .../textures/item/plate/gold_plate.png | Bin 770 -> 490 bytes .../textures/item/plate/invar_plate.png | Bin 569 -> 486 bytes .../textures/item/plate/iridium_alloy_plate.png | Bin 379 -> 468 bytes .../textures/item/plate/iridium_plate.png | Bin 418 -> 467 bytes .../textures/item/plate/iron_plate.png | Bin 583 -> 452 bytes .../textures/item/plate/lapis_plate.png | Bin 752 -> 473 bytes .../textures/item/plate/lazurite_plate.png | Bin 634 -> 472 bytes .../textures/item/plate/lead_plate.png | Bin 631 -> 460 bytes .../textures/item/plate/magnalium_plate.png | Bin 660 -> 446 bytes .../textures/item/plate/nickel_plate.png | Bin 686 -> 473 bytes .../textures/item/plate/obsidian_plate.png | Bin 686 -> 463 bytes .../textures/item/plate/peridot_plate.png | Bin 765 -> 486 bytes .../textures/item/plate/platinum_plate.png | Bin 658 -> 481 bytes .../textures/item/plate/red_garnet_plate.png | Bin 724 -> 483 bytes .../textures/item/plate/redstone_plate.png | Bin 569 -> 469 bytes .../textures/item/plate/refined_iron_plate.png | Bin 585 -> 469 bytes .../textures/item/plate/ruby_plate.png | Bin 765 -> 483 bytes .../textures/item/plate/sapphire_plate.png | Bin 636 -> 476 bytes .../textures/item/plate/silicon_plate.png | Bin 680 -> 456 bytes .../textures/item/plate/silver_plate.png | Bin 584 -> 466 bytes .../textures/item/plate/steel_plate.png | Bin 453 -> 443 bytes .../textures/item/plate/tin_plate.png | Bin 429 -> 438 bytes .../textures/item/plate/titanium_plate.png | Bin 584 -> 467 bytes .../textures/item/plate/tungsten_plate.png | Bin 639 -> 469 bytes .../textures/item/plate/tungstensteel_plate.png | Bin 644 -> 473 bytes .../textures/item/plate/wood_plate.png | Bin 721 -> 517 bytes .../textures/item/plate/yellow_garnet_plate.png | Bin 724 -> 479 bytes .../textures/item/plate/zinc_plate.png | Bin 580 -> 462 bytes .../item/smalldust/almandine_small_dust.png | Bin 359 -> 345 bytes .../item/smalldust/aluminum_small_dust.png | Bin 320 -> 347 bytes .../item/smalldust/andesite_small_dust.png | Bin 344 -> 335 bytes .../item/smalldust/andradite_small_dust.png | Bin 358 -> 343 bytes .../item/smalldust/ashes_small_dust.png | Bin 342 -> 332 bytes .../item/smalldust/basalt_small_dust.png | Bin 320 -> 320 bytes .../item/smalldust/bauxite_small_dust.png | Bin 360 -> 347 bytes .../item/smalldust/brass_small_dust.png | Bin 359 -> 346 bytes .../item/smalldust/bronze_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/calcite_small_dust.png | Bin 362 -> 347 bytes .../item/smalldust/charcoal_small_dust.png | Bin 329 -> 345 bytes .../item/smalldust/chrome_small_dust.png | Bin 350 -> 344 bytes .../item/smalldust/cinnabar_small_dust.png | Bin 362 -> 347 bytes .../textures/item/smalldust/clay_small_dust.png | Bin 358 -> 347 bytes .../textures/item/smalldust/coal_small_dust.png | Bin 321 -> 329 bytes .../item/smalldust/copper_small_dust.png | Bin 360 -> 347 bytes .../item/smalldust/dark_ashes_small_dust.png | Bin 323 -> 325 bytes .../item/smalldust/diamond_small_dust.png | Bin 361 -> 340 bytes .../item/smalldust/diorite_small_dust.png | Bin 361 -> 338 bytes .../item/smalldust/electrum_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/emerald_small_dust.png | Bin 362 -> 337 bytes .../item/smalldust/ender_eye_small_dust.png | Bin 358 -> 347 bytes .../item/smalldust/ender_pearl_small_dust.png | Bin 352 -> 346 bytes .../item/smalldust/endstone_small_dust.png | Bin 367 -> 338 bytes .../item/smalldust/flint_small_dust.png | Bin 333 -> 334 bytes .../item/smalldust/galena_small_dust.png | Bin 364 -> 347 bytes .../item/smalldust/glowstone_small_dust.png | Bin 294 -> 346 bytes .../textures/item/smalldust/gold_small_dust.png | Bin 359 -> 334 bytes .../item/smalldust/granite_small_dust.png | Bin 357 -> 337 bytes .../item/smalldust/grossular_small_dust.png | Bin 360 -> 347 bytes .../item/smalldust/invar_small_dust.png | Bin 362 -> 347 bytes .../textures/item/smalldust/iron_small_dust.png | Bin 349 -> 340 bytes .../item/smalldust/lazurite_small_dust.png | Bin 360 -> 347 bytes .../textures/item/smalldust/lead_small_dust.png | Bin 358 -> 347 bytes .../item/smalldust/magnesium_small_dust.png | Bin 353 -> 348 bytes .../item/smalldust/manganese_small_dust.png | Bin 365 -> 349 bytes .../item/smalldust/marble_small_dust.png | Bin 362 -> 348 bytes .../item/smalldust/netherrack_small_dust.png | Bin 336 -> 337 bytes .../item/smalldust/nickel_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/obsidian_small_dust.png | Bin 331 -> 336 bytes .../item/smalldust/olivine_small_dust.png | Bin 357 -> 347 bytes .../item/smalldust/peridot_small_dust.png | Bin 366 -> 347 bytes .../item/smalldust/phosphorous_small_dust.png | Bin 362 -> 346 bytes .../item/smalldust/platinum_small_dust.png | Bin 358 -> 348 bytes .../item/smalldust/pyrite_small_dust.png | Bin 362 -> 347 bytes .../item/smalldust/pyrope_small_dust.png | Bin 341 -> 342 bytes .../item/smalldust/red_garnet_small_dust.png | Bin 366 -> 347 bytes .../item/smalldust/redstone_small_dust.png | Bin 268 -> 331 bytes .../textures/item/smalldust/ruby_small_dust.png | Bin 362 -> 347 bytes .../item/smalldust/saltpeter_small_dust.png | Bin 357 -> 349 bytes .../item/smalldust/sapphire_small_dust.png | Bin 368 -> 347 bytes .../textures/item/smalldust/saw_small_dust.png | Bin 348 -> 347 bytes .../item/smalldust/silver_small_dust.png | Bin 352 -> 349 bytes .../item/smalldust/sodalite_small_dust.png | Bin 344 -> 342 bytes .../item/smalldust/spessartine_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/sphalerite_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/steel_small_dust.png | Bin 320 -> 337 bytes .../item/smalldust/sulfur_small_dust.png | Bin 352 -> 347 bytes .../textures/item/smalldust/tin_small_dust.png | Bin 331 -> 329 bytes .../item/smalldust/titanium_small_dust.png | Bin 345 -> 344 bytes .../item/smalldust/tungsten_small_dust.png | Bin 357 -> 347 bytes .../item/smalldust/uvarovite_small_dust.png | Bin 361 -> 347 bytes .../item/smalldust/yellow_garnet_small_dust.png | Bin 366 -> 345 bytes .../textures/item/smalldust/zinc_small_dust.png | Bin 348 -> 344 bytes .../gem/emerald_gem_from_nugget.json | 16 ++++++++++++++++ .../crafting_table/nugget/emerald_nugget.json | 12 ++++++++++++ 129 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/techreborn/models/item/emerald_nugget.json create mode 100644 src/main/resources/assets/techreborn/textures/item/nugget/emerald_nugget.png create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/gem/emerald_gem_from_nugget.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/nugget/emerald_nugget.json diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 45d5c1877..c86773047 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -583,7 +583,7 @@ public class TRContent { } public enum Nuggets implements ItemConvertible { - ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, + ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, EMERALD, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; public final String name; diff --git a/src/main/resources/assets/techreborn/models/item/emerald_nugget.json b/src/main/resources/assets/techreborn/models/item/emerald_nugget.json new file mode 100644 index 000000000..0a5d76c62 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/emerald_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/nugget/emerald_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/aluminum_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/aluminum_nugget.png index 527e68f8ad552bb4d1aaa2cad56f67e1cd1b50f0..f5816e35ca64a71d95ebc14880ed734c653eba9c 100644 GIT binary patch delta 242 zcmVf`MmMsibxw%-w0KaMKFFe^=9X#29H(qIAM>-4H_H$?MlR05jvohmUyg2k}Uikt*X5 zD2qT@mXzLuIG*k85n}}CA5ibOeBnIV5;_-&2qFT&I0Vj?1xshf)G=~xbrmziIqf5e z^VG=@=LsUHDm#-&UPQRPy)6Ki;p}Kc>{^`be_7}PnyL=qb|#a&zP852l@$Q)?Cj*N zjZJaR5keq#E#7-98*V{4h%ijrfA}CfnUfC%ZBzf5f@R3Lcf5eJ zC=ubq{yy!zZ)U_85$AE@aQy-57?FAY?X4}jJDG6sy0$@!q9DeI6DZ0N(A#X9 zhU-_a$j!sTcRi?Aq5Xn+Mwyx{wa%TPf3ddFT2jbJW@AzLuJG~b-W diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/brass_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/brass_nugget.png index df7b10817dbfb9f1d3cf241bdefac1e676dd0bba..566de78c39dfeed0f87a0e67c0080e88a25dbe44 100644 GIT binary patch delta 245 zcmVb%4Eo!@fxpM3;@!6Z&&*N4>y*B z>9Rn6xM9eE2}+{?kY-N{Nd_S~2Znc#4lw+Eb{r~$2`~(>v~F<#)67zqV44uX>Vk)= z6^vWftpnTs^6EB**&81+bglo0H4HEeIDX^+!?E?7!EBJ`M{oXt*|-2!7mxyQ8UXUf v`a_=>&R+Y1)A@J-C@>@9GoZX-3>X*y-;z7dKwBNV00000NkvXXu0mjfkI-I; delta 684 zcmV;d0#p5w0@wwRBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3(3~&@_VR z1RiW`-~h~w$G`u9_kJNBs4`Gx7y@+_sOy^Adl1LN(TJ21K>vVx$EPPxP%NW!k%%B7 z01QLmNL{hKG^9z1b8Bmu8O~`RL7b<_hB!|Ue?e8bb@^D)04c)PH=YZC6*w{&kYa~( zJqta6rm72Yx4$`7KL6|}ADz8P+}YsAE62;l?>5CbM+kuwJG}Q;G28*=Ai_{R0Lwx6 z`2211?lymo);V+b6nC$#7AJG^p`vS>cT=zer4)b#oY>Cjc3*<4c>Zjg{Yfu2Gg3;3 zfActTxc&f5O2|C_7uTN2y&o=NuYTeKdBM}o*L?Z?uW}HVVu%Q-7@AUIGM!NcWy;~2 z?v5BNeaKR9R8>XWMF5&?3&#qes{dP@?KheF&zi~XZ#pw#jCk*9+jgpc3KyR~cTP}S2SeBQD zi1Y04jcKxxb6z;G46bV%W-)T_(G&Lf##n*LbcU+Z%=x_D**PS>|Kt}!2v{++F%S_x zSzQ5OcQQd$8BeE+NS6Dt#TbdDaQeh5d$ZX)i0hlb@xDry4&6)2G;?kMZvkKF5=UGd SCZ|aN0000aKO zlNc1(J~Mp#_POE8lTVFMX*ghl(kK9=*;z-NLBiCF;l=4~40x~KJcr6)0t^EzZ5+U~ zsE8z(CIqm$fYmLNam9fPVB62%yvwlS*dvDJ#~))20}KO>A34BqZ2e|18>IQeFRXUJ z0e)E`08Rry-Z*me4a1fDuW&jaF8~E*M0^I6H;e%T0|3fxH^kNfVJt3_ult?XXZ>7Z*nz=&uZqtGjpEbIdc2%J!&T; zaparzdko5XY}io{&-k=pRt;IC*rDVj0~vi3lPB zz%T?3)D`n{LzQ_Epq9+1 z=dP0fdBNt!I;V~wcT=zer4)b}oZL<6w%_2Kjfh=~R#inx2`5n11E6oSZCft<@QcjP z4H4&gyECH6M$UQGfn{)A+c1rhI}aZ5c4veY7*D3CD$OpR*W26s%y%EH6GFg>p^brv zuySMpfd9s0RF%G+00000NkvXXu0mjfjTA*- diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/chrome_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/chrome_nugget.png index dcd8a4cfcb1e1dd1f1c9d4ba4b81b893fb3f9582..87f73e2f4a63ab1851c118f2c020fb508d004a07 100644 GIT binary patch delta 244 zcmVxD@CgVoeERT#;r-)hP#H{sVSuHL18tZVl$8S0gaB3-9QpH= zao?hqVB4=9Il-`h^*V;c=31;_fMLM#BL^6ct=|l0gEW7B{{hU#1+cn+6oAtJkT-6e uI>Yev_8pwg#|uD#84;fW zMZ^T+6Qc=8To^So$@HrpE_$Xlh-Xzab*j(#?v;m6o{}5Eiy?#nK#GA76RJvz?YE+= zAVm-Ze<@N%08oIz+#JC-Sarl0QET{HRo&pdrwW1G2&1yXImffrRSZCkk=JWqu-10w zo+>?6`p%JOjy%uFtpzc>{O|$qJwW?_TEoJT!=xC{iAh8d5diwmF`H-1?CVo{&$+>X z7$e4LTS1Ja3=uIFCxWW7bZ0S5E1bW1O#otof7xCS-_#h>vd}3sRqenn-C0aW7fy5V z*Z_bBw{EBTtCz$WgL4kw)L3hYDPpFSod|uk09b1~^Va4j$IqYT#l8E<$b`JhsH^hN z6k>vu+Qd^hQ;7&)KYk)qHB;c;d&F3b7)*PB(tBjm|ICdm^62g&-!?X=>zcKdH=MYB ze_5t=Nf8mjr-*v**&P>TP8qXTqphFx59}xFm$apGa6Eca7YNDOArH?x+*D}hR3g#*%=Lq33kT?s!BQG z^ZnPaJ?1CND>&zfDWYX;M|JYh901$9yQnI|@wlrLLp!#nX=qa7)Zs&nisBE%=WpNh kKl!+KFOm(z96aWAK07*qoM6N<$f|BSsU;qFB diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/copper_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/copper_nugget.png index 177e0c231c2e011ab0b79955838bd8d1c9ec29cf..0061a0469381cac6deb44ff64a5a2e8a23e9ffcd 100644 GIT binary patch delta 242 zcmV zK0Ut0&^2c%!?N>_G1N0bX%qm`>~5+B*ZlF}EvO78z%anl#%lpg^UJG&X+i+23x4{f zGOk*)0c`ud6NeaP?mmsx`5=H{!0{so7>=#q3}%BgzyJOV%*F+@4fH)&deDXZ*n!1KC77n&&+v#=g8gr52&4x z#F29bf1p?oT;5~*tCQY zSl!&j0hk#NUvA;OpP2`$3{)A0KwSmux~BFX#PP?|r=*ks`UliIKK*EkVi`R$i3lPB zz%T?()fMw|LzA@BJwNR^ZfNK#CpC z^(^!lnySvg-Mp|;zBuzCOIN-l?mXeAua?WTJ8R;cBZNST9o~Da819&I5MihufSSz5 zSAQh$ZnL}jn9t6g<>$-ii<2Yrp`vS>cT=zer4)b}oZK~Z|L)_Q*oAx-Pdat&}g%o@O4{c(%ssb`gLk+pJ>+P}Tn|&R*+zF%~xV$7JV;G2*?aZQI$#0=Ta0dWaza z5M!jS0^i$Qp0EJ0JK~y+TV;BVt zj8GZ_$V{B|AIfBSlAnfC9aaF+?Dh8M|AoI_fN8;^D!5_jfC)-tfN(y3IDMqIh5?r$ zI1PXS6Ba%O?_>L+JWPPo0FXwQ=3h@gK}9hERs%qR=00f&L+QK6cr}9nK`(&7_Y;>W r8Q%A`kropm0E!KKF)#{1fPn!3TBa`vQBU%V00000NkvXXu0mjfJzhqK delta 615 zcmV-t0+{{q0hI-iB#|)~e-Qux3lRZ-WM7d0000McNliru-~=2J5jwx9a(Ms%02p*d zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0su)wK~y+TeUraWQ&AMh&!6Gs z;D2D^?&iW~qKUDCqlufVaqbl>fa^;hhmMZZcO)Y$osriL?&CCtt zoqqobCFu41de}dbZWxZJ)9p$7@R#g#eo8wCWP5L4ng<<8zndKZ2qJ^t@ktzX97SFy zr>FiKA0UXp+I~9$f8bz_M=oe(YkNeT0ppyTfo!$*k`lPtg!5Yco7^kpH1#U0cXJty z&d$7@5`8(Y3^K^fzE3jXW&nTB&n1<6sf$6Nn->>ab$Xc3>++Wk4?qAKKMn>Z&|xcq zn*iL&Wp&8~&N~&ONGG~oO*sgDmc{1oZUVq)4MR6G6Iyb?e|e{I2YA$I=vX%E0oF|4 zgW(d8Wk5N%i$#4BhWgm)dOEEi*Verc5CTUn>;!R;#6BwVGaW0Bn|iz5P7_@H9EJU<1+h%MNnM1(QBLCIE{YUuC>p z9xZ_}8UPz&U5}l*N!@M-@T}wj{20uXSA`Qd5Xfq;j&(Tr>Fa5!)ariqf#v`JCw>|n z5#46y>_0bmWTnycD;dOq|A|Ho>-pOmA2`so`~$w*iz`_T6yyK^002ovPDHLkV1j=; B6K?)*m<3|oK99zE`%m!(``{Fm4jSFCP0Vx2d0U&Q| vJoJ>|%B@#8osSoQ0y82$1Iio5fPn!3wNp6Y@RsRX00000NkvXXu0mjfx%XQI delta 678 zcmV;X0$Kf$0@4MLBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3y7gIsymH+?( zUr9tkR5;6Zl1+D&pNWzv!MGGc+(;k{M1O>< z`~f#&gkivlPL$xpkD$a4FrwYl-S^(AI_2W_v<{N9sygsiz3+35{C4vewG)y!a?Su0 z%VaC4e=5cL-mGb%7>I*nGzI_)u)eZFP7$vGGef=O(`vg&N{KdSYA1}FmJkA)4<6tE z%#6EF{=s{{5D!!ts4@(Jx(d{FP3=919dzio4#*mq?8cnapG|O ze*v15ka_;I8+YW|FW=I>`JH8X$@cwcoZr}zy|@%ZL`cQZloFHaj4CKo_SftGCLB6g zu~b7%kXE;bgxbzRp(3;}=`BXt${ zeq&Sqe)KPop1k71ubTppb6$M*b~GY(e=S;76)7d0KvfTb-e%jjoVk2MmY0Tz^X!gC zG}*{GFC16~*R>6^7`cAu9=qcaR$wxnp{g`QQG;Q#;t diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/emerald_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/emerald_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..31290025ee0c1d476b1f06af5e4ec263ca671479 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QL70(Y)*K0-V4bInV~B-+vIHwnPk@wgi1(lNO%f7O@ejh< zMHx)H@B99G|6?bsk1>m}0*^DZPkeeO8JibGL<3#I;OXk;vd$@?2>@|KNap|m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/hot_tungstensteel_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/hot_tungstensteel_nugget.png index 6ab6addcb68808d747dcb803b78fa04c6ecfa134..233f6740c4212291491f87376c0ce87af76e19c2 100644 GIT binary patch delta 207 zcmV;=05JcC1CRocNq-Rl01FWTe`H^g0001`NklIO& z;{c{PB+bDzA%N8dZ4B0o-xqa*ZU1s*55w1K+ZbeL?7|ub7)S;jKXQQK*!s<2Hc0c& zM;E|sTmY*JNC7wv0D0r*%ELe>ea7j0yZ{uK5%C#N-Y^CX3;;@6JVY>+g{A-i002ov JPDHLkV1mAuQLz93 delta 326 zcmV-M0lEH=0)_*SNq-Um01FZU(%pXi00007bV*G`2jB!85)nGTsB(D#000ViYQkU`#c}VtJnnckgiY8H%e%d*>EerCzzWtA)-_7F`OmNyc2v-Aa8fnG)PNL{_9&rd}2-i0L zf;sk!SGZ4>I_X;tq-`^c@Y}}Oo8q|sz_0U$W$i(o^sNR_@)z!~0=HkpycAc&cNC@F za{>Oe3Gcm*uRl^!5#LdiJ}U`qM=$WlJvil*BEF*-C12iDGwPM!C5k3dG>M`~6mJi) Y3-nh2XgG-z!~g&Q07*qoM6N<$g2b4M3;+NC diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/invar_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/invar_nugget.png index 3770369c3e26a65c0acdfef2abfcd839b0412642..d168c1f1d86a628ffc1dd5f77ef3c5bba2f37699 100644 GIT binary patch delta 209 zcmV;?051QH1(E`gNq-Rl01FWTe`H^g0001|Nkl8l4gC*gGOS;` z8n0Rm0Mfj4?ehO8E}R6@4qh&B!;k?Jltuv{&F1Eo49dz%40rF|V|e`hIaCG{U>IO& z;{c{*B_+W$A%N8dN(L5;Yc{L{+kWoC1%@5lwlN&owg+n%U`iNp{Kx@@W9v7A*&xkt zU%v*kaRIC@AO+ww0OXCcXU{S`c=QOT^YH>uU`E7eKzYL$FfafBXI?qJdT7?K00000 LNkvXXu0mjf6ogTT delta 591 zcmV-V0YCS?lEsi9EDnxWq*&ft$XHGkt+&7ciB8m>=%&UD^; zwrKI?+;{IepY!A1Cr@7IB%RC4Z2qmSQ7XG6(~H?~jixd$W$HyHw8?Z!=JexNL#p+< z+3lTOsWloWRH@aawEbO*l`Sb%tMX+tkV3g4_n*zT00dD%eQ!Su+G{pV`v(X1jSmn+ z;Bruk064hg?tkB)e+7(lG6VU%u^F{MW*5%CkB+2sphsQJ!$aGrMQi7{4Jt^^KaVOP zGXM`B9=)l>U|lo01wGf-sk8t90a*Q3ZneOKy#+D>=(=!TgRMZ9-sg4l;R7AHJ+2-7 zU5cMq@o8->0U*OX@4__w}89?+UdPGpcBb^rc)iK zwfwVYK3un77E_Ho#|r$KL&To ztHOy41W022)nVhow;s<(c6r6D1-b(OocL*QL`<7IXZ@~FlsBsdvs4fQ{wD?%SK{fc d1-3LJe*k)kd$6D3Y(M}2002ovPDHLkV1gN(4{87a diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/iridium_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/iridium_nugget.png index 0fd68a038308995479f7304e30863305596c1893..adc8716f285f172377dd0243607286cb47d12d57 100644 GIT binary patch delta 260 zcmV+f0sH>=0;2+u7#0Wy0000V^Z#K00004VQb$4nuFf3kks%X*32;bRa{vGf6951U z69E94oEQKA0Jup+K~y+TV;BVtj8GaY&^FQk4`ni3J#!JSS_}ZvJaNIC|0@sd0@G?r z3UI@a0TYx)0U*r*et`@U3UUlD9z0@r_2>yy1`}WyU}@t3rp4rBz%(I%)de1rag4L3 zOa|M2?BHRB)e9D5Fxl-x7|SEuD6H+&vh}5=7Wn_7tL@y64_u;&2Vr7o3$3llx0BOswJ)wB`Jv|saDBF zsX&Us$iUD-*T7uY$Rfnh!phj(%E&_7z`)AD;PK_(r6?M5^HVa@DsgL=)aQH>sDZ)L L)z4*}Q$iB}F|BE$ diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/lead_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/lead_nugget.png index a6a98171387d54e401f9e425ff3882eb489429cc..306a25b6a916b665f2db9155a3a11d439ab2ae36 100644 GIT binary patch delta 257 zcmV+c0sj8N1)TzrB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XS z000XS0e@s)kpKVyvPnciR5(v#7zGTBP#P=H($xPCWinj5ei5r$oCbh2yE%I@=;~`S zT)udnVZ)|X3=baN!%)uzrBMJ#v!$60T=VD8pP@3C0K))F8+r#Y&CAORrU?P8F7Ql= zW8AfOJJ|NS_wF(5-M<~H^Fe?aO2fgEM-LbnzWrkO`Ta)&Nczp&R}5did}R3W@qHsy z2@1gK0#X1@13=!meB}(o^XHFnIv+0p1!hEi29!690Rsa7B(OiFtDRpX00000NkvXX Hu0mjfE^cMZ delta 682 zcmV;b0#*H;0>TB5B!32COGiWi=K$&e+t$PWng9R*32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rb1RN3x8V23U=l}o$Pf0{UR5;6ZlF4dRK@^6+Q+4Xz?ihRv2?ixr_A zoa5=ccNl<_60bjf##%cOcU0-9(shoqaFk_9X)TE1<;RbN5CGZ-)Edqmm?fu(jzl7Y zhyc)aj_I;s&wo^xDg@5Y&5=^V7;Phnu~ac3#^OX!RgNAxk;f69y?87DDZ_N9LuhJ@ zX<6tPnyOB~9Y1m^&+a?O)$3RI@_B_5^QZIO#RW0O;G82gHP%{EPM9%eCqh?ko68t( z+`Pt*)pg!4EphnpJeSX2$VNuwT|w=uKV3)}a&8@u;eS+q$mZrYRxHcQU#T0<7ymH2XgVur96M=7yw_tePQ9rLm9^#VLVBS6zMSZnd#PbLo4He)-O#<`& Ql>h($07*qoM6N<$f*Wf$)c^nh diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/nickel_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/nickel_nugget.png index b892b91448d152f77c1ee481874cf2828ae1efe9..2a5c38c41ed7dce10f29e71fe43f83c965a9680f 100644 GIT binary patch delta 256 zcmV+b0ssEb1)KtqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkOu}MThR5(v#7zGTBP#P=9&h-8dWim{iz7?xlW+;sTK$=}$of#aQ zd>KT9c^H_Pe>7aa{IC%!4F^n68U=tf>*^>n$jWOoJbrkU;d#aLdr%onfMI~8jRTmL zkW>QGgaB3-aHu#j?%ur@Z2Rq7ml+Npz09z5*+HyffMLM#BL^6ct=|l0gEYVY_#4c| z1+cn+6oAtJkT)(|y2tSF;bWZ6#|uD#84;fWXA3<=_B77+#AJ5QHE`2b=0Gk^dh zfSK|0?|a8COO;yg_@#Cd`Us>=4Ke_KUdp_uU1*Ea;f3apPtq}btH&q9x( zspVlNI?;(Y4LXDOiD03cvs-#+Kz`hI5W*&nC288RYl|~IO6>0+@z3N1r3f)by!W(iJ8Ud~>$6=cp>v z#bStLxgT4Mkyr}vpFP8DxqJ!n$6p`vrb?Dh+)K(dD{cV)12v>f3i`nyk^lez2>?k& JPDHLkV1kXkLV*AP diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/platinum_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/platinum_nugget.png index 0aa241f3957f99dc76ddb7fb2ec824eb1707f287..d7588c5109c6ed234ea67295fb0f9d2d4eebed58 100644 GIT binary patch delta 245 zcmV*^5^#1^{VZv-jlxdoSOD zX)B*dxM9eE2}+{?kY;mZQwAd)6^3(H?l9cCdmk!;2`~(>v~F<#(`w3!V44uX>H-xt zDaOUCR)K9lc=9a6mQ5QOj%`_vH4HEeIDX^+!?E?7!EBJ`FP}ew*|-2!7mxyQ8UXUf v*<*(pZeG5K)A@J-C@>@9GoZX-3>X*y#_~DfGtJr500000NkvXXu0mjfNs(Lh delta 668 zcmV;N0%QG=0>}lBBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3*9xX-M4O4oie!Ht+U{XstVqE&-;D8T~k{NV)$!qjg%5V_kpv9qrV)WXvR%NB7%qj(D$C* zb;YiQK21s-TUtU@F~)Tf#8{fFh_QGPoO7H$e|xFSB0Ri(O#rmO?p}`+Ta4*gm>D!{ zI=7kl(7_`-ytB-;3%_yd?Bz0S0s!870IaoWQOu087oqQLXDJou&z$7rm#?g@t#ab{ zQO^8+qf9+;zM>7y_bF(BQo4?3a6(9I4!1!puhu`%G@U?INhu-5V#Hv&12ici)BF#X ze=o|f7p}ANYMo(FUOfMs`^#5k7MG%k2&pJ8rNn4Fq4JI~JL~htXZG#ggX=F)RTZI) z05n(51&4R z>C*0LaKn%R6O={)Ak9`rx(pH`LJTk7ykmIv{v%Wd6JQu%X>a2Iro{yL!89R&)djCV zyTB5Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3*2{KM`?EnA* zPf0{UR5;6ZlFe(CM-;|?XXecN-kW68zakivw2LBQTMz_;-86z-6asCx{YScOmTvFX z*lnRZDU?DHEsbJCqk&*sT0d^geZOYTxOne<(;%MJFw8UOd4A`}t=qp)Iw6W9r365> zM6!&kf0C`gtLg@_fjG!UZ2+JE>#M7z*x@x`W~g`kznZoq#z>PAr4x?oh7bb3?(X6M z%#6EFp5nb9#3NNks*FRRECOX&QhE>K_{`6{ST@{(au8vx9suwCAb$4zZ!Ujwp2?3t zWhZm;p`dN*lPOq+oO{O$IExYy_Vy2GV&BNjh%qA0I ze*>Dj=Fdm_e7$)^7IDdjh!C@(F-DGO6-7{HoUVUfzUG6KCCVaD6a`J&0Z=C!94mmT zzOy)0Rq@}8mpnc=1fc6Wy!SLsGi)q?YumPm7{c(dECO4b8*=~gGxiVv;+tz50+3P~ zn!T7#>DmS@ih>v;PM|19KyR~Y8os=Gdr6j;#)$L0Ihs-@Bc(JrumrAcYO1c|=R5a! zb2P;=9M39Lm3q$S-&e0riErQggAf9i4Xv#o)%i240K7gvMpc>4WCz?3;f5gtCMb;pK$=~3bQuKL*%&_j{KfF*%NM8&CcrSj(r?BAOpEaFfN4Sis|#LU zzs|V)#Bs3gH=aFXSa#?LLw8Ih)-b>@;P{aP49C`Q2D3q$AHIAIX5#`_T|f%JX#mI@ wyDnT}xcU4!PUqtVpumiX&w%oVF<@W-08uwVq9iXL5&!@I07*qoM6N<$f**ThR{#J2 delta 647 zcmV;20(kwB0<;B?Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3)EMQTT>i_@( zK}keGR5;6ZlFe#VK@f$%>aMHHeC!$PoOQOlIy+ceRT=X_Q2VCONV6QVd$N&sX_B+IBO*}A)V zRYNuqe+Sv93;+~hw7N=)EnWj=hI+@}RW~g$M(UI(op4aqgb;Z0`ZW%~%y{|X6W;q? zJWyqz$}j}VB2bnkrS~9?=X-m^7y-Hu)H^PnK1H^KE<_@NhyXAQf#YStv6UfJj9ea# zFf*LfE`m5ul?-v7AcCrLZ*w~@Biz1nNdPRvfAPV9*fu!VvCt(nRqesu+uY7qPp@(I z*>FqBL4=|Dj%?w2@s}SzxOQg5{U^_|lLh%u(A3qR zDOiS_JI6~n%MuaZe*H$hXk=!@7!l`j;&9yosu+<){#zF>%H6FkK8?pTO~dZTkK8Qh$%cp!v!O9Y4rgU*lL>p@ z#sIW!i}#+ouKSGza81*65JTu6mPO#k#=7i&{=)n5m|GXt1t6u=H~T)B&^9$%6a_Ix zoIp_yfX-%J*IYj{l4C1F#CfI%6RKpSZIpTkmcTW2#k_6Ve6h>)V1i{hoXt^Hss*3@ zpFfX?cXnS9Lcp@2m35;!zqSg%ufs!BmC0<@N3zt7t!-P{oY^?F#=(642jbH=@AzLu hJGvJ+CaMKDfZzI%IJAuK3mgCd002ovPDHLkV1hkJF9HAn diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/steel_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/steel_nugget.png index 0a3837b4a476d3c65c4701a4094539c39bbf2745..6c707d2187ef4fb9b477a21258b359bd418dfb21 100644 GIT binary patch delta 261 zcmV+g0s8*01)&0vB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkOwn;=mR5(v#7zGTBP#P<6aB%n!WilK%Z~&`X7ATDYK$?@1k{G0= zr5T<+eai6Z)2ILE&YiV%WBA8v{1yg8(y>hJz=M9xyO``^CV*#L)2h^Jj)PZ{9F`{P>aK z`Sa(EP$eh;s|!d0I1K=K1L$mqM~@!ibUt1H3e1T33@C3H0|o{FuXjLcg1j;s00000 LNkvXXu0mjfZVzE7 delta 642 zcmV-|0)73V0XkK#N4)%AcBYt zBnyp%aW{mGI&(kHM~gdiO`>OYIGpF4=lPvib`Rc>8^MbqgaAN_fe;g_N{Y?iq$nXp z5CbVve?$OKfYqfXg0Hdah%utp@VCmU#(Pg00=W?`ixTG??~jf!05L{B|M-cuwl#ND z>8R3mjy!YZc}{LEh~eY+?|AP4nhVq#?%!D<#ehytB7%qj&~=W5JY#;YOW{2aR#%BJ zVvIHw#8`?D5o2*8s4D$lFU>0K?e7afOt8@Df8gs1V;UAZgQlu2xPGsf*4EbO^?Cq2 z?Dx~w_Kp~1aL(cD3TrJfMa+z{6QQfN>19l7K0ZEXeSMuLn~#!_DS4MsmBr03!~`id ziDz(Tvet5XdP-GQ%z%6E5o0l8&}IRJ_snG()>>Zd?#koM&9t$x0l>-02`~5F$gD0Y zeYgCodc-&Tsq4~DDuBlVv-pVqUlgSOl4`09WKlyljE|L!v cQ*Ho%02329JEOo>p8x;=07*qoM6N<$f+I~aiU0rr diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/tin_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/tin_nugget.png index 0c913c20c4448586681b2578fe1271135c0910c5..2201d323fe753bd4e72888b38b53125bb1fd8394 100644 GIT binary patch delta 242 zcmVh#%X%qm`tf8U7z|YUm@bTkEh95tEKxHrih5?o~4r^eVgM$N169QOWu=(s+ z#tRoNfNg*C<_*KSbLSYmyu7f60fqs`j~rk)wth314buGX-8(QF7r^QQQUFc^K;F1@ s>lWA*xSWp{fC4ijJ_E`d#(;qV0MAoGW@1q^b^rhX07*qoM6N<$f^pPZ%K!iX delta 625 zcmV-%0*?KT0-gnsBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3(I=`rLc>n+c zD@jB_R5;6ZlFe#VK@f$%>aMHASE9bG|Bh_2w<56QVd$N&sX_B+IBO+4^2pH;@g)K{jdw00r3F z-6h2if3E>EL%ri>HElcU6e93JL%geOm*3V>y}I~ozY7Uy~vx`w8ze*?G=hlhD zbuv;)g9A(8+NP%JI$nP~;%Yv_GAx!ASE@?A;&b-v*DdjzqtAp8uxw~;AR;`Q>;mw6 zu|QRsEtf+iOa0iouA|GD=hF%Es=9`F@bw%2t7y0PBF99%;s)>sph-9|`N6uf00000 LNkvXXu0mjf{;nyG diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/titanium_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/titanium_nugget.png index 85ac3d7d7b61756c906c9deb0c78928e50a0de65..924c369e6d7d97ff0ad1191a2bea5ff038bc30e7 100644 GIT binary patch delta 244 zcmV1~x>T%TfMLM#BL^6ct=|l0gET*R@&e4p1+cn+6oAtJkT(t- uIKyz~&J&!@#|uD#84;fWWj6-0(EV!~Z zrjC)V$pkaQIqf5e^VG=@=LsUHDm&Zv^D4ske?Qz50L!pG8WFn|=Xw^pf~KkixSj3$ zd2{mS?%n$_-?}{&=NusfV%Orm$Fkv8l!FLk^#FM9hvL`AZixU7?RGd})kjj}8$ih`!?0H~7$Y^3>ypJ+P3W>hA=!Vi@>ehQ`z4?;^^p@Z|_b8Af+@kJDJVs z+6FC(f*2!CpeRQ`Z?kC{zWVwLxw1A!b)4t@`HVUlDW$=IC2(z1Q*|A`J=x>^`3%c2 zUsR|n^^(t<)6+}EyL(RwAz<0i+WJv_cD0}T*?f+wGFvQ$NS6AsbzMi7GoN3(%6U~? pKzy|SC;z8tm-iyaM7`t&@GlaJIOEfon*{&>002ovPDHLkV1n>5KN$c3 diff --git a/src/main/resources/assets/techreborn/textures/item/nugget/tungsten_nugget.png b/src/main/resources/assets/techreborn/textures/item/nugget/tungsten_nugget.png index 75797bf0431a92e0f6fd722688a748db3a8c5b4d..f03d001a90be1f8839a4273af92e20560c5eadd1 100644 GIT binary patch delta 259 zcmV+e0sQ{J1)laEiEMprU?P8F7QiD zVO+g(IoS5gm#;AF-@Oy7^Fe?aO2fgEM-LbnzWrkO_U&uKzyFL3Z(hA*`26V;!^aQr z8=*>209F@}0&p4t^2Wt;XBeJ7d5qKfcmXIdBjPilykQI&7y$kSL1&sS(2oEB002ov JPDHLkV1oVqWQ+g+ delta 659 zcmV;E0&M-C0>A~3Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3(Bt@rB8UO$S zO-V#SR5;6ZlFMooK@^6+Q+29)CPp8_s0cwN3AzxX_z*5!CTy$nMh-Xz*)L-@g-#K!7?GdFBf*4|q0OS;jDWj_7)SXqehnzqR zN^3z3&)>f%gaFVzpw@8l^eJ+R=z&N?5D@_S&M{jS9GU4;hrsguJSioN z(Jq1*OC1wpEKUSfWnpnCPa-^h@>l>;hS^?^f6z7<)3MMAG*z8~TUb1wkDoZr^=nu8 zxUt3J(uKS-SQTRo&N)KcV67$PgqcuwBJ|aExs2h~%^Pfg`@#C#bJ zf6Unh06uSgV)fygOyZIgB0|Us4I!{Ut|*)`=5P&%JIo$EhE+>Z6!@kEppI$kSOHY^ zpTY4}#b~(0*DqU;p>12NwRrER6ANIPrs*I$2Xq(9!m%<~m95P!zJ1+h<-tGzVvN(z zc19!G#-l}15JJER6lD+SY&_`#;Jo8!8E?6YFqBVc*U>1 z5h=s|xI$H_5BPi^4iAafUcJUSN6HDU6Nm^)C+7gz-QP!58I8x&NGW!0YulDKXU?BG t$zE0cf%t6w9sjG4!l8W*k@|oez;AQlMM#Q!X4-oCbh2JA3&um};vs zoW6RSVe`tx3{M~2#!$}$rBMJ#vzDO=T=Vni&!IAy0K))F8)*kHEh#AprU?P8F7Qi; zVBEWHGuZaamoGD%IkX3>^FaWsAjlPOK7Rc#Cab{k<^3y$H_xBpGytm$NC7wv0D0rV qwF`J{#|uE-h=|XC@`f>BU;qFu_&cADoP8t!0000w delta 662 zcmV;H0%`q>0>cH6Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1RN3(FVc0Ek^le# zP)S5VR5;6Zl1pn;K@f$%>aMUjgU6~PrG#3;-&HrB5CV0Kltvg-HO@Jnzk7!PNGb8=<0q`OQ*lR? zjw)T}C<{kfmXy|l7+!5`5JCWGA5d$!cx;}WBDyCM5kv%lu5%nH3ub4!R3UI>VS$tq z#%LQsjHQYRF%~C+s&ew&`8rL*Rqj4 z@~)t%t3Ojn8FFqNPvH1!$o61>$%fwNFT`fd1b7GmF%}~RZ4Xd|z)VqKt>xM31G#YZ ze|kQ?xCB6N^Ajtpk7N>;oDdO0PG|^$;b=_Zlo9)@zx#vPgNLw%r6>yO#sg5rG1 zs`}63G{X_Yoh`O|n-IZ!kF}P%uBRIdV49|BAv)J)_nxwFtUO+p-q#-6-@ox_<)Hw? z7^k28?Dz3ajTS{g2mvEdlpUb8S=Tl9e3$RZ>`WIimS2NDRZPSfrw&pC)6^AX?|JZg zjbDR4DZ_9yMpdcy`25(}*(ZLo_7>+HDJQf_AR?SSItRe+aEPkXAC0DwQf$ZOy~pRw w()>{d`JU*fMLM#BL^6ct=|l0gET*T{uIo{1+cn+6oAtJkT;H< uJk0Rm(LJ2b#|uD#84;fWzWre$QZiGDQH5 zC-IT3!-doB5)OCaZd%xD@35XdLOXkzw*HZZLFr~1Uwqu4M?5t_=J}F3HZaJM!$$#_ z&fH`CRHx|1Uc6crrd4xL?|qO!f|bkSQoLj15gK5sZ#x1Bp?Xj z<3)NgUr+O+yg+jI3wb#EfVD3x*tX64rA5-wvZ%5HHH9)OV7a)SBA`$>b^$HeO1QfZ zfBVB6Dtf5V!uK++>tYxNnkU48za)vgQL$QdI-z1D4Qjg zR|}24jRc}JRiqz{~T~R`J7q$ZUcJuItjZT&c*#<;=)2^dA$Gt002ovPDHLkV1g}e#d-h$ delta 528 zcmV+r0`L9Z1HA;0Bo78+OGiWi=K$&e+t$PWnvp&ie*gz`Nliru-~<>FGz=Gmpilq+ z0m?~4K~y-)&5=uP)IbzPPgU72cbo1+ganD7P(C2$44APOR=@(-2OD4mtO6l11A!Ew z@X0?BN@%ysu5y(h1C&g<=Ws`Nbac;q@UNq;%BzB<@@C2Xcq61n$ai^GF`lEB>gML-n8WHROHv*$!$d}Bg2wkU0=R@ON9zRRPX z$7EWA$Ti?vVN_)Fp(hQ(bTTESMCbx_JtHPze`WP1b={ELoU+Up0j_Q7V}cmS?HE75 zz?LJ5vZPRkvtPfl8KgAeLt0eOTH%~yG_LS&j_*2LQzNnG*7`c*k;OSj(>RJuEdyvq zWsVU+X@$xPW|tS--`wHsB%uR zb~k^$jajxJM-V=|e@8bvC(AOv?S3M}0q+`eE$r=m1#O6F$rlCz=Ny|`+gx1E$mTVJ zKsY}}X9i+mZR0K}v}Bq^fTW&-pFb$9CC0>%A}A11gwQg|4M`N<_lQ#bKluX=BkS6z S{ik670000O7&j= diff --git a/src/main/resources/assets/techreborn/textures/item/plate/aluminum_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/aluminum_plate.png index a5fb32c63c118878e31738252b895ef6ae5dff5c..c3df83836bbf92b740aec5c5c566de150765f0c9 100644 GIT binary patch delta 412 zcmV;N0b~B51kD4GBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0b)r+K~y+T#ZxhB z!e9_RLm`7mi$qX5C>R_HnYxHWg*rQA>5|{)FDOnz+d)JK9fHt7qUa_lLJ&7e>U-ou zO6%g%2g$wrzVE%e`=W&;NyPI!xdwy5K#Y`MjT^kW-LBl#Y6(})hz9a{z09 z$Ula|0&*I-t}E};sXRIkQYjXTQms_TH`^`a@pxq1>~=p4Il}35Vgh{5W*5b8lL=!U zG$^HQq4G<=&yBw-KeSrpfRlDh13h%9GElXwl!@&2d+GIh>YcI);id zf^ytJ9LGFI1K;#NA)$VBE*Ooq1+=PyYXjWik>;B;+8OR67$me*>1+{dimhM@KGv zk%)T2VVnh!tD777oJ`~}mD1i|pxu7ojUS^C(P%dHxz*D9$49N!>$(*PASad+`I=7U zJfEikNT=DXj>cns9}Y=2aeZmG^=G-HgL1V>0n3TyMDllcAj@$&O~UtV#<*Oq)Wj)( zbFI;!5L}=I%ZcSge_&-V7UK+@TW9k*NpSMo>98e`(aJ-uraPe!asn4(ielC=NEV?D zkewMI0(gi1;Q%dwLjn9$o}L8LMiEGG((ZOieCzdezF6>`)wu$e`xC$bZE#o#i=8$A z*az8h0fDnzPB(l$IshnOJ-H50h~9BVD-d+ZrAkFF3I$#FXnH9C=iH^^06m6IPDlpu z9}yb>VEwXKqyRR+Er4v3mECC6EyPXe6}T;z8ExHqT`IAKHID~5egd-T_Y)Anew_&5 o#_eE`(Q0@z$bjX@`|n5O7vlC?0#&)NzyJUM07*qoM6N<$g1jBwasU7T diff --git a/src/main/resources/assets/techreborn/textures/item/plate/brass_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/brass_plate.png index c5e35003b5dd5e927a1254c55ca86b49a5789f15..471038f74207b98760ba65862dd7268808699c3c 100644 GIT binary patch delta 436 zcmV;l0Zabp1?2;fBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0eVS9K~y+T#Z$3L z!%!5xjne2)uvQ65ajG~-28BYMA_Nh|KPY~PtBZ?^AJMgw=%_=$KtRagAeIcJSW2v= zLZOt{=sEU<~`%*>jUFkuP5H~kOs*J zQ510#czo$j72mpT#x!V<%jMV>Dj%L+a^tVc<*fyBz%)%p8Vm*lCetbdEBX9{iL^Q+ zv2B~22AZZN7X~qmlo(y%gAURrjYfliG3fv!D6#4QLI7sQ_Axn3ibhs^-)H{o5+Q~l zEe20_1n9cXNP|+T!~{?W)fh^Q5fsNAjK^c1qk-pnOt6WcakX+Lp?kr#&eKgY|8>32 zHH;7h0XYr&{XP>^C|f6q7(xJI@T1CFvZlbN>^P3#4XO$N+5}Kdq|Ll&47tW1y+zWW er~HrqMv*TZV$JYROo&JT0000JhwFHtkaO6)u* ziU*9eHc>&oJ9*#=W?9!J%*f1?V|}s;tG%a@95{>cBP|l%V{nw`{u2-mHl}OHXBPry z>3~^^q^7FzW3Cp_e_BkR4a%!=j-XqObv}Yaq85E zF5Ek{*O3y(V;rGTIZAQC^_>mMDuxaph()3qE2&7pk61Xhge0-rp z;@KHQ+=t;bYp@mbQfS1u-Gg86o5*u}FB1M@*#l<8$1F(Ae^w*@>MG*H<%syp5b8UH zWtSGs`W$>;Y@^Vqg#{++WD`ZVll}`}mVb-{42X@J5E(HcJ>Q7vpbkqGQ7Uk9 zJA#;kaPY}@e_loqQwR^}WFLf^_=p87kB=bOt;L%b6&fyPVbobb&+Yq(crl3Wkyw&& z-*LGp!fte^6sw*h`7NrLg0&Qp1g6`_G*+Fk11>IU|zph5yTL@+_%Vvqi z3HBVoa+em19r*}8%$E^_(9RkWwO6W%=Sm&5Dmh{!3nE(I)07*qoM6N<$f_4-?SO5S3 diff --git a/src/main/resources/assets/techreborn/textures/item/plate/bronze_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/bronze_plate.png index a04410758386ca76063c319b845511b35bf3dace..3d4255fbb5e79bc25e35dadefab4b24195f6575e 100644 GIT binary patch delta 427 zcmV;c0aX6e1>6IWBnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0dYx0K~y+T#Z$3L z!%!4`2|`4O4zbjLix}wA3=X;$$yEP9y6NcR_b845zd$EJAzKCwb}7V8LM=&$C=rE_ z*mK(V2xyls9%%2m@4a*Gy|1rYRaK(b>xpIH`@YcUd}*xUtJCR-^x>l7$`s>C#@Muf zHW+0NU=4X{9caioLXsrn^1NHM?NuIXY}#UL|A_o8ykShz5##IRQw&BQG*BZHMZry= zKl)lIzUz+}>!5*YnrsV|k5A6H@mJ-RZIT17>oU?H&vPb=Dg)cr+MG?--@k?DdE_+E zbzNN;#4wU#bcGK(sGG!b%&0oR2vRJ6JAe>?*XBgHAc9{fM)6H`JXDKu_o@)~D?*m7@*3Ri zsA0DM0=`8!65u4r&FJyjr(-!A;6Qcc!zLsg3Zx%&B6>@P_l_0}wpJen&i>pX|ccloD%}3mEPYz}8+~0_;Y5iBB&;qic*>WyD4=EpcCt1nqOxDr3WkBme*a M07*qoM6N<$g77#vnE(I) diff --git a/src/main/resources/assets/techreborn/textures/item/plate/carbon_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/carbon_plate.png index 0eb8bd9745e668bc26760d1cf4e1709713fdce17..d8a54e0b8053efedacdecf18f852caadcd7fe4a9 100644 GIT binary patch delta 395 zcmV;60d)SA1ib^0Bnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0a8gsK~y+T#Z$40 zgHRCM$Pq(C2uP|xst|1S11yrl&+w!275Ni8o1~RsAy|o^g&~N zpBsNw-fTAHfaiIPG{7eCt}oqw{9LJIC^~(I$B|;2#!Bh-B?FcYUlaU6y-Hr*M2Xzb;qf6zugXi^oCZzPFhK>^bw{y29f-mA`~A44;Hwa=YDB*z5H^0hi0gaQ)-)DA(&%Ne_XV&u!nYx7TTIM zlXKFj$)TU3)!}h6*=!2n%mu` znGKE4FRs*T(?_kwe*o+=kr;!}1tPTCZ3Tc<7VLJOf%WoYcs!P;hsTnY3hVWTQK>eg<^XEoBlo_4 z1;D_7PYA>OwB>Zsq*?M(n{EdADzIm5RC=G$@LK1jyr0X`43lO&&AmdCr(D z-x-^rfn`~2%QQ{y3j7pjStf_4oS1MNhmi(pnv(prGtlXDc3IWQ`a@jTWljUbFzN$? z7)Dx*uCUNS(iL(?5o;JB3`6ELNRosE zJK*AIF@ylb$Z?T$O@ju$?~`B$EL@ny;zgn;man&h962I+HG;-}e~lvFaLCLN-!<(S Q8UO$Q07*qoM6N<$g1d^v;Q#;t delta 485 zcmVvlG`#;rh6pUrdt;xuzB5Kd%yPN>D(L+U;CMWme`GQ#>2z8Og@P1| zMTy7bl1L;pVzHR8UoMv=lgUUZ6cQKU`FxseHY=miNSe*2MyXViUau$X^;#yAiPUN} z>2x~MZnr-H_xoJ|6o$iL>G%6uI2;Z&w^}U?pU2xZC!9W#Qf572zZ~%|TLjgzzLT)q~QmIr_IwO&R;X^8wlFQ}d0Pp}Rh4}Da z`g}gulUW1iKeeaR$pPGMH-qaG&StZ>0)X{;UB=_F0@&wS!Fx&6<%Wk)G00bUTKm!naoi;F%efti!+pPn@TM!-#cOQ*L-wHUHHJMR7 z9*;s$;JU{1`TX{PhI~G+g{+wwb&P1o`2g(qd&84O9?dkMga`(MDjDZ(1Ofp!fRAtD b2LLgDRD-m@`b=Rm00000NkvXXu0mjfKo!!~ diff --git a/src/main/resources/assets/techreborn/textures/item/plate/copper_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/copper_plate.png index 1f5ec76781adc913ab84ae9ea0f80b510189b824..6fda5a16c8091a2a3d4d81f9770ef5f00aa692b2 100644 GIT binary patch delta 432 zcmV;h0Z;y)1>pmbBnkm@Qb$4nuFf3kks%v@zyJUazyWI3i3tDz0d`45K~y+T#Zx^? z!%!5x4TTI^6}uR)T59MZbnycm#84s#;y)<(1NxVovxtMBi?~S!Aud@QB!<=s3ZY`e zY^Aa1v@Zm-OBWBc_uTj1IrrYz*Fu`6(rUG27C4S0+Jw)HBEBrklH%=I%9RnG``?Uz z8|8UMl>=Bq-Z8cc$T>n3MRL_XPR-gH4=t|OWua0h|LQ$4#@%u3zrD-D>jw?85e9<+ zH-R90nJT{V9vSnXL8(+?Td3STZFA$V$~&veL0$}= z?+DO!oskBnX)*!SK{bXFV+6%<2gBiz=V;)09usWhXRPd>NYB0IT6lk#&3}Gz$u*1+ zh9Nl(;y7l43fs-YObj6aG5FE$X11olr|h~e6IB5~n*gc_Ufw9Ljv~N4gLM2Gl>hPH aDDnfL{mq$R7}+ua0000OlABI*{y1txdSOIGFGo9%3D&H4-1z>;9Pb#XAo#|pb;v_lfAmO(YDg@AEiS%fj=-}wl z7&|i_^aUT8X*ZcWU8KfctoJ)u^IPeuF3krVx19+afQ4?de^YKgj4SNK6t;{q_m@XV zMLLN0$;8!KdaFzF0h5iDd>(VMJLO@|=t9>F$b^f7hhdQ*Vr#;T`=Hy$gmIxg_qRmC%hNr3VI zBXz${bhyqWbfC7Jo|;ku7t07-I*Y%m1h?fhin+Kj;3V_k0HEk6UOcB1z*wxZ00000 LNkvXXu0mjf#;7M- diff --git a/src/main/resources/assets/techreborn/textures/item/plate/diamond_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/diamond_plate.png index fec2824da5484a499ca5edca98c254e1de53699e..c62b665298a93e9633a411a8ab096d003befec85 100644 GIT binary patch delta 427 zcmV;c0aX6%1>6IWBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0dYx0K~y+T#Z$3L z!%!5x4S^2Qiru709Wsaz5iO1e$p=UVafrX+_s)6uzO`%~%;j`}ksi zOqVN+DhE(QzI)dxA*X@kIO28MvT1K2mBZ?yH1#TZKN&GzjfRZRFQFs_LynLn2@~L{ z{Wwz`T;4JkL4!)=r!Aa(bFj~azfRVhb#lNoO-35Tam-}a$-w%WF=6BVZ?9t8HaQJ6 zP0KF~Vi+kgy267FiY8$gGUgp%1SM8~9Y6@c%-h)}hsi=?ReaxP{_7GUhM*`0FLnf! z%VkCy7{;_UwNZ_s#27(w+(DYA+((06ug3(7_>AYZ6*>NVXYKU(?On%cBhnz;#v0wNEJ zAuZ=a<^vd}uE50Sl}tmcrRKv*R3w;)B`7!Cu`XjH1US$QS^O_G z3yY{ljhtE|%gf7YAaw`Vnww}@S)pxhmFaI^84#EwA%L9_f8)UbbsK)$ za5x-kARG=$MXhZ-_J3e-FCvCRG;jE5*xKUWW`Oo&lDix0l)sv#^!X&`lvSuysx%M` z1_jVU&!(SYF>Hy1v5G2n-T=+<&(!(?=sZ5UX6G^5`#D>oM6cJUfmBM`+j$~(=@2{G z#4DIQD>UpMf1rN9MxAeq`%^O%k4{j~>mawX60KI722vN2XEI}+f6K)>6SeO=s25g{ zPtQ>{^M+ENQZCzpHe z6xxTlJ~Bp*_^qeqw+{mbgF(ttYq+4(kzG^6C4-UkH5vn%%4)KzG@L3eBSWbsvqC|J lTt=qi2#{JFCno?P{R37@a0Ve@I!yoo002ovPDHLkV1f&JJo^9u diff --git a/src/main/resources/assets/techreborn/textures/item/plate/electrum_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/electrum_plate.png index 262d6da95dceac12a7917682a897cbf7ff779bb8..849876176e24de7bf52c03ee5d3d4cb55b8ded71 100644 GIT binary patch delta 423 zcmV;Y0a*U11=s_SBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0c}Y{K~y+T#Zxg$ z!(bGA2|^G_i$PoY52q~pXQ})VL@+f>~{hYtC&OX8{fRx}0aU4?s{&2C;{P?`m zMKHiLS7Vhb$I@=!^1@#ypPd|#1CHacG9Zc~icKd2_ECAwvasM=T-POMfUfKL1A`es z%8aS-!34#S$z;NsPkVfUtUh(kRBI?RR>*nw43Z?_eGKUL`xLl{*J#(TWHx?cZ#;a-_rHHw^{~QpIwfa77={!$ z;rg(PC41o7KB;K`{BIQb0buwN#zXr< R0zUu%002ovPDHLkV1lf$!TX%B#|)~e{%o;5_18JBDn_u000=G9a}t_34a9;LtR0QqT(iIAf9XB1ZnVLDeQ%z< z7w_kNp6B~2{+}7U&S1P-jj28cV_ho9=V6};cibxU*%|cP7^+=YmGBvrIJ#Dv2LUw- zQ5U{OoK*8mEPk%CkYZjWUmB4KwL+ZMV`H`n?$+800P=eNJ&RXE_4pzBP>8u9t@u$~ z4Is@~vAaHmUi%ruf1fr~20XgKKoY&!U+=+p!H-{Ccd@tDi(+g#_KV z$?%IE0p)U;mIAhIGXV5PJ%%P@1S6!*AW0JLqd>3MW5A8-GoCLTNbB{Cxla4a%-=aW zWey{RVOEF&!{LwtD%5v9L*}Pb0GT3tTPCN$tK98&8JG%yYLigaqCj0B6-VkK1`=4y hjv%|r|M)kG`~c4B!u^L8u{r<%002ovPDHLkV1mNm!@K|h delta 710 zcmV;%0y+KY1M>xtB#|)~e{%o;5_18JBDn_u000|)8fWDhs*shg&^f8yeklXG!i=X^g$ z0EE1}ybC3A_HqE1%O%v=RJ09AnB6k1gDtcT=n+*q1GsCM2XO9gUtkn#R@K6Z2z%qoX4sa%0zmnQpg@ zwUZT=4;ENGTw?v?e;wY?6rX>GP&QX0x*I4G3u1wAI4sCR1_oAp`4ryZ`SB>L1o4M` zy!`%@@xP>njW&FQ<1pfG#K6uTe%^rpi zTv$S_xR$!9a+i@SWwEld5(Oe1sJm6P`y~9^Gc5j_W9rKbf94K-4DRl_^^J*{e{C=BlYXr0ZS?*$WB8!OvTLAs+J@>?8Ts8=6xQXT)9Io>q>v&xpN3~O zR2!9atm~21v^2~s(fBK=nXEuNU&Sp|D#i9(Zq{Cp{YJ0XD@2+#PKap6lvIqAoR?KH zRKQ*59daBQXKOY^{W+vb2_#j=#R8%z3Q3i5WHzOdJlT@UZ7H2}@dl}liRX=9tGq(8 sHlCE)M3R;9#3`=E0+G!{atQ#!f0RK^ciQL}S^xk507*qoM6N<$f^=q3ZvX%Q diff --git a/src/main/resources/assets/techreborn/textures/item/plate/gold_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/gold_plate.png index 63195fafc55705b91054eb1c69d1f7b36ff9b213..35457cc065eda3373e0491e552d5d5811f20d3e7 100644 GIT binary patch delta 441 zcmV;q0Y?6U2I>QlBnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0e?wEK~y+T#Z$3L z!%!5xjY?dK2)Zg_L=>`AqzEk);-I2mkik)K5gc8_A8_;!0uD}!;@}_{C?zO#5yVo^ zHG)Kl2&RcWCw(Dw j68B1^=~e#6uTkU|RAtPtUrrXe00000NkvXXu0mjfH%Q0g delta 725 zcmV;`0xJFL1A+#SB#|)~f4~3$4!{9w)`GsVMN_8BbZI`No0Sjqfm$@nAwm~Jy@+E@|$o<_9lOE_NUqEr6|92^`7W@8H5b1L?h z)%X@l`Qy2b-(Ab5vy8vqW?c4i+!FY@nFppoe#e5!+ z;pk4q_Bfe3vs8?oDCWRlxdi78`b{I60Bwj(DCoU7=DQfnKi< z0)c}(RA1oz(^%@o^(M^;IC~SB=#FE$Cy}Y1B*wc_D9;X~-*AqKoRgt%oSB&s45jCp z=}i@zld!hMVr!K!*mjvWCJDCoc>0?p475aH)|{m*OEWAKXl!g0)Y;+aZbhP3MxwnL zK}|sfcg0l7!>KNaq$>9ms>~AAj|V(ub(gccJbLMgZi)FEgg5+OqjEt;G> zN5A2ta^rz-?zwm7oO|!g#KJI?dc7{|pxJDSvE*xm29{;X_TEmY&gaG#&+lB-5UHMj zV-uHJttPFfwwxA=EFNdGlF#SJMKga=25Cj1e;JM#lDQ>r0j5=sw znkHS*xzV`hjsH65P8P;MsZ?U5f$#fFR&@prGnpk5nZ8fOwrz467=|JHyCw?|!$^rS z6%HoQO@_lEV>AI)P+~O!gaFLW%4KqYn4}I;((Cn@|9OcJL!gVn^@)IZJkCgiLZQF} zP!Fm#lo%^0j(0Gd&G;M*I-L#^+{9`-|N8eo_m>j=Dc%`?EkFkB|DsJfAesz&%?Ux0DVs_ z+F_Zq!e|})37usWBW69m%i7DfGJ{OHfOIL>R56QuwIqdza8kgq-24V{t+M)zmQIF29;jj2Dn-PY1))jtTg?n@@Xzima?ce>I@GEK?&f& zkntB_N6`d~IVL%oipd5=BA4c30#O8n5D!_d8|)k+ouFlbf4tM4=0Lz33G9moaqM?v z^KcsjYDFi29?5wu3d_ti7q>jqo^F6*$e_Z`kqiB5c_+XyWtNhn9Mp-1MR$JSJH|=i z6fXBZT;2n=(5LM01~BmxZ7JQgO0R)tRL4Ub)GN6&6?X;v(UQr&05#cZaZ~ub2><{9 N07*qoM6N<$0fKnN>%ss4 diff --git a/src/main/resources/assets/techreborn/textures/item/plate/iridium_alloy_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/iridium_alloy_plate.png index c93e0a58b6f2d4006a4330cfeb0cd42be7596c8b..c871098167309098493003fd31b974079711c3d4 100644 GIT binary patch delta 442 zcmV;r0Y(1%0@MSLB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tl z000tl0bXTW;{X5wX-PyuR5(w?Q?W|JP!zolN~R)M5Ya_xbkQJ=T1zO|m4LY9KOFQg zT*ME^Rs{V4k)}Fikf57sbWud8kRg*H(R1hv5$)2&1MR)%zJHu^?|o@&MNx?Bx-tno z&l7EwPmC#iS(YWsn#;{mCV%qzk%(>E%xR!$T6tj*!$^rS6+W1tY7#{eV>tm`v69KxeGt$5?3=%*+sMb(ote|q-L7wM)js`&xkl+xnaocLk z&2^8pp5HI`KRG>P4J*WP%$x>El8~T-d*GB}2my$Z?=$c2l{E$a5`Et%Q5^t`3835E k{R257pw58*{x^zz0sVr;8dJQ7IsgCw07*qoM6N<$g2(U0I{*Lx delta 352 zcmV-m0iXWV1N#DyB!3`dNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnP zU&TfM000SaNLh0L01|Tm01|Tnj3T)Q0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k zE-)@JHbiN!^#A|>+(|@1R5(wil1&Q2Fc5`%A}=7`!*hr`?|;L$@IO|zJZ8Dxt&&-Oa5EI1L=f zfq`_|ZBVH<)@5y@!TfzRW}J-Q7^C6vhap!;)0710_Ih*0clWo9Wze8ntY$`4Nk4+stX8X?TpllLF5o0j{ zR#0L!0fYd|T7OoDIZT#US0oHW@?Vz-F$85X^72H0uIr36FbsnPP!Fm#lo%_h9Cwgq z8K0v;5CkMR#B1EyZ^`pxpSAu&x7h#c@`5$2Fc=J&(;$vx5_C8^IWEKy0uUoVJaCGd z0)L6V?~|ww0LBE+?e*n}91&1wz<>W6MZN$o;>J4P$_|F=00000NkvXXu0mjfUAnU5 delta 355 zcmV-p0i6ER1EK?vNPiB)000id0mpBsWB>pGH%UZ6R5(wqQol>XP!Rs=W``_+7>g7` ztPWMAs~}li9sEljGKio<99)Y(3N1yHA~gmgX@)vDM82~xbKmxckjNt`|dT0 zqQGCUwy-Os>|oFLmTG16^xUA;2zo&P%d(K?xmbed&-ol#mVb$#rU|}2W+j0(0+XUJ zl=FV?5RPr*C^*K3>teIjLOdSBwjGHpXauarE_OT*?sgkadrR(5&Q67#F?LXe(E*cH zBJtS2!~M-I-s2c=(9d;_AnqO3dl?yLX+002ovPDHLkV1mxj Bt6u;B diff --git a/src/main/resources/assets/techreborn/textures/item/plate/iron_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/iron_plate.png index 7f0c8e450d47244723da50ce1a2f2c747085e9c4..7f43dbf054c4839d2f0f0f445ed1a25544e3e76f 100644 GIT binary patch delta 422 zcmV;X0a^aX1jGZ785ITq001BJ|6u?C00DDSM?wIu&K&8HArpTIa7bBm000iZ000iZ z0XPLyBme*bSxH1eR5(w?Q!%cBKooou5-U3k4geYp5-VE@It~DZJ?Ee@HXg%558xrR zk%~YF8~_>$Is-ZrmyrLzjm@8A^X9!}X5U-aN#FOf-EQR@9FIrQ-u!FOz;PTg45L>| z*LAL+xvC*j{Q`eSsH#f#`+dLJY*<{c*RotL$SBS%4TuN{p_s(81UQ_W%qXU<4&r9Y6@c%=dkAn5=(RD~aQn`L9ca7=p1FeB2Q* zolY5PFuol1p&CPpF@oZ_gRblN9Sv@`8xw5eXAFWsPNx%V=ks}(f4AGQh7pRQAg4jo zG)!0uwLI7fL&+~?w0$*YjMN*dK@H_#u3E(sU`IuXl#h3Ws|3;A~4gt~u5N}x@ Q00000Nks-uM6N<$g0pq9-v9sr literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L90|Vay5N6D}*2xJJWH0gbb!C6VE+eEWbLaW}6$}iFVxBIJAsXjfFYfn}NtAH= zc)w@yW{FbY8x3KaN-w|gH7!_Lx+-RVt`pb$16pEAOE_{aOjxiYaO zjE=TnAMW|E$Meh0%Wu5)IviUz|6_B^%CMPT9p}DY;q<)nUAIo;$&ApQ29MoNhwn`Z z_Y(LJyH@DJwzTs%|8`DsElzv;U~g*oy`K*!cUHdcEm%HH>a_<;__@8)Dz$IqwS>Gp zG*wdFE4bWEkGJ>lulN(XFK6yB-KMp|b>(6=j%7xU>vXq1x+1;4N90plyXnOPlU}Un zRbN)8%`^4YvVsLcKORM$UN~{#nRy`vcSP3txJtAE~<7dARSZT>Ux@#kq8e!RH~7-*^`t`Q|Ei6yC4$wjF^iowXh&_dV1 zT-V4V#L&XZ*xbs?!8glbfGSez?YnasMd=jWZ0%SvQep*R+Vo@qX iL1JcJiC$i6iGqoqfu3cKah)Gf4TGnvpUXO@geCys{orZ< diff --git a/src/main/resources/assets/techreborn/textures/item/plate/lapis_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/lapis_plate.png index 3a32311bef456da13eed4081c86402bb7ad2ee20..9234d861af4ae99e1ca078b3292aa617c39e5583 100644 GIT binary patch delta 424 zcmV;Z0ayO;1=$0TBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0d7e|K~y+T#Z$3L z!%!5x4MN45(IRyaF)9eP4lX*_LUGZtTk|!3g+E|cH=RX-4t05MYOHiDrU9|`FH_(10k!KrRn4o&4S`a?)zy_$X`jau z`i9Q4h&TQV$4C};e!6 z8s4ERvWwN97Of;Pc$cVX403*cUIY{zD9s6s{yoft8QP=2e?@Y1Or3~VW$?xJu?Dgj zJ3gXyzd>2&C!fz30hgDTQkD5BHX+a*Il()2fTKT)EBqaI_$!`?6Wl}VGut7pY`?iBA^hJ zDT>**gU!E7e|!8B&VjUWa*C-hgKh9Lj^1UAp4aG|2`UYKQmIrCP!OW5A4cEumPfV2 zn4YZB;M>CB*`lT+jlN?IV`q{oV>dd-EOKpE={KI8ok@z?evIu)=vr39ElX&e@6gyp zk!^(v$C4PLmuOwjsj|kAX}zU@jg1XSq3%Ui)5k;2If&>njG{jDe{AL25gt_cinAVM pdLMF~mokl~6j0dQCHDY8`Uk}z(7-_{l}Z2r002ovPDHLkV1f&XOUD2J diff --git a/src/main/resources/assets/techreborn/textures/item/plate/lazurite_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/lazurite_plate.png index b6b4844f771159dcef6c585aacdcc46e98c610b0..4980a1e6bd61aa6aeef29f5758299f22816cd4d6 100644 GIT binary patch delta 446 zcmV;v0YU!y1lR+RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tl z000tl0bXTW;{X5wZAnByR5(w?Q%y_5KooopVnB>h{JJAh$tRJBNPOWIa$b$ z@=utPSHT}(JV>Ni4;3*+#EV!(Bi2)C?2O$Q(O!CSpnWsDnSa^$Hf=6R5^-HudV%M8 zqIG!B=);$7+p>35Nx0I+d;H8gXpXWf4PXs=GvA+sW`N^32#~4b0;J5&Ov~hmN&fH> zv)#1 z=yozNW=?dN$bZM%tCUJ5at3IcmR=al2vTNrg%3K&hJ<0rns$H@lv#BEBY?2ArB!l- z3=9oRwOXbAb%`*;kTrv6I|6iFXJtU4P@n+RgK7+A#t4ez4qB}ipJPA}1QgiBYg}Jm zl#|K@*G|uabpFGGeXe1ID2m7#5Xav$Z*A|SW*7mO!8hkuHqtc({t|uPr%)#VXcNF` ob-ALhw>iMQ{MQ@#?|-AnCuwfQCn37g^#A|>07*qoM6N<$f>`&&1^@s6 delta 609 zcmV-n0-pWY1NsDzB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGma{vGma{-JZxd#9M z00(qQO+^Rb1r`$wEawjh*8l(l2T4RhR5;6}lfO?`Y&pDq6A+W!{ z&;QK9!2yyxjt1D-+2QT`k3mK;D(>T&3IJ~{1dsQ=MF)>FHQriYZ$1=rg1x;x-hKGQ z@aYSL5Jc$!Q|35phTH7v4lb=n|y+vf)Lq!R?m!gtB z3u{lv&!&VBkbhBplVC6yAeAOsxX1eTE1aoGhwJp0R}m^AU3o-t{*ATGmjvgKO0%`K z)p<}91pv0X#@mK?aT%SYn5v-3FOX48ln!upg-{CbEW5kAodPK(ww__Cyah=``TG

z1tIZf*8VL?an=y0OU$m$kxC=ACb(8bk|do6qtU3%xT)~AK_z|ctfYVc0oBzn0P5?E z=K2a-mq@MW-OvC>M@QJYq`de+e)^T+vu#uqk)KWHq|yZM v@ZPs+{7Wz%k9qTaL)?BctGB+~`5ONKrJ4nii{`pF00000NkvXXu0mjf9j6*! diff --git a/src/main/resources/assets/techreborn/textures/item/plate/lead_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/lead_plate.png index c458b8d86c01b17e2ca6ea25a642b44555c3b186..a8d06b29fb75db540cd610d15453c522b53b6dc3 100644 GIT binary patch delta 411 zcmV;M0c8I71k3}FBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0bxl*K~y+T#Zx;= z!(bG>4MISP;!tVWEcOl8OCy z28y{Vyzaofz~IbQOCm7Dv(+sO&OW1aI;PvksDFjp@h40#zatXTv7av87O+R(R5HGT zK4qJXujT$R`wfcYe|$K_Z2AkOd=<5iEo63z@OwjS$zc-)-HBq~oR!I6E^b7C;%HPX zSY)YQZsW*kAiGNycmpumi`sY}K1dM|U_R>XoJsLLF zHXSyB9x3iNXX#pFSX4=~-Vw4{@8Z&)N%;ra579;v#QU$!(Kg?izD~t6fudr~(H80@vXey{hWkmxd#5d2H;&M2%+vStYOui-X524f_ XKc*@%*fSx>00000NkvXXu0mjfS>z06 diff --git a/src/main/resources/assets/techreborn/textures/item/plate/magnalium_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/magnalium_plate.png index 6101971f080f3ebe00013bfca73c9e4401f5e095..9450c3db68e2fc98201d91e86e89c82f5556472f 100644 GIT binary patch delta 396 zcmV;70dxM81-=82Bnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0aHmtK~y+T#ZzBP zgK!kR$v_F*_S8mr)e7TeP6ag5Cmeh`PQI->$=kK?KXPq;*;lRtvy7tztF>v=Xr8}9m(N; z&FT0ua*y5ZND%C5~g(zaApUAau!hbkK1Gn5M}{0mpGz0D7aYp=7Sm=6D8mUGqK) zL{Y>77x5a$dn1{@E!e|qy8q4HEqhoYO;hF+$n)==@v4*zA^a(*V@nd~&qV#MfFX*#xY>i45sM; z8q7>Wh!TZWcKif?z%Q_1hY(vn;HKW&v`}`I7o~o$rF&l8TO|Mxe?p zgxg>ocabEru@r6sQN;ZbM14VoJ=X}he7yWlFWfdKoac5N0Cu~bkP0O**18xdZS>_9 z267wU8hwn^4(f#}l;;|XnLIR6g57L81Z*}NAsxQqLIz^Oq4LVb?5vj+{OU}&@G1Qj zmuBlBV87oBNwUzDe{?PwC>{Li|HQOCrhAXhQ|h9EW?9DbT@G%m1Kn=d0BpBgf%)!9 z)H;bL`j7+InZ4d8J9em$YFXjJG1*{2e~R}7NVOEp>1XRaFfDtAsyH88rDAr){!ORq=N+!-z&Z zRA2G(D58`tARAA^dU6I?mJI+4Bu@J6lT+`T+G)ffKW0AjDet06^dG7rok->c|O_joz51$SJnx+YCO}&>cTsb`O z+1>EanT^YFcEQVXY{u!wBQE|Az%Fm8cK|^62k^2H!l7YlDF6Tf07*qoM6N<$f~(yP A!~g&Q diff --git a/src/main/resources/assets/techreborn/textures/item/plate/nickel_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/nickel_plate.png index d03c41259bba8ae9f0b09a1be8943ce53f4410cb..c160c84fa6531aed3229abd6f2d19a02962dd0a3 100644 GIT binary patch delta 424 zcmV;Z0ayO61=$0TBnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0d7e|K~y+T#Z$dX z!%!Ignk9pVq>Cv2q)K(sEJDStLuM!4iZ9_4^bPbS`UH-}U5HDmE*h#;L1~2MQnQsr z&uMQ6YL_k^xO_kNp7VX*%}puGGHEm#G7nm->GQG;S;`$lu94y&? z-{1&Q6v@T;S+=p}FuA<4CF|}k{g?h7?fYAgb~H-lsXvgRvP=00ja>|XrDp%Yk`he$ov=m5^gu$%JfMqRAJ&{;_itqdMDPS0e*iM-V zkRhbW=n4xR6h*=?q|H0P2%4-r01<$H*!Iq(Wr#TTqI5bP#=kBRWDtsE_{EL@(==%* zP_0%O0Q#UFLz6Lr_HhSkn(`b4f*@dkO?<}M;gJN_m&`rfck}t%?JMRmLa#R|L;;Qlz(4+tB43dcE!n$0 Sv)`it0000|)9l8Vclyo1cpiCKTww{xG>i1}0YZ1+C*ez)^E=X}p$f8B1EUG)H9%xIWeid-w$Xt!pvb8P^|>v^G>4O45L;J zfpi?VBakv4oSvj%e>OcvJZ8HL=zJ5|ibFuNv4fLNjA#9EA%S!P?Bo1AgHKdNPVzvE zEMjJA5OZ@6dw`?nF0&d26oJfciK9^9yJ^M`cuB*iNz75y9# z@agbOeG8`N13kdciwv(IC%xw_v|C{sn+K$GV5JnIU}{J7*`0--_C%$;)(_B3D43A|@{0ahRe9E=Lpy$tn>P0JHb#XTJopmes^`A} a0N5`Qpx8*Yfx@%^0000!5*U zSu)N>Jo)7ClpBAYY^`pS1Ga55(;!V#7V}O9*4Jixzm@=Afi4EuJ7TU@nQ72&&pscZ z9#mr}F-A}v?_e^S@HrazzRv=i_>9eZORkeX*W!nMF@HF?iTtE5i-4`2))+%x2yb*f1}6;^{CpUkdorP0000907*qo IM6N<$g7y=?X#fBK delta 640 zcmV-`0)PF_1Fi*-B#|)~e{%o;5_18JBDn_u000drA*+4dt9k7KAm?6ZJ1^hks1kquX!LM_zd(U^TfB*k50GQ=+`6}hT zZv%LId}LHfLA6pvtJZ*~s!$aLno@--=T(Cwlna$Oj;e?gz<$4Hd?Uj5kG~M~JoIfJ zaS&lR7-E`Upx3pKcquw99cHHsf#XjB+wGRo>pB**Z;(o51OynkeYl2$-;2LU`YFcA z7!p^3Zv`mRnG?X_e{f)`vWjs$!Gvxccp;K7!NBR`dU}Itd`Z9;o;#3 z*zI;qU9BPX0(dxD9HhCc8>FMbR*lae8T(00Mf16`AoRN_sW`j8*C&oo| zRd|xWrq?wJNL8$1wOSnkFE1~Q-E#5s%OA|L1u{Ry&18v-bdH49R>y>EIj{(j$IP<= z?(Xi6fL!?tQh$Wy^$(1q32ehAA5z%e9yR+EZ3xFC2>p`4^0>XdJpyt=%De!_=z)EI zUQ|;zp*LH!cD6|_u7;m+_U;UItp<)|Ph)(3er6h4gKo_mJ7g3Y=Z!FqE~%joqh%lq zCX|9tlc_=|{WnPW_xDVtEEgLhFG7>+s3~sPp<7Axob){c+JB{s2ikk?eL3ge`3T`{J7ZYF@va~i~R5^ee@FB%OfA`}Rz66FyLXTa*Lyg5X%hh2BEjkNyHqL}!!QJ%t5FLizV9NX#H~s+O+x_-RSy@1NY7}` zZsgGyCzzsv!+(eOh@k zH#DSU=(>jV4a{hQMA~QL)-Ikt8^E5Aq0l&!*t|k#5Le4+ z?QE$RC>Cv|3mI--eL^<#8Bf^^z8%M&TVQz5q8uNg|Is9dh~ubPE?&7)e*@32k}{TZ z;P_5vCgzcWgCeB-&BgVrl*=)899mAHkS7d-pI+daQi{FXS75i*l+bmAP(*}4)_iI* zL{kw;C5L#*L`gv)1B5R4@H+qFkK2yuTzr{i-O5IkQh)Uq1ATw2p{LhieYf~$^S}H% X1^sbcoJ^IS00000NkvXXu0mjf_-R$- diff --git a/src/main/resources/assets/techreborn/textures/item/plate/platinum_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/platinum_plate.png index a4d6c0b5795bfa49cac8fb1b2c19088a9cb5cceb..30eabca3a4399d86a31cd0229c1ae057d9f75a6e 100644 GIT binary patch delta 432 zcmV;h0Z;yt1>pmbBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0d`45K~y+T#Zx^? z!%!5x$&x|hQ0!0z+tTV}94yi?NOf{>6*9ZKISKg({sR{&NH=FE#}XQRlKldts zhe-7|ID+r{a&mSauN4bSu9u3kwNWO&z3(tSbo-3M_mMn5b!FjWs3jvrQN%;wu|Jq8 zZniweG-zO&ri?~DE1w=8@!+q@tN9W+U|AL;4Z<+wW>#e&x0IPO5&z{?YPA|U4Rl?X zOeV_u7~bcKZu(k7kGq)5^MMo?mZ)d7S6%ygtS2m)?UVSjfg5km+-3|_5lCpiTTH_>%nxqJIet|x#t0aOF9PxHc}#+yhRgMa)R aMZN$UPS}?eZryPJ00005=f4mlhFC3Lo{{oD& zxd`o~(Xc0|_0Hw4+hdRpb8vwVjV=nNjcnOKu6~S%%ErF{>ue@M$u#tnF`j1fu!ff~ z>?ue`XZ#sutB>L3e**r^BtgvUfZpUvtft<;bS`i*{VMm#;wMO#fbrE2sPzuYtv)gz z8}Nj;xFi?Q8qS6CY#%xq*?c2(AmVNS0000*ydB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tl z000tl0bXTW;{X5wcu7P-R5(w?Q?W|JP!zolVjavRU98rnlQu|kDJq5%5XDc(4~V0P z;3o*Kf1(FVi$-cy$?ZCC2+?!nm5xGpZcG8uIb3nM2MIMx&8j@6@8Bttt<# z6$-LgsgQqlI*f1e8Q}F}D35~y4bl;UAmAo&|I(f+zIl3P%z_5GuCpyvK0iC<#$T29 zN+oi@FbqZ-_&qN7v{xvUFN?o5n>3kV(@H7KtAc12IX>@37`(DF_ai1D2_V_!;t4_ z&}y}qU=u&%M!hcGW|M0VZ8x3&;`WYf7@^`d1JnhOB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGma{vGma{-JZxd#9M z00(qQO+^Rb1rP~1I-Dyv3jhEDVM#jFSi^KxbzsG0P%7 zJjUJo572ANjP+#b?&?Q)5m$TqS$O@1d)Ft4N@WrlOiWC)JCIW1SE@ADR@hgX9w&uG zl3L#7*N-yNvdGwRs zP4mkt%}NDNO7i)9+dxW*gGnmg!-dQMrL7{>!X|r#4ZK>N5qF)?vB3Z#1X^pBmzPhM z7zGiQY!E1LcK7H{rD%B`!?74{xr}jmgn8vMJA(s+N)e02+8vCJj$#Rmh7*JB63KXi zd~usg9e+tyN=3Rl)409e$i)w6-$!TqP)fB4mX?;N*6Qr%*Ln2(8Tmp1U90ncW1Zhe zlFy|giPdjB-QGkb66l>>3WY+OpjN99_&#=DFLx$yuvMuLNeN1E&}b0&K8Nu*(}P3o z@9v_a==3Y+aydLHc|1Rl&>A5GVGz(#3T>Lyr8OkwIJAVI6-8LKecHfvT~gVb#@{1x ijt?O9k1?Hjjeh`&6eFN-8X+P80000}+fgvAM#|$`t8^fLG-MM6f&XBLqJqAlTUo7Lr0pA?Yl_eSlq%py!3e zow@88PHe7m;N9-LWOip?-Z^dCN*u?s4w57hx69YY27ZDdklV}imOF}fXTa#Ub4KHT z0QSHS&c+Tn9Yj%tAV>N>*41_`+1FeiHNV(#$WN4G?XP$yt?QZuc+qC#a$)9fmrdlk z<4>DEP7EyI`#xlAa_Dpq6{FFJkp-%%BKfN`us7=x#Y{&D!;m=(xURcA zFo;pe#BhZL2mK;NQ7|qYU<4DJ0|)_s6g%Bo$<6{_7AShM+G--gg9eo?23{ zz;HMu0qjK^!^9ZDa-2caG<=T*vMeLPLwv>?%_rOux&K^r&H!EP?jYL zI^g1%7(xJIVe?)O{O#LI(tm-BQeWT$*SJ0#HS^~^Ryui>yQ&~O7z$)Co@?N=mX z%OFpFrE_XCe+4?7j@d?C0-Nv)O(pP1{s7-0_yFc{A{UGBkU+oRH)$+Z7|@NM41Ew+ z7%GA~H90F&-$!5$e}O`w;0biQU6VrKnT85@9Y8mqW4%Z$cFB+61R~95(-Y7RRuQXYcChTrM`fJdcE!mwA*cyqXK+BVh$H7n)mIJxb%WPqP5&_qBJpm!bflGsif3$hs{083%#Fw09;SD}@ z2Dgsmcmi68ewJgJk~I8o+|eKq%l;HShp-$BJ!7NMFmVR28OqaefE(R*0_&UiV7>n_ z=Nak~e+6>6+|RGPM)Mjhu_d4%W}4=hKs-w=2BO460!sda5eQiG4Ho96C{fN_IRF3v N07*qoM6N<$0fGo;>rDUv diff --git a/src/main/resources/assets/techreborn/textures/item/plate/refined_iron_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/refined_iron_plate.png index fcd88e7e946275ad02f5b2d26c492cdfb17dc798..0a0cb204d0eba2b43bbdaf358d2fb1aed2e67a6e 100644 GIT binary patch delta 420 zcmV;V0bBmb1l0qOBnkm@Qb$4nuFf3kks%v@aR2}kaRKw(dX4}90cuG^K~y+T#Z$ja z!(bGA4MGqJu_{(j1T_^DqUa##;*iZPlSBTq?wNIQRF_bPf{+S2v_=pF6}1M*RuX&H zd@-P1x_D6Dk9>FU-q)m(Wtn)MC*#2PebMrKY|ufY(GW3fS>BW0SHf5|rWjQXpohAD zeR)=ag9$WU*Oiltrfk$#d1$_B%EH_X^XIn@#@AlVc>nk$QWE3}{eGVXaMy`OlAG5z zjAc;3Fbvwlr$8M4*gM?Y zDad?j1^^lP!LD8O6!<0vK_HV$>%{~BHUUg~8QcqML_j?Q{`+eb`3CH!%{{#jgE@Zy O0000ACBlrG=E*$5RJLi1o%v}2a$KmnNn#)Ccf7>R{IXwcLfoZFY zb(RetTe52yF9&1(X8FgxnhMgk0q^EUS0*Ec#^}36rTh_d>Kjb zfZoihOor~VS)$LcFY+mh2!LeUIpmkuH_lhOc_L}+(96icOuU}f3ikQu1A{?r>nf|Eq{ zK_Y>SDCaj39x_xo5V83bwaO2?Yiq!t8MY$PdKxZ-u d@4p|SU&nAz5kdKaoUQ->002ovPDHLkV1l@m@Yw(W diff --git a/src/main/resources/assets/techreborn/textures/item/plate/ruby_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/ruby_plate.png index e5a77d4cfb6d50bfb8c97b5fb9c1aee81d470e03..4233d6fc79b8c43132a57d380a1f39baaa84e113 100644 GIT binary patch delta 457 zcmV;)0XF{q1>*ydB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tj z000tj0U?{1Y5)KMcu7P-R5(w?Q?W|JP!zolN)ZecbgV<6VwWHY6~!TyA|g15YsVt= zOZ)&`1nE?}ikpLj4iUvnp-aUY2fIa~g%$@xV$Y%P5zsDOJb#efbKiUC+m$mk2QgNile`BOsklGtwZR&ocqkK{bXFV+6%<2T>I9 z91UF8Wr9uojH}hEc=bBhp06(T{1>MuT*C;y?~~J@-$L&*L52O=krqP;Kn%XOv#r+@ z_$fP%!$eg8&?bOtGWzn6=SC4wd%%DH8%2Hqj4RDUbe@*l00000NkvXXu0mjfFq_4F delta 741 zcmVNf0MFoAdnrbB@qj^ShNwCH~ji+S*9`9@u`diyNJXp*Kg^)6eBCJAdY0?(c-r z3g@ov=EV694xL&BfcQahZ0la_*eOhD;ER|@g#^BjQVLH62q6HCSFeK(scp`QI~U3r zKQ_o_hrPS@;D38Q&eHklo;=er@ghavco}CRAn(_h0bGCe7;P$mUlN265XC%v`k0KJ z!VnOc(3G;s1R?8}EaXo26UJ->LUSayt#Lq;G|8-7%#qW_(cQf)Yi(u5>@+f}u`cWI z==nX4ZrnsPQX~mnx_b-Ymjti+760`+Dsf1wBQaVM)PDvB_*5+78YZ(+DXO-G3`5kE zhl^+=7_U_*_P?c2c#oWJ^S1v3QYkVB+(iqJT2t@or9M_=%5^z-wX2c9GGo$nTF5$S z3Z)X&!6E7@B#L8}^bOHtSs(;bO0?FD4CWdMA~c2y2@(mc@)u^On^999?M+GgN=3xP zB#E`F`F}ib4q+Vgak$V(U`UB?nUEjGv6JM6^Q=jwc~i*K(ww0$I}P{w3$*8YgCwX1SlYIAqoB2Ux(nfzSbMnlUMuNceFlS~t zu(^YeV`D__6vPoyoxCluV$a2t!I9l}q36xM82c$p;S0+gs3D|JCnzcm1)3j!u&mTjW2R|K;BR XvdV8nt^<-A00000NkvXXu0mjfW4m79 diff --git a/src/main/resources/assets/techreborn/textures/item/plate/sapphire_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/sapphire_plate.png index 838fc670e17bd623789bae5e1e2572888794c5ec..8f92c7aa2cbf41c9b59270b9cd8ae6a0b01c714f 100644 GIT binary patch delta 450 zcmV;z0X_cw1l$9VB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tk z000tk0rT8?jsO4waY;l$R5(w?Q?W|JP!zolLR>x_eI15e=b#QTa z7X1q+XEQi;b5f_^&p4-xv4T%WBJY9$GM$ zWOKDl?mrC~-@C7jgO8rPJ>JqFA0bH+ZUUW`)ypzz)3p4;Acm0=qboeXr(DAbQ52EWAdX`us5`K|ca)1E1Rw^lyNCIj0)NWB s?=w*q0JI698i2gWMdr!>``;+?4cyntNX1*b;s5{u07*qoM6N<$f=}wm$N&HU delta 611 zcmV-p0-XKa1N;P#B!32COGiWi=K$&e+t$PWng9R*32;bRa{vGmasU7lasggtTjKx# z00(qQO+^Rb1rP~08&}#png9R-2}wjjR5;7clDke+Q51&1J^S2d4$cUSKte)Phy?|W z(OB5n*cg@4+85A*7w`>y1+`NfO-zKs7%D@E(HJ0+%fMl{41WX6jWg%E&$f|ihF)`1bBq&mh-R5dx**%fe?Iw}_AiW)@ShZDOm) zLv6v|Un zE2~JuWX#xR@kgDtJO3CEz{U@B(ckly6rXlp31YwMm?=U{|n4{wpRF?I>^62ywylI=D2E`5A~AOU!5HEd1c5v}KDEqjQIr*}H5t>Y7(foOcj*p) z5Oakr%j7vEE<{<8I7ndb=}Z5-z9BTSMvV0rhs0dX}TgH`&jQKzoskNJ}6+@ zHpfEe>CGKK{MGsNteX(*BW!V+&>kN!X-FX02k;`m0qfY_DF!X_e3?W6vRCq8! zUnEHqT0H?)P-Ha$hycWF=ZHQ;#+D<0%jJ^suR{bGggzO5eX%B#|)~e{%o;5_18JBDn_u000572m%&R$Uj0zNCKi5!B)}M z>ex;lU3vyD;3d3)S8(CZaol=9A{8noMmR&O+9G&{B@jDGkTZ0DN)Z1hl`FBS zM|=@|33z{hm$a&he=|JA+rOZ@b4qyd7jN%e%s&Vxf7o*N(7lNOLRQr(x3{+o;Pv%Y z(ki;x@tDqFhBrQ+1MZHvia((f9bt!4+U}T!6_HUkczk?Z0LdGu56YN;^~_eMu_e}XBtAB*r5M+Bq&pP1g5 zmK{;oebTu#E-x<^z|+%{q^^IRFLnoq_@iUI;dh+=!945)@x0phfQ`DrO18lD_4NWs zs<2+Cc+jPZ_E?dbgdb4HIY}?f8 zEmG<1GH`QqBPjxq)gnrvgrcpJFBHkj8rgh-OipDblNTq*iOT*DBp)BCPXLhq0r<+? UyUfnFF#rGn07*qoM6N<$g2`hn3;+NC diff --git a/src/main/resources/assets/techreborn/textures/item/plate/silver_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/silver_plate.png index a1c01d659166044021206361d34cb8a1ae2ddbac..0e276a6775944d25be6e0963e9f9eecb15c6a466 100644 GIT binary patch delta 417 zcmV;S0bc&d1kwYLBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0cS}>K~y+T#Zxg$ z!(bGAjbcFCDzz>hbTFcWL5fJ-G6Zq%9eIo#QXlzO==Yx)xT`{a}Lbv*v5qmhI!&*T7Cm`~O zlo?aug9(ZuK@hO!6JP~pRujMoAZ)LH(I7|2Mr~Dm->3fd5MhR)Xyycki2z;KSs7p$ z1_hvQRBI?RSI9V?L6RiAj{%_sJO$MG*x$ zoHh?~GmHSt;3xZLex|@*qU*Y{(rV=$0E`Ks8vtG83jh6Y6!`+|1H>>oZU$it00000 LNkvXXu0mjfLfydG delta 538 zcmV+#0_FYE1IPrBB#|)~e{%o;5_18JBDn_u000kq8$*Yn*@ouIEOi%G; zF3-cOYpiE7l*(p_n&00PjmJd*q~-V-f7a_}QUcw{}me?Va8BFTeF-vJ;3(;koQ z0FB6wGonDyBA-4!ap?Mv2bWev0M2EXmIGvTghE0F@E;W$0AT&#=2ir-0oek`H>yhG zfuP-pn~)WVsr~cOgT}|ICJ_b}ml?yyCqR=fmjD9TuT=ruIPCLF9a2{1W{?4g+bz8R ceu(}6zldNT5NyVpR{#J207*qoM6N<$f=EH@LjV8( diff --git a/src/main/resources/assets/techreborn/textures/item/plate/steel_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/steel_plate.png index 30083422773487ac687d1e219f96fba3f0e34ef5..877a5e89b3bb306d2371407e2ea249b878ec665f 100644 GIT binary patch delta 393 zcmV;40e1ey1G@u|Bnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0Z>UqK~y+T#Z$40 zgHRCMlLIS5O3^l0C4V51kS{Q;-;iIj%QsjGVwXy=3L#x2r3SPLdN)H>xq;`- zuFmYfr+y5>AW;;_J2)H;Vm$fVpg|A>(skXStEwulpSji$ss6?%E@2o-k|eTRE?M+{ zJWpKLCBI&;jHlCy@pijOUDxCQCwM#_On|a1UyAcQXPkltmSxcuo%j1aZ~WDHu~?7; ztJR8;25s9idDR)PZTrbY?)STFw_9==7=|J9`J4raVWeVAg@p;GCg<~+ahw2KP_a$` zApo=WdQA?K*=#07Q852?h!8_C6@yQ7Cjv~jVt z+{A0#Y&MdnDQj7ljr)(|m^EzSa=DPxplKQ==&;-EMlpl{#NfW~k2M9qMEyXt1As9B nbi;`w2M53%$07gkzft51cP{0-)mtj300000NkvXXu0mjfo<_4Q delta 406 zcmV;H0crlb1H}W7B#|)~f4~3$4!{9w)`)}97nXidob)1cV=f+rT=pr$065s8Mp(se{GXxS#&y`-Z&nQ zbT}O7oAz_g=QBMXk6(DbUW~FVsj4bUl7#X+CskFq1umBhwQWn!=ab1@*HK;9G|w{` zhCykXt_#3A2*WUNU6zIVzGng4i=tp5xLA#V%wp;|j!c4++wI2AKt`17^-7wieF|V< zXhJi{Vh5-~0Quoye>DQOjV6%bB1y09f~Ze_cS=^>-sCAuA9?5!WCH zC=5f6Aj|T)0KTuN0456T_j{fU@~Xfe9ZC8E$a7OG^TN9A3;+NC07*qoM6N<$g5r^^ AHvj+t diff --git a/src/main/resources/assets/techreborn/textures/item/plate/tin_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/tin_plate.png index 72fd1513bebcbae8f2c0db9aaaabf1f442bb5ab2..e035e8ecc019eb21be276790b769044bcf3569b9 100644 GIT binary patch delta 388 zcmV-~0ek+f1GWQ@Bnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0ZU0lK~y+T#Z$40 zgHRCM$bk}+G=hy-iP)q_VI4xgz&d|s@1LZzF`b2kkS>rWpkg6>#-?e07;=SS7?=Rp>-D9$swzeuG;kb;uIQX32_O8` z+4p^NV7*>5(x7cyCa*dJwrxMz_nGYXdvY2WhA|%)#4u7~Oob07&`s*PW}GL0s}idT zAOv9Mx-L0P(ClXl5JRAg!S#u60Mj%XX%L1X6F|MF)=*-spg5)-$C2;RpePC^ zc!;0T^E|oTZmiw!_j&)aELp<}=kuAI2KvrX6wP7?0f@olIG$??yotx-QFgoC+yPLx iO~1}MSNQLLqsS*8`o(fLmOBan0000erLx>^h)r$laR3s{hgrFD& z>D_N&gx!p=KZl~nv8%eObtfYKg7NYlgqMWG#e19LHkY_Pc;~K%>r16a+Py>9^ZWEX#TqzyTT0 z=d&UMo~e8Rfb~rQ{xIFhB#kV~R85jZ(lk{O_WQkAfX|~VV4~}~sydFNCPOv~{1wK_ bpF?&ZJE>DI+X2Rd00000NkvXXu0mjf_hY3H diff --git a/src/main/resources/assets/techreborn/textures/item/plate/titanium_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/titanium_plate.png index 8ed5e12d2ba00662d47074d156540ce1742bb161..29ce953b66ab0b25558b8b7d60a3e25c6e7e7272 100644 GIT binary patch delta 418 zcmV;T0bTyc1k(eMBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0cc4?K~y+T#Z$ja z!(bGA4MIT@476BW+9fz8h>jNQ&_xu5j+*~Y$?Rko9TS(L66ho$P!|zeXrOfpiM_L5 z8qh9XJZRs&@5|l$k+zcOxwx(?o51rt(UyE;Y~icZ>4>rCl8O$(mp;wDz(~<==wJKZ1%-CnIw#(_s@kvL=JF-G)W7jU^KqkEhb@cFAd=XEU<4&r9Y6@c?C5ZRpByIjx+!58GXJ$ih#@G8!OI;1)oPWI29~v2 zj(Sjyp~M(LaqJ+=GCoIx!C=4ymw1h>)}D+;A3S?`eJkd_x$W}|BgAn`PJ<*_wRd@O zQivf0AO=4_YZqq<{3ZInFS`x9r~sf%0M&-Wh&ec*?tuUPH;Q}%DzU}32FaBTlmGw# M07*qoM6N<$f`#t72LJ#7 delta 538 zcmV+#0_FYF1IPrBB#|)~e{%o;5_18JBDn_u0009*Rmbd+D~Rr70Fg7fI@&gcLG^ z)V!2wxuvG5nWSZQ@iuWLcK?D4$N6OEobQ~OrNKWgx0`I++hkome_;FikpO4FY;m)) zvd8laTRLV<8$4rlu;O$QK!H$*nxCJvy5`|Z<&8_FnqKSmcR?nTXH|XTt7w{Ul8-z& zWn(p)rH5ROsP*+lzF<%UK-zcvxzYIGYPBKcX0ye)T#38gzBq`+?nEG8EK;}EBML?$ zCQKVmAi+tY z@FK+L=T~mGyYeoc$mjy?PUl|$1N3;kgaM&hivhqs$eIfXe;l7&@aULX8~`FPXR+uG z(1`3fBMJmHayWd;r@k-`k0>Gl=dw%90WvNv?+6*de^hJ$fOVfgA_CZeYysp%Dn+Kb zO}!B}AuDhhx{-Poh;!gPArXd#ml?yyCqRb9MF9k`U#$YTacbHwb$r4qH-iiq6-9W1 ceu(}6Dl%5=5SPvRm;e9(07*qoM6N<$fK-x=1PKo|C6y$SZ36J z9Kag#z1^K0a*ojJ_2lUIBra{0d1!5QMM@j%n09~>RID9;KnTFhwztV)VlJA}Y&MzyzQjZfK~@Z&?FcYU zlaU6+Vvz};2Xzb;V+7^6gD8r4jt0K(Gr=Z4W36%^cZ~Ro;sWt}BSuw4@rvK5Rrml!utI zh^*|cycCHF8k81IYLoU8pYDu_VEm8tCbP4m}f65?w8>r2jme;yxj*S$dRs*T?deH8N<7)M2<6Pxh+JdmZ?5eJQ~puVXpi3hzd z1IUS`m$)Ufe2CKbJhG_-B##@pv^D~;TL`N&Y?Ws4IJiTzYH$mUlM4Sc^+WDIlZ?Y_ z1D2z)A;8j41x=f(w3{_{QmvF(Tr+h1>|L|{d^+_6a6934e@a7uUaSfwAfs-SSxgWL z>$rr$?F~Dqo5u|Jv=W8OF=@Myhk#%Af7yXiD)46Ny;9P64g_qT7|87=vAeyAFKa7s zPEFV+F#@20&?PD4_AsZ|v#`a~PGLX8?^-^~r$E*>)>q+}d}}M8wERfMb3*p}coPLx zqF(9Zq~aUcM@z)9^>rPIZ=Vrcj$&%!%}apC2 f-1Q6?KOp`Af)}(+yij_m00000NkvXXu0mjfK{OK; diff --git a/src/main/resources/assets/techreborn/textures/item/plate/tungstensteel_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/tungstensteel_plate.png index aedc19d34140b4137f41cb6127e0663e06e0dd47..89d9a6db0dd9897fab792f1ef0bc79e354dea1d7 100644 GIT binary patch delta 424 zcmV;Z0ayNn1=$0TBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0d7e|K~y+T#Z$3L z!%!5x4MHFoa0o&Mp+mA%G6;5XX@=;klT&^`7eB|@C4PW{lP=ONf`nj~hEi|{v>hz9 zokC;Jp)UlqOBW9$_uTj1IrrYzv{9C&gkdP#Ac`W<)_iO1;N|i(Pzx_oN+Rl$mnxOgKC7LD7Xm> z`@N0g-uoM49W*dalWn2$&Gi*G{;Irx&?E;u&ts&)d_HHgsWM<$)|##EWcDRN5RlVA z)3oZsAcm0=qboe3t2G6F%H3|4iK+mgO#s#KVE=vepWv zE%!@ZK)EdymIy>`Yi*@|Fj4>R>&`S0Y`--<$?WWI&il-~bB+KYe{Q;1dnsVY3LtTr&{V)XjcKg?$_=9k$K1iNr&UR%1lGDvq{{f7~K&ZhmO2!bSR*&<6(MP5C zg(F_5AW?2&GnvJ!Y!!3z6~JN30<45twEQTBTK^d3&IncW2=&1!QU^_pPRCFd{D|%p zt^)?W6X6YnxLW7)e|OGD7k^-UI!AMKhQZlyY~^Z5S6g@*&%x&OKvjHG9khpnd{b2t zcaMKCfI7*(GuTq5*2Ye$hL^iJ%)3HZ`rMfi}>t9B1 zv;Sv_JZ!RpjnI<`;Jw}vG;OL*w{=5SYS)BmJ-+pojySnAq+DzV4l_t-DfaSJ{ z*j^sdcna%L4fp0`IHv(L5V|B@MbEEdK46Hkn3{Aijc{ksE)nE@JBo4gnakd+31 zkb~B{2@fWT#XQ(WjqyVD=bAD>+FfRTk>ug8hbXIqL#XL5B@mHWCW zuW#?%41h6*oEtnK6bi8{|4cx3^BWRdo|jlS!UgrFH5yx+apr(bCPU@{wrx`w4>c}q z+FiyMmo=#x&(djra3HQfzQ~hhOD>mx;~qBA>-DlZ{_vb6Vo^@WfYSql6_taAm5OeP zuIrM`W`8Sy1(Xes%0C!4E3N!5M1oSOR2cthBKi;x&QdGJ!N_A^4dCVE7_)+MxlEBx#pw?><0bOj>th3RSOW`&VQ>!*Xti2D6lf5h zQI)IupvI1tBD+BgrBaFF^n6$q{E$Wf0000< KMNUMnLSTXjywj2Z delta 676 zcmV;V0$crs1knYMB#|)~e{ui-5^@1vWn1F_000$p>+!K_!I*OXGDQ&M-U41>D(T&Btr^y-_)0Fs*O zv}7hcY@{Es@xo7Dh#WM@L8$6PFrdr6OUviP){N>$NifYVmP(RPd>Z#Azcyd397 z86R-)YdtC!b#b&6f5Tx>AtXA{Dz9G#G}r0KFNOK>Zje8_BOGT(iHBP`+KFfOQp1g-%((YVx7@IY`XcBrcJQh_8|Pco)O|W>PT+vtu1h58Kg}70LlqQ&S3) zwiJCu5qi-eqZpH+;)b|!h3AGziz7L&F1hwkGJtgX8XsK&0L5Rv`RtKRM$IGu0000< KMNUMnLSTY0MLI74 diff --git a/src/main/resources/assets/techreborn/textures/item/plate/yellow_garnet_plate.png b/src/main/resources/assets/techreborn/textures/item/plate/yellow_garnet_plate.png index f9ccf1ffafa7343bf9d53638cb367c07abb3152e..d279a5f30612560ad15cf3628fdf85bbb93a8a4f 100644 GIT binary patch delta 453 zcmV;$0XqKF1>XaZB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tl z000tl0bXTW;{X5wbV)=(R5(w?Q!z`!U=Y0qC5tU$bPyCBs)L$ETrAQI-P|%s$q(=s z_$M4)96D!ladTHf73vbi4z?6U!J)P^Vy1?~yoX;1XqPTNXn*hBeR=QhzO;oTNyKp+ znFg-wiuS{&#tgnJ%aU=Yk+70t)c<0fUz%f7Ie;4S_IS5|oCdaS%f)F!DhJC*Wo^}v z(#kgZ=i4LW%j zG)+btgki{JQh#S)JvCSO7{pSm)yQd}X?TAaBy`b{Vq?u!0h+2_OVu zW>q%HVX|mw;`=`HUzZ3m1bH!dej-5Ebw(PL%Vj2jdQh#Q#8^Rb+(8`2e2xaKR*MM^ z@fywjsyy7@uy);i%Jx4$yJHP2^m;vV8U#VW1Rd)2ojyzqApkM>p}mpS6!=T@JWpoR vs5$@`6F|52{g8Rv7_!E*5~=+6zft5H!b`^+fEdb{00000NkvXXu0mjfRNls3 delta 700 zcmV;t0z>`Z1JnhOB!32COGiWi=K$&e+t$PWng9R*32;bRa{vGma{vGma{-JZxd#9M z00(qQO+^Rb1rP~27*J40t^fc6VM#LE%LzG{?2ora~{hW!|d!V|5Nkx^VpoQ9Du2*DT3vfCY$NPb!;MKp|wIOMO!Jt zNMTtP0AUyb8lAad{Q=C(%l2*%|?xLRzQpgSO_67#;~%o za@<6%G>!^Uk->}h80zzBx0;OgrwBI7SnVV1kxT3{N~{x7sZ<9rK0c0<2qNXt+~2}= zU5ceLN3f}e+244NsjOo%gCt4P0W2*oQLWafl=3{DdqMt70Tb1DxBQj; z!v-HWN~G)SJkM<*yfjAcQYaKUSE$u$s8)#U4{-O!b&BN!w31*F4jU0F3OPFJ;?~ts zDwRDFt&hKQE|;SzC38=oAuNLsf;d*R;{=0Ey)_~6(;jUjXvZ2yxW@rO5a3TtTYrbd i``rNkKf-k4H2wt7nIxb{ry*GY00005d1kMAHBnkm@Qb$4nuFf3kks%v@asU7lasggtTjKx#0b@x-K~y+T#Z$3L z!%!4`4MISTRzVO&9ZbQE3c_xN0NDDKvUc zdmj<)(!~SGJ@>tL&b{}gtrSI}+U>R)1-|bqW57qo7+$SbOU*4*3$A?Qt^3M2Q=Mgh zlpMes^3#*^3UV5Fo~MG#GgVt%L#mb*SJd=Wl{|g#GCsdNF=n41KMXlSp65(}&f~*S z@zwPOV;MBCEQ_wF?Cl?LS3iX6v*dQHGzVh{vs*`C)G0J%t11LT5*3;z4xsMHrG1;cj_F{-uz00008NkvXX Hu0mjft{b?F delta 534 zcmV+x0_pwE1H=T7B#|)~e{%o;5_18JBDn_u000Z)Mvy~oZP(12_Ak(6*pGB)zM0+9=pQAOqNPNF){-&af816CI0MS&62~{9 zyto>2F~98NV04B<@i+mL&Sa?9@6-C$3b)=H+-SYJwbT6&JXUlrS4*5L-0;0#VBfr# z^>Ud?l?u^dIHUtr6# z30Z;b?1j|xE0r_XrxL+4JH{A3J^}Is0s;tNzfJ{kqdz<)btdSMn?VM=p^)%K{Sf^D YM4?(3A+ecF3;+NC07*qoM6N<$f(7>Jj{pDw diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/almandine_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/almandine_small_dust.png index 5d1183b1799aab49a08780f19733db7fe0f09059..44cf9093961dc60932932ff63d5c1196399c2570 100644 GIT binary patch delta 318 zcmV-E0m1&~0@(tPB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?ny*JR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z*2~HL2Vp1|E5K<0NTZOt3WKt@6T=31c@#sC!vL!RAk83+>VM(hU_Qv8aDM*(AdSeH zL4Ya1SO&_30GMVmV_k+6nzw?OU=#}dXN?g1QVSIcT-eF>8LYN5C4AKPB3^D`+ zG+9|0JayF>47j;53}O2I^EZ^qz_9$o2e4+C(~mbzWDr!5W4QkNH^aM|cNjkX$Mi8q zI)K>#axx#|KR2)#NaMY4pTX=^pFW}J!7u;@(4C5|ktk5#*9XRf889#a02V1vjKTh{ Q@c;k-07*qoM6N<$f|!Vbwg3PC delta 312 zcmV-80muH?0_OsdBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`lDCYXNy#sB~S z^hrcPR5;7+lCes|U>HTupW5Q2LXk*FQG5kA-#}cPb$4(OH*Nf-;2^kUutUZ|aP33* z3NGT}VvDuVm`02V!T)m(MiHkD-u;|A+zbDi@m%$K1Y!6$I0!?IZAUz(B|l1bHrz_s zb6PUFe-7mKQj2z1zm-^ZOMQWd-kBVpAMx@uM5PIPyW2dToK{M#_q-^tQiJihA@Fi3IJXg z965a&Y_+wC35Gg?E&yqk5D{TemX~KZdgcs@ACSWUD*$PJ{(tHf(Ch!f^qu?n|F=z^ zj2RF>z!YFC17$)0NHfS*2~kmo7q4G4eEs^B;q2wh3?f284A=}|Vr4=&2c{XM38Wch z2na|^N-{WES%JNSZV1!&pTD6@28Kf?PJlHlD=2{ZK)*9^b8|C1eg2%`#hW(_A3uKv ziz5S!(16(hayc?TFE3aOr18zWcVKo^ZZ3)*oWY6iRCJ9*f%?8aFdoc+fdK$)BWN+t Sm|sr-0000A>0Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`lEBk>PA2mk;8 z%}GQ-R5;7+lA#I$K@dRSEqZM+h|Nzh2qvR{V7qc47K_av5R37G2BY9N_#+CJ3`Rxa zkmFokU0I792;N~dIBl4Dj~Qm*A3q+G`JCBek=rA(3NO$CHcukjjcO*`?{w(-K6w&R z6wXKZb_HULq3d~>5^>S@Ojs!ez-GIpUaJAv@pSqoC@k0eG`T+>w$*I13PVa#a)=^~ zF=(wxltN0$?s&97I=1s+e|tTjsg%pOuFENoiIW7aH8*P+4F=BFXB-9r!yx$aXL|yJ W;9Jdi$qfDg0000 zNiz9#9Ivc z6>xq5#u$WQXibw0NS&xYKTiat7D|!a0|_ zi8WpQ0=7&kl`Ur|R#heIJkJ}B6`*Oi+7^4U&NBJ^GXM{~cv0v5|AuD(0000)Ccgi`dYvF5)M~fPN7GV?{`~qrg6s8r;y6b503dna;JPj^ z<7av7_YVXI^+C`Q&-1X>QmGhHet1TQ>6lcMx!Gl1;$*XlqOA6 vthE@U*zNW#m#^y2OZ38!UKpPF*?s{3p=I`B3*00000NkvXXu0mjf*Y1%n diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/andradite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/andradite_small_dust.png index e7a51d855dcf7c10d616a302b3ba5f2daee44c7b..8de60b56e76be5a6db5a27f63208b79ac1c93430 100644 GIT binary patch delta 316 zcmV-C0mJ_00@nhNB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO>`6pHR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z=I3zz2Vp1|E5K<0NTZO93WJKJ3&Vn3ZWKe1!vL!RAk83+T7S;|U_QtoM-9gRAdSeH zL4Ya1SO&_30GMV8HGPH`w=Ocgd;Eam^2KWmDw0eL4(bdT-eF>8LYN5C4AKPB3^D`+ zq=nfSd_8m+T#Q&S3}O2I^EZ^qz_4)lH?U@y(~m6dWe}28V0ilW7sIU7-z delta 311 zcmV-70m%N>0_FmcBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nf5B(zsiU0rr z^GQTOR5;6HU>F61988)&pJDom@x0~5nXhJ@@OhVu)Ouo}Yj{pW8K%@-CX z|IcnLe`fgj?m5HvPp=sM{b6Uge(4T_orwg)g@wug+a^y&F#yH-G)IR2zK+TaAAkL4 z5D^w+c=`Mt1Jj>R4DUbuVqj$Y&G7c~UxvMBe={7ugV4u_?xYMyhW|hQFfs@VaxyS6 zvoO4U|DECY-+v6BzW-@8*Z}`EX?i869h?9F002ov JPDHLkV1k-ImLvcG diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/ashes_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/ashes_small_dust.png index 44690f44e9dcfbbdb5f1735708df48853bba2e34..66a728489eb22ce890128e651a9bb548965a8eb5 100644 GIT binary patch delta 305 zcmV-10nYx`0?Y!CB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO;Ymb6R5(w~ki89qFc3yRETuySZEC55$Fb4$_ zKu?2^q9}!vb9~~*QHYcxc@l6&exJ{WpW~SCE=nm=JtSw=K7R^W$_$4H{r-Zt9TY{O zkIu5p+PB*Q$-eI+iXxO{xw^x01}_6hCNT&Cy{4cvO%;htnGo`HH02YPJf`Wjp+S0)e2zkj1 z#P|fp&V2Ge{?@|V&YW|n7~q=^&+d4{A&TDaD072D6ycg>bj~t*D_O6Wf5NWoQc)C? zrYU)ze>W>p77F{_d^%AO1ZbKDec!{jZOmPw-0qJFe93e2eIJ~22q6FfRaL<>OID8bn=r&C3_twYp0^Khbr;Vk4SN6p002ovPDHLkV1kNiftUaQ diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/basalt_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/basalt_small_dust.png index 7d2c4f2bb16b8ccc419255e295137304b9af1750..4ffc8b9e1f198adffc641fb121e982ec7c38d1fc 100644 GIT binary patch delta 293 zcmV+=0owk+0>A>0B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO)k#D_R5(w~l1mDMFaQOg!Kx^(6x{R-y68oEqu#(i>~X?_dV*mhUa;RqGZ1G58n4T3;DqsRy; r%W~$d0*2*LmmcCSE_trTKLgwWOMObr+xqZM00000NkvXXu0mjfjdpyA delta 272 zcmV+r0q_360>A>0Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nhGM9ZQ82|tP z%}GQ-R5;7+(xGmHP!xyp@4|*cpzp+@k zwMEr4K9j;d7fF<6@Y1)NYj)<)9Cy0xCv~|TWdATGDL(V zN$}pIs)P^#2q7?zBf~IU-P6}V-}lBCqsy`o$1%njLI|iTA_B0%zi!{Q?A!LipX~w; Wievi}_+{$=0000tQiJihA@Fi3IJXM zTHJL1gD{kf72q@gq)|{(fnhCGQ9orgW>)27Yr}H{sN05 z1B`S4vjOB}2{~>yuoy_=i;rKy?EMekpyF61988)&pJDo)*c& z0=)bT@7{l4VEFZ&;mg-w42+Eb7(V{~%W(0@dxk>~U&HmWARDms$|FWbMuz`ie*R+M z;bv!GVPRqT_~i$~pa1_DzW@Et@aOM86wL%dAAMgRLw#T0AWv)n?VfGW`^|^T00000 LNkvXXu0mjfk`tXG diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/brass_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/brass_small_dust.png index 64f9d30d69f3ffa1ab374bf832ad0fa030498185..a49a35dedcd942a5f0b01f794496fc29e02b08f0 100644 GIT binary patch delta 319 zcmV-F0l@y}0@?zQB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?@2^KR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zj`z#{2Vp1|E5K<0NTZ0LAcMHJ7sH7Oawvu%hXGatK$<}sMSm?S!F-TGF61988)&pJDo-_1se;q$M*4BUdU z4DX-aXJGyRnc?I6?+lDA{~6wX_|I_c+7E_lyFM{uHGqMEfuT1|`2X9_e;N4LnHX5v zSsC8G{=xA39|ObZpZ^$G7#SI+Z2QDWbTroY9`!NQ_w^0(#0CJ!jBpjydCr9Z0000< KMNUMnLSTYWEuvQd diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/bronze_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/bronze_small_dust.png index d5c4561335579f4c7f77be87c5291445309e7185..eba530b9375c842c1c37ebdc915a676d0af9ccaf 100644 GIT binary patch delta 320 zcmV-G0l)s~0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zrY0Ev2Vp1|E5K<0NTZA}7lWa?GQ+e)BNRiB!vL!RAk83+x__R@U_Qv8C@Z=DAdSeH zL4Ya1SO&_30GMV8Q!j=Wr?)Y@e)F8+%JUx#qI~QOk(RO;-eF>8LYN5C4AKPB3^D`+ z1layDIO~Wr=qQR|7{c`Z=Wi&Jf#Jx_H(<>$r*B^}nL$)UlHtQICWa?(zcIXg`w=XT z3^39G%m$E?#W{uf!D1kduRr|+vzH%#jG_m_02n}bD!N9ZKz&~y7!PK^zyJVFUQ$lz SpfeEw0000F61988)&pJDo42-|NGJO2}lYx=(FT?w9zZs6*e#fxo(hImg7Gwh^?z_*(#K83b(~qAF z{JfkD%q%Pn?>>HI`19{S!`I*c8Gio$i=vqzAgJ%_W2o=z8{~-%0GSGKVz0~Y9RL6T M07*qoM6N<$f>r^Zy8r+H diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/calcite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/calcite_small_dust.png index bf010ef8408f419f52482c2269f98b1b90df2d34..ebb53970b5b301c57f94c6e12158d38118ecb4c8 100644 GIT binary patch delta 320 zcmV-G0l)t00^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z*3T>b55iC`R)Et0kVX*+2?iByV}=d$%TNqK4g;(PfHZ?N%73eAgZUtXvXg!PgES&* z1_7o3V;LwD0$`f?g#{QszWu=P;q6m~YgcbFNQnwEWF`4vc!!CV31K2kGe{FiGsqAS z5EJHSu(vm0(ASj0Fofy*&)-lc1H0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nlI1|JK0{{R3 z_en%SR5;6HU>F61988)&pJDowEvdzrOcBK0}xSjAgKDet&)M z|B{*thVb}kh7ULP;WUJam5C8U^M@Pz{%4ouGQ4~HisAqNpA4bV0SvfY!u0*;Zw$>T zx#dRxob&eT&i_{CS`4QT z?Pd@Z5MX%q>J0tm?z>l@^W4FC^SaI``3sKx*Q N002ovPDHLkV1n(KpPv8# diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/charcoal_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/charcoal_small_dust.png index f9dcd1ffa7047ce83281c81e989900dc51b9531b..1ffd43ec7038f2e6c26a01e9c670f40a502653a0 100644 GIT binary patch delta 318 zcmV-E0m1&s0@(tPB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?ny*JR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zwAEz)gD{kf72q@gq)}W{h{04}jX_6U4#g1UFu-a6NHa*IwSS2wm=7{YM2PP{NF%al z5MT;0mVq)M0H#@1N|fR8v)2rdp1oms_~a!67biP|uplpncbHh25GKMjgEWCOgA4%y z4t7=sRYhqA0X}XFLzuq*{0(I?FuZvE0jwG3^mW^hGRR4ZF#G_jdHMPs!>`|ez~aaN zBOSnO06CeBl{W<}2GaQL`%f_Y?fcItdN2%t0d%LLYa|NP_w|ACUS|z0RR91 delta 281 zcmV+!0p|YM0?7i9Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nl9>K|h{r~^~ z)=5M`R5;7+(xHxnKoG|9ZKaNZ)>`wA$o~CpGuB#jQ52l#Ifr5R6p=eA zzQrGhe*_vnx?SUVwxrZK-;#6q6noid^(?3z-qlx zisLv25g`Zy^nDNK9L8~k5CZc&qiGsA=fo!Pg-9vk`#wC+gS8gS3?jlX3?L%$>q{J~ f3dgE?@n?Gg&(>kp+FyFT00000NkvXXu0mjf?8JcA diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/chrome_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/chrome_small_dust.png index 138a9c8e62ef45d257c0dd4b112d6c27f9be190c..ed64373079698d7c5751e8ad91cfb2644a16e8c7 100644 GIT binary patch delta 317 zcmV-D0mA;?0@wnOB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?MXyIR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXg z9N)YhY_)}t2ZlOiZ(s!=%?~bJ{r~a(`~M&|$Qv+B5P&p*G=G8shz1!nzqT2xPNo23 z87LD1K$^8|EExC%1Qx*W{@V3W{@Euz$+-g zVCZPeAg!u`VF=UrpTD6@28J7_&VV(`>uQ1dC${Wh5R{c-`279@!}Eua7{0#$2o^^M z7(ofM0pw(EK{kG{7)axXH?P6$#O7KQJvie6-Kppri30U~ePBG80Rsa76v}rLI7)Od P00000NkvXXu0mjf8T)#r delta 303 zcmV+~0nq-~0^S0UBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nq42Ry1`v3p{ z>q$gGR5;7+lD}%gU=+oF3F#mqNNEEOeE?T!pP);(Qs^t_U>6_3&CPG91VqZtNS2FaxkM@`gxDvx^~>zXiQKoE02pJqeW+8E#7^~hp?SUj0AM^EQN60+ z$BA@$y)A(A^g7)PXYUKC-CQ$ze!)F0vz*K^#-O$4bCuwE9_Pb10XDI%-AIuNWE{^Z zxh{_5pwpDERFh?fvRE{_9qZ3Eww0o-)R8~i6%Vh~Y~yRPu$=$^002ovPDHLkV1mc} BkF)>) diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/cinnabar_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/cinnabar_small_dust.png index 9d45d9ea9a8a4f62710a7f4f4b0d7388ee30f520..ed8eb952fe4b8fc84579db54c2bd4e4a702b982e 100644 GIT binary patch delta 320 zcmV-G0l)t00^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z>bxEPgD{kf72q@gq)|dxkipWynxWpu5ycSXFu-a6NHa*Ik$|NLIq3FRd00z*Vims6;P~X=F#)BC!FaQ8_*HMpG S`cxMH00000_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`np7Zjj&RsaA1 z_en%SR5;6HU>F61988)&pJDo!oegF9zMf17Y zlmF*be-to$c>S8;%ZGOi{~4GWZd|*~V63jhaBlYG|80{eqZoiGQ52ChT;E@?+hQmd}Cl__{Z?^$4`bc51ujXy>Sn&j|JI)dB-m>GBGm!|NP?z z13xzx12YQ?!~4%)82tQiJihA@Fi3IJXM zN^2+l2Vp1|E5K<0NTZIHB7?c1E<;(}L=;1i!vL!RAk83+vVW4YU_Qto3oF8LYN5C4AKPB3^D`+ z#08ld5|hIj)Qvqc3}O2I^EZ^qz;I~K7O-ZR)3@(E#K6tY!|?L`Uxq8!?lU~PaTY9& z3^39G%m$E?Bvriu1gQ5q+02n}bD!N9ZKz&~y7!PK^zyJVsQ&jY_ Sky6?K0000$DuK)l5 z^GQTOR5;7+lCe(0P!xv0dl8o|xH}S8jXs79#-NM3sC6NX&TNhyU|=Na0~n3FDHIA1 z(HM7YsL*0)xm@Q)N*o#d*K@w_oa7w%&xWVj>Cm?AwLLPg(6(({*VB&c>2(r$aFQJXRlnQ+aKzORx2aOj6b_J_2K>j^E6?nRN^BDP)ZTcW(XmO;~3xfabBLpN&&$6 z&7J=G3@{9XtwMom6rq+&(j-9?w|RYj6n{Qr9mBF{Sk{I=+YjPIZFwvNd4m7|002ov JPDHLkV1kBbkPH9- diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/coal_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/coal_small_dust.png index 57e39f8e2ed6daa62cb4ed9974d5f052bcb0cbc3..75383f91df1ba5e4355292f34cbba3a0dd1f114c 100644 GIT binary patch delta 302 zcmV+}0nz@!0?7i9B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO-bqA3R5(w~l1mPPFcd{EB?gEeU?4hh3L9`E?#LamMTZV>fQgYd zhE!i^L;3hg9Oy|(Uz?oU*9QC?N6&AOQtIjJ{1Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nn6CwN1%>V!Z z&PhZ;R5;7+k|A${KmbNx;bxFXGI6;JnuPuf)Fl6=#muZhtfI0B{|*NsfpB+l)1+)m zrYiRQd!PB>pC{+@e&^OSf0J)bgOt)MrTmYPx8v)std#O)S^A{LNbnLI9^^|^ z`8>}VcZLCLEoqwaaX#-xf@!u7a+YO`n5<7ms0v9NifC` zMG@09u`CPDIhJL?T1(&ev~7FX4FG7Z{XEYIAqc||V+`xM;+zB6$iH%`Yfg3jtQiJihA@Fi3IJXM z*2P-=2Vp1|E5K<0NTaZ%1cQ==9mD!KYZOC}!vL!RAk83+vVS%{U_Qv8Xd}7*AdSeH zL4Ya1SO&_30GMVzSv7`Fk8d%2e0YoD&b>zr3If~=QHHV@-eF>8LYN5C4AKPB3^D`+ z1UcCl+)cF@oR!5f3}O2I^EZ^qz_8}ZW3XnJ(=V)^!@w`E#_<08FNU|zUohN#`vokH z3^39G%m$E?l{tlZz+xbc4?cVavzMKJjG_m_02n}bD!N9ZKz&~y7!PK^zyJU@e^WCb SMhB|^0000F61988)&pJDo7@`vb8E(#O!Dz54Q-oIh^&%nxX^Xgp&b5&`ETeDjKw@sdmVgQQu`R0oM-HbIDKL7j6 zAS@ur@bcwb2F9OX89sjb$-v0?m*M^Q-wekdzGK*O^95WV3$g(dPu^!_Vqp6J;>$M% zUTzKsCT13fk6*qq{Q3W%;oG183`~p+D4Gd^ANsyNhWfs~L7vzE0p4s2eM2Yk00000 LNkvXXu0mjf!@HS^ diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/dark_ashes_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/dark_ashes_small_dust.png index 25c6247efce41c031172b835be2a6256a1e3b5bd..2807e676c44802c5d1c77f77dfd09eb4a4480e55 100644 GIT binary patch delta 298 zcmV+_0oDG)0>uK5B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO+DSw~R5(w~l0gcCFc3w@fQpFXN)URBZuA!MM7@FM@*J*Qx{(mG zNITO6qp_{fMf)IT5_mt8ApD%b%pcKOo9ZD2t9B~Dl`S@e(SP>~-Ue{aH4d{pW;~46?_O8Q1 zwkBHHN*IEqX$oaoLY8G-2oqA75?~xhl5Ok5FhG(dFwZk6rC?bW+IR8(1A79t97PfB wp(v%Ky6^jq<0A!F_O0&4Q{1|a#yh($ delta 275 zcmV+u0qp+80>c83Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nqGcmZM#sB~S z&`Cr=R5;7+k}(c~KokX^uqGrlR8%H}icnE_fDN3$8`)V>XkobsvxE0JkR-E#5wGDtMW}L&aw<~9HZ9yWyIM!n!6mqlPPFQw!#3_(Qj zJP*bg%<~K)g0&Vzgud_5G|gr;002c%aND*JLcn!hjN=GqhP4*H?=R$!9Lo~Nvi$M0 ZJpf?ZXcy}Y(!&4%002ovPDHLkV1fsDkW diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/diamond_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/diamond_small_dust.png index e00e50692530be45ee9f6463ec4c3124944a4054..d88d75c08d2678add2bb8b0288e3b296991d5f8d 100644 GIT binary patch delta 313 zcmV-90mlC60@MPKB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO=}AOER5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z6pn8F55iC`X#k|r>+Q||3xB@=8v^nM3=;$(4IqtI|9=D1Ab*1di>k2dWC}2rfifWg zq`A?|n8AdFkKxRpPYf$RePp<>_Z$PayaEF@Lzq~Z5D@{>4AKPB3^D`+*rfRw^kVE8 zI4yKB3}O2I^EZ^q!0>VHQLyH2Az3ir``CVla6W#9Ur#?VT)T0Hf$8~YusAZnNCz+* zKu-QA$qN<(X)^r!@Bx_pzOM~M56*;y?o@P*M1lIgJ}@54fPn!3q~dUV3XXc=00000 LNkvXXu0mjf7$$sz delta 314 zcmV-A0mc5*0_g&fBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`l59pS8<>Hq)$ z_DMuRR5;6HU>F61988)&pJDo_H>$=~k7X({xRN0~z1Y}VxX_Uw| zh&nw!fBe;)Mv1gq7u4$~m}F84QTxi;Fq>o|&E`2;KO-V|o<~^{^_dqN=0@WTtu=A{ z3P2c!*tSg?jpVA^{RY^(eSBXJBmE+^+7ZLy9ggELon{zgn9o0O-2?JGr21_#hX4Qo M07*qoM6N<$g6{5%ApigX diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/electrum_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/electrum_small_dust.png index e1af1e395afeaa895f982ca262da3c89e929473a..278f366fe7c6cec5ad85a47d808aa1d0596601ac 100644 GIT binary patch delta 320 zcmV-G0l)s~0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zR8LYN5C4AKPB3^D`+ zlqFah{2dh;bkxK!3}O2I^EZ^qz_9VqQ?O>3)6X4V!N4b>!EpD*Z-(cuJ~F(0`xz{b z3^39G%m$E?g*kF61988)&pJDotQiJihA@Fi3IKis zR_Xi)V>|%20YHu7#%2tTo)HX;t94NfK@J1#1^_jKG|o`S27hxw1~G;({s(D9)(iqn z0md>=CKNz5=W%&5O!~H+;o7Tv3@>*aXJF8fU|07*qo IM6N<$f(}G-ZU6uP delta 315 zcmV-B0mS~%0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`lCH8<_-+W-In z_en%SR5;6HU>F61988)&pJDocnt|Kmcgo7BisJ}ipR(Q z_nuhuUn|!Ury)$NOpF+sC!e1Gzr47C;n};_3||?3Glaw@Fibo-7poym-+%r_(LCwY zy#EE+e^m@GKfYsl`}G|I^Z)-0x36DgkTKU_m~?91|F+4KQ4Bz_UOCJ9zm}^h!{4ue z83Y6c7~Z{l&G41s2gCOdpBer!GBEu4^n>B`vHJ|qcU*((V?j3H?zE$fOw9lP|NQim zfs3DyfrXiw;p@B44FCT8XZZi^H^ZNwzfm+3Aq4e(eGK(|eSp1ih=+D N002ovPDHLkV1hMFo#Oxi diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/ender_eye_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/ender_eye_small_dust.png index 8a3f1f49f408ba90ef2adec4627be6dc9b49482d..403fa76240d75cbc00545e095d92ac4664ce7635 100644 GIT binary patch delta 320 zcmV-G0l)s{0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z{F>YTgD{kf72q@gq)}YrJA<<3VFv$}b`(R9!vL!RAk83+Mt^4Sz5m-eF>8LYN5C4AKPB3^D`+ zWEGSc+=D$B6wQq>3}O2I^EZ^qz;I~gYOrRQ)3F61988)&pJDow!>?Zq4SBi@ncFsCHH7K=&)=w;w{83% z6Pd{Hf9>skhCTQA8UFqL$*|}UCxeigDMRLt&HvjbPew5S)%rl+|AJPg3}RpJG05<- zGCcqIgW)EFEW`h=9~gufKQO%c$j-oU{t^Sj>9dU34PankUR12Y#Z!{2Ye z8Qf*=GVFY$$iVRJ2Lr>;-wX_=Pcsr76ZL(49Srq-eStQiJihA@Fi3IJXM z1mXh!gD{kf72q@gq)}8&nL)+coIx-?2*nWOFu-a6NHa(yyML!Gm=7|DMP2bfNF%al z5MT;0mVq)M0H*nei6#Tbnd=N6U%z2^cJdqpv#=lovzh{icbHh25GKMjgEWCOgA4%y zRzZFSd2eS14s|6ALzuq*{0(I?Fnm679;_MW^d}P+Fz}0tF#LZ1k>T~Ny9~eIya$UT z1B`S4vjOB}RyYwsuoy_=-?tFWe{VfN(SueDx+I(&diKxf8J-9Jv*NjIHfh-Qa&W`8p{xr>hq6#|u$fPW zD@8fKf4&!^?Fh%EUnN>vQ$JwSY0GK#jHlNZKEseg`2@3jl_=4s!7L7UTVfbhp5Nc- zkA_6EfX9a(x$P}Xrz02jdQ1?n*Y_p6yTg1uWo>-}Z}5Q+e2qO&3I-#%y#x0~B?|!b zJ;4tklR>34WavQ@!NdnY1lLu6UZQ4M)GTYo7ti($(Whiufr4wT00000NkvXXu0mjf D9vOy) diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/endstone_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/endstone_small_dust.png index e6011189a99270927dd3a9c3b725be7eb176a9a1..037837290699d08941a0f682cb9eb4167b28dfd1 100644 GIT binary patch delta 311 zcmV-70m%OE0@4DIB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO=Sf6CR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXg z+v!}l*Az+yk%e20o607mG-Yydf# zLxdA72GaQB2QZk)VC__jq6fnO7(jO_x<;ZveP16K4`#r?003O5T)06Gci#X2002ov JPDHLkV1f=ybszu$ delta 320 zcmV-G0l)sz0`CHlBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nvHt6J>(*OVf z{7FPXR5;6HU>F61988)&pJDof_)jjef!S9$oQMV$;qC9>GNK!hA@5q`5Q&^ zr)QV`e+LG*GJOC3li|mYUkv~LF*Ce+{gFXI$&%sIvy1=RCQn8&fMv_27jVv-2WS6V zS?Mu6eR7+DnT40(^XDH7%uGKR-hcSPz`(%7AR^4kaPh*<{|pQaaAz~3JE^5P|NpC3 zuNe4v`52g4SQtKh_`vY@?>~kgKYlW>vNAJFCZDmIk?3fw@9Sfz@9P`ni46efL~MUL SS9r4k0000I=JU6R1Ao(oUfAzvVTq29ogJy>1r z3G5Pr8boy1oM{*TRzipR!ML*v-?yU(KaV2TkKvq)u7s2d8-FCI!!lCB==nw73Ov{4 zSYq3omjVQ*rU`4`hn43wB=v95D?k{*AP8uWB3;)xf^`_fHj9~PpOLU_+YrYw)v>IJ zVSuJ-o!4O_Rv9HML6l(1+hOTAFt@CZgk5iU(E{ub2Lk2jyC@<_mSu2C61Wrvo!8U( z59AFv@>o^r3@pKOno^(Vd4uT)WZI*)!9m%EA=N(z-~sTaPJBrHw3h$?002ovPDHLk FV1l3TgJb{z delta 286 zcmV+(0pb460?h)DBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nw8?+$t=Kufz z+DSw~R5;7+(k*YoP!xyp=iZdPKsMQll^}ow1cu33{HFIMCN`2Sh$a)r3J^$=emjyS zOKDl@+dU{mL&FjjVt@bqjydqZGv92vWa0a##S7oZcG_Y$J8~3xesHSeW=BR(FEV@_ z9Yu6af2)JooqS1eFeC^9aszkwEk52pD-j(h*+Jax4~W7waU7!%e!f>+)o&TUzRPqz zF9D_Vw$m2t`UaDwT-FssXZ~zEP$6W8UczYL00000NkvXX1g=70f>L^YW&i*H diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/galena_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/galena_small_dust.png index a75dc88fdc857f0721290530464a2efd0f277a34..5d478c78e1a6e7b249dc972d2c2e34e5f5617afc 100644 GIT binary patch delta 320 zcmV-G0l)t20^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z;zN`FgD{kf72q@gq)}E*hQZ3(njs-91;r5LFu-a6NHa*Imw%5Rm=7{YPD0^7NF%al z5MT;0mVq)M0H#@2U!URf#fuD&A3tO`aqJX>h>!?_thhXecbHh25GKMjgEWCOgA4%y zX&EU7Z!aGPbtNqfLzuq*{0(I?Fzh?D2do+9^qJG9G04iwGdz9rjN$R4Ck$^tyaJ0O z1B`S4vjOB}VL1UYuoy_=n|E)(?8h%3qUgae00z*Vims6;P~X=F#)BC!FaQ8`#ZgsY STfyi60000F61988)&pJDo7;h z86<>-8E#*_%<%iyABL~rzcTz|{LAq3`%i`^FCQ~JefgLXs{srQ3=AqNdjJ3Z`NP1+ z#lyhH%*62d>lcQihZ_>ihZzd13&bNQM P00000NkvXXu0mjfB{-hh diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/glowstone_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/glowstone_small_dust.png index 25c2a003944441e42e1d94c815e8ef3156bbb7ba..8c6a0d99f2c56cb10b233309bd38df180bf325f3 100644 GIT binary patch delta 319 zcmV-F0l@yI0@?zQB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?@2^KR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zwiG)22Vp1|E5K<0NTazWAA`5I9K+TkM-)Sl!vL!RAk83+e1BSgU_Qv8Xe-(OAdSeH zL4Ya1SO&_30GQ@q5_Sx1FAg!hdG~=~@tOw=D*UVrQI;|o-eF>8LYN5C4AKPB3^D`+ z)TD(Na+7o!Ok{;H3}O2I^EZ^qz_9GZ9k6DY(|6BZ!XP3fz;Ns7JBE|TKQVmx^cgIU z3^39G%m$E?1vvP4!D1kdcRoTaT6X*iiXIFDU;y2z=o*Ov^?iL{JeUCk0|0LYRDYej RGs6G?002ovPDHLkV1oEkc>w?b delta 246 zcmVbP-H@vkA7N&2S?-5~r!d&SO`WjT zK;OHaT$DglC+|bl<-EDvb*rZdoTjb~5%`v69`Bte0!s-f1;nvyFbvL5wJlIpD;K;r wA_7N|n}qh($07*qoM6N<$g3fwpGXMYp diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/gold_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/gold_small_dust.png index 6bec2767134059ac5665088185803ad9f4a8d3b1..a51c7e60971a20c5b6389040cee82bb3c2f44a3a 100644 GIT binary patch delta 307 zcmV-30nGmA0?q=EB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO<4Ht8R5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zUTzfq55iC`X#k}0*EO&If4|0q4FP!rh6w_Y29U=8e;eImdS6fUOnB_$oK0p1(@c#B`hHK~kfyI#lMmm7mU~9wApk)M! zB#_3#M?Qkt-7Gi$q3FSxkkFlqu8}BE-`5AmgBdU|007acd81?$)q?;4002ovPDHLk FV1m3;fkyxU delta 312 zcmV-80muH%0_OsdBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nv2e~?&=>Px# z^hrcPR5;6HU>F61988)&pJDoywIKD~d;@c;j3hQP#Z23#&-`u_7bhUVDf zE{2cqe_t|u`SON=;U6o*{hOy5%uFO0K3ppQ-!^$NiUBCrx0gu%cX3o<`111)12?ZM z!~0kF8CV#_%Kf}AX{}@i5|H?3H^*cta1~4!%Ftk@n{{Q&t4+AeJGXpCJ zE5qAY-x>b=WnlRH?Joo4ek-r(r>O}RJhpy0000< KMNUMnLSTYONS6En diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/granite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/granite_small_dust.png index 09112303009a125d229a8f3b56cc7c8fcd049d3c..b2e119bce5790819842bd88dc709a44b8bac4239 100644 GIT binary patch delta 310 zcmV-60m=U50?`7HB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO=1D|BR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z>ciargD{kf72q@gq|wyXo59P`nxP@w9mNpjFu-a6NHa*IzJID5m=7`tWC%zjvStuq z3NV&|G9dt_SxQrn;o0>|46j)P7+zmE&LGUg4VHr{g99d3CWMJF%^*!6%^*WS;KA#6 z3`&*`3<{z`7=|!?|M?rrgaD9cnA7J>o6aEm=L1;d>D^lyK7aoS7Domc=>TQ}$jQ8% z>|imF#e8VyagvJHBzUq8*_8PVj>yFbr6yf6G`!E;-!Qr7x!a9L~e*|c1r9>`A;b-AC6 zg&Q?bf3D6>*xOFhu2<$tl%uQ}xLvQvMec~M?;|2)c2hKJUaUm*2csGI{P>WUC!gVX z48U{um96zPn%a|_QfW#sRiDqMWoL5(V+@I9haegv2w(jHOSYmHMs(hL+_xUBSOGvG zmywY%tR_~l6?_B{lZnBxZQedZ?wSwQua_vg94tQiJihA@Fi3IJXM z7N=VO2Vp1|E5K<0NTaBd8iRRoD8rI88x%v3!vL!RAk83+YJbjtU_Qtoe*@|NAdSeH zL4Ya1SO&_30GMVLA$f*B?;bMTJAaYk@Uc@2@`v-eF>8LYN5C4AKPB3^D`+ zG$aHVyxpuAbmasw3}O2I^EZ^qz_9w%eXwSj(~r*XVNf#EXSng=1H S|5p?M0000F61988)&pJDoM8Df(|8E!0W$7%@E_n*H}G~Zm* z@jtt|e~{tBt5*zPKfYz)7Exiickcy*g{~aK%|#vm+a^y&F#yH-Tqo84?q=Eypa1@4 z5D^eyc=_@z1LLo+4DUaFXJBUf%kb{UABJPM-!N>w^c1d-1=)bf`))HbGcf*t@#z}_ zA2%lh6Eh3L`_JDP{{H{R@cq|621X`E6wL%dAAMgRLw#T0AWv)n6-#UAg$8ZI00000 LNkvXXu0mjf)Dn~K diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/invar_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/invar_small_dust.png index 124682cfe69e4cd6d8108c4003c4144bea0a3606..201dddb3f4c1511412083d12dee34a363a0e0364 100644 GIT binary patch delta 320 zcmV-G0l)t00^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zifhaNgD{kf72q@gq)}8{oWaPzfT5(W0>u#IFu-a6NHa*IgMW=Rm=7|@(cASuNF%al z5MT;0mVq)M0H#@4S&8B9-Fpm=pFd}~apekwps*l=gO>}2cbHh25GKMjgEWCOgA4%y zVNp>Ab8|}u1vxnkLzuq*{0(I?Fq}Pm7OWZO^wn$EF~~|vGQ55Ln&I`!mkb}jeg=yp z1B`S4vjOB}emQPluoy_=`?v4G>;v2Opy0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`nx906%JhX4Qo z_en%SR5;6HU>F61988)&pJDoM z{`%$rn|E&e9}pFc(-039xmy4L N002ovPDHLkV1iMRms0=$ diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/iron_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/iron_small_dust.png index cbc35d938b44d283fb28208f4bbd8b2514a4eac4..57434e8b6f21b3b5215554b8f450ae0b3d11e437 100644 GIT binary patch delta 313 zcmV-90mlB_0@MPKB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO=}AOER5(w~kUI*4KoEw17t&i;rdI5PVCe;{Qt4?VpuOj?_ZHgN z`8b1xT?i>Q&csC%^MVw~2fE|pH!u7gZ93l~rJSNs(q`?W1b<6ep^^xGf5FQR;yC8g zQ53EId)ooYrfDJw0whUtGsAKR4556|;fNyPDVoPbXFR5;7+l09yNP!NP?;e~>Ng4(y>0vsVX;0nBo(w$3??82obYRX)|9aWx52U2Q}Rr zlAEUCf1)T@O1TIzUJSZ3S4wddMd-Q?^E@L60xTsl#;@-?a~Ou``yRtEfSFO2B|OhV zr4(;=yBmOb`#4{QN-6ezA9&F&{kg_<9Ah2FPyTE_6l~pb+kt~yO#lD@07*qoM6N<$f-TB} ACIA2c diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/lazurite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/lazurite_small_dust.png index 346ead50da836d155204468207e5bfc668e11722..ce748bac3cba7803e71c65f628e8cab8fbe2a2e2 100644 GIT binary patch delta 320 zcmV-G0l)s}0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z4AZLrgD{kf72q@gq)~)ljKSQ%l))&y2E`EMFu-a6NHa*IwSSQwm=7{Y*u?ceNF%al z5Mc7rQ-Crd0H#?&ke}hj`;QEF?>}UCeES*$7oPxwkg*GfcbHh25RQOp25ACm1{neZ zoMIvjnkKdkVzSB@hA@5q`3uTqV0d`;Bv>=d=^OX&VNh0-XZZf=4a1v{uNc03d SFc~-i0000i_@% z^+`lQR5;7+k}*mHQ4~eb|4|bxMHECth=n?7qJrBHbQyw6NM|{P(Ii%ZS%665Y(Q(H z%mPHQu&@!6`QM3?|Evcm!7_!neeaxCybJ%C@|?BXG=pH`jvhB?1_77ddueofGD)Hj zc2{%Ze@3S#)xCW-Hn(Vn(O8L|)#^7KMpCKnV80SZqF67NIqyE?O0-SBGjJ=6WZSEd zBtwR2iXeP^_E}h5;^O8}PV4oIAamY3JeK8^HBu)OizSS;AP#E{1+9tW0rA@tFL&1} zR{-E0orryZWv(=j)(T?`&W+H88E}s0+bi|wA2-%~pPKJadD(sdhO}r$=XUJ{00000 LNkvXXu0mjf^0SPG diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/lead_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/lead_small_dust.png index ae0fae17c8ad1fc24cef605694ff84ea6d9d636d..0289fc721b28ec726da944a67b383bf629e291d8 100644 GIT binary patch delta 320 zcmV-G0l)s{0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM ze7(Z{gD{kf72q@gq)|*%ltEcZiNVi19K{giFu-a6NHa*Im4A&Hm=7{YQC|5!NF%al z5MT;0mVq)M0H#@2Uz6eT#p?{8KYwPpcH=4o7dJ11f}9eDcbHh25GKMjgEWCOgA4%y z5n(X~OEVh=Nl7^jLzuq*{0(I?FkHTJ2CNz8^bPB`GVt>9GQ4^Fis9Ak*9;#&y$6dU z1B`S4vjOB}emOotuoy_=x38bU><5qTq3FRd00z*Vims6;P~X=F#)BC!FaQ9=T~Auq S?peWdHyG z^GQTOR5;7+(y>m$P!z`TulLG=lgti=G$4&I;EO;AZ(&$WbR;op2Wy%@2S$=64i3H! z62f?cHvwc2rMqb^Cqvg5ZC+7X&Dn7L|%+`ZZF!Jl%>* z#WFoTe?F6QcTd)NWoLwCnDGPq&I8?C-$Doh6~$=Oo9No^)(BfgaSC^Ams(dXNGb6) zUx0A~FT(-yXC^wfOOEfS0;%%_)1t~n6-tFT$>lJcPN9^>=jsE51W_1bA_ZQh_;yE| zfzfziFoTm`Yh<&>;GAQ*d`GfQ5NidkbqfEv9k%D8?Rk6tY+u&7ZR)1cOe_EZ002ov JPDHLkV1l_liHHCI diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/magnesium_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/magnesium_small_dust.png index 54510b63cb6048c61f449eb424bb3be1d3df75b1..d413e16a24cbe1b32d693236997dcb94b549fc90 100644 GIT binary patch delta 321 zcmV-H0lxm>0^9tQiJihA@Fi3IJXg zEbiz4TOCtgj-igA3qYFrg@qZ^jg1+WbatZn0XYn?8UWG^(tl{~?hfXI42tvg{14KI ztQiED0*qy#ObCE!mRDD2czE+B!;1$G7_OZ=$Dk-F$q?(|ff1TatV{?KVVXgjK$<~@ zfPl2TJcEgq6@#{-B8DMM-+%swG8q_l9XJ5i40HOfWy=^O6ciYqK77dV@$FlNZ$Ey3 z#gPF<=)!COIXan(g99uE(s=**b1-}HjvXj^FbseJbf=lR*VZ8jN+a_t$(c|2#V3X z;g~~3hs^C71i_Dq(co#9bI;)i_X2xM+h^zx{l3wOa|xlv80sCybU*G znQYUff7NtK4OtE?5n=*+2^*YKO;zDo7RdKeu2vC7BDiPoC0wc3v9oQQ_Im_Dfc0{T zY(5Wzb82-u4+YV|!n_X#=Ts;bF`rBzrc&6NH}Bv$V37#Yl7!iCNC58G>={W_6ta&; zBt;SNL;{Xw;o^C4T^Eco^hYE1^%z>%07*qoM6N<$ Ef+E9+#Q*>R diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/manganese_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/manganese_small_dust.png index 26eb420996d7912d9288e9b2fe45740baeaa49d0..144ffd27ef0214de1ee8a7d4c80930ee3e29901c 100644 GIT binary patch delta 322 zcmV-I0loh10^I_TB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@<~KNR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXg z^v|6Nwz?oG3qu`27l1S?%PTS%Xz4Lbm^Tf@56EGF)c}xYkbg!a9Rn~QWKdvi*nf~l zWX&MJ6ksd^WkLWj%IVr4>@2-6JG1kwyL z1O()zWf{C(Js1?!lraop`u_7bl*zzwaQ^|YW|-4gZ(Yy8%gxL1@abcQyASU(eE<3l zERGB?LKkKO$UDiL++1KWkj9r!pM%*OmaIn6gJA#+pgR>^BT=BfuMdm|Ghko<0NK1& U0n~S_7XSbN07*qoM6N<$f6{qvL&;S4c z`bk7VR5;6HU>F61988)&pJDodou_XD?s)pHY#I(-0yng$J;m@Bx4Bx(gXJBGvWZ1lXBpoBs(OBQt$57wbH^>tk00!)Fo)5?t QNB{r;07*qoM6N<$f?y+?Y5)KL diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/marble_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/marble_small_dust.png index 7e35c7b709e6a7d0c72f9d28b2278d7c623d9354..ebbb4f5c7e09dcb1acfb0c13e92ce1be40469dfc 100644 GIT binary patch delta 321 zcmV-H0lxm~0^9tQiJihA@Fi3IJXg z95}cOY_+|eD~39PE&yqkl$2&rQC4R-cxX3@ACSWUs{tU*Ab*WA((+(F$e`MW!v7$R z$eKZbDZp3;%7g%zW~P-nG6hj_H6@ehB^K8nPUvxTs#aPKfY&p{`@J!%U939 z;>Z9abYV7toH{HnCIuD)X?*nfA(-9LH~~cuh5;~u?o@P*M1lIgJ}@54fPn!3VLe$u Ty7_Ag00000NkvXXu0mjfNuYm* delta 315 zcmV-B0mS~?0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n!GLrtRj{pDw z_en%SR5;6HU>F61988)&pJDoQ23UymJ89JSXmS_%KG^7mE|Y zN&QqQdF=JTdm2%MvzAJPswimtlJC;tQiJihA@Fi3IJXM zx;qm8gD{kf72q@gq>-1Gn?Y4gm!YRK3B?fPFu-a6NHa*Isegqpm=7{2CfeaYNF%al z5MT;0mVq)M0H#@1UYp_Z!>bH0p5J45^yCAB06z~ybd)`YcbHh25GKMjgEWCOgA4%y zL4H;ST^&URd3jk3Lzuq*{0(I?FkHBF53CvH^nJTmFi1!$F}(lyo8j~4uM8hQya$UT z1B`S4vjOB}emMa_uoy_=hmT*t?4`>NqUgae00z*Vims6;P~X=F#)BC!FaQ9i-c;gB SSK#je0000F61988)&pJDoB@osJ9jVtpOfi>(-0VH&1e>%g55APVhe)+_}#K_F>;QoCE4NWD6%g0vzZ<{O)Pc^r%J&j8#3z{*6OEuVv#00000NkvXX Hu0mjfA-aUJ delta 284 zcmV+%0ptGA0?PuBBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n?A_i40o&W#< z*hxe|R5;7+lCf&SP#8wfy=bcjTuNJs8t9@^Dbhmc(!KZ^;u|=qi;fxU;3(wvTA?k$ zn;UQPcMb*%og6&-Ip6ZZnG@%Ivtb=Y|C85Igx?6H;{|dwGJNcm%55)@x96d}^k1cQ zB%-TYe;vq+(Nvy#1Ck$$WYE9qF&|G#Bih*gf&6fHkBKd*Nf9M{?mlQ%u9%M}vRthS zfx^7s2;{ncixWqsTEn;)m1z=5P$*oU61#7{%vO~K0DP}2Hg{a8OSFPCx8y*^9*~0k iC$lhQ7KSH&wqI!zUQzx_GQ$7>002ovPDHLk0$_slnt!DL diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/olivine_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/olivine_small_dust.png index 1d79b0181bffa2d08dde99f66a67a72d465dd4f3..3b9402a665c5e65d735557943869cafb5ec41174 100644 GIT binary patch delta 320 zcmV-G0l)s`0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zlGmC22Vp1|E5K<0NTZ6d9)q`b0z=Ara}-06!vL!RAk83+;eY!1U_QtoBP+iDAdSeH zL4e6qRRzj~0GMV2aa)E9FAp=^d~uH9$jKuN{JQ)MhL*e--eF>8LO24Z8KeoM8Dt0u zNT~2JxJP?1NCiq`7{c`Z*DolOf#F>Db+Bfb(_8l?GpI`#F}%3*iQ&%MOAKG{d;yCi z1B`S4vjOB}ZaEbmuoy_=$IBnV?DNMzqv*jf00z*Vims6;(A3)r#)BC!FaQ8{o>P!H SQ|9de0000F61988)&pJDoe9(U$ZPuLzq~Z7%?gP?V9wPdt07F^fBr_*{HE&v z+{7sie-HmWVtD%JIfDs@5yROZ=NSZ|1sTfkRsV0BJQ>9R6zln0rT^>3=rFwc`<6kS zRfXZgm#YkaKmB9)^$=popBKLwejNPB@MG;eMyv)fFfcIix6Azh`{EA+izEvJGY1pH zuY124{{8yT@bBAS28M5c8NRQ1$4GQc)c5r<9Mt#q4f4bW0Np=qtQiJihA@Fi3IJXM z>Q_1Z2Vp1|E5K<0NTZmP5QDC^0Yk%TM-)Sl!vL!RAk83+o`1RlU_QtoBX_a?AdSeH zL4Ya1SO&_30GMVY86$>sPtGyCeE*2y@a_u?B4UCJhHj!5-eF>8LYN5C4AKPB3^D`+ z)V1Xp0y1~!$8huNBZgPc-Z8wr%K{ch z1{mo8W&_B{!a2%+z+xbcZ(h9zv(N8(jiLv`02n}bD!N9ZKz&~y7!PK^zyJXM2U3Wd S;fclo0000F61988)&pJDopx+bsrTYkh_b-#h-dO`eQm0E+cF-P-@{JscUn z{QJlt$R*G4>iZprpMSqHeERv4fq{X6;nVBi4Cl7KX4pOB2_sem7#J8B(kE;E|M2!F z10O#h0}C?;!-vnW8Girz&+y~RZ-!sr{xj^FCH|O^=xD6(>tm?z>l@^W4FG~Rba~;4 R+1&sD002ovPDHLkV1k<_q2K@j diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/phosphorous_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/phosphorous_small_dust.png index 1200f605e3dbb168997089073f79059f7a1051d0..1a572faf9962549d40e4de251e951999fc1144d4 100644 GIT binary patch delta 319 zcmV-F0l@z10@?zQB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?@2^KR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z_HRo655iC`R)Et0kVbAEVFnR#9fkv&Gf)gc4g;(PfHZ?N@_!1dgZUtXCO4@62Wdps z3<696#xhVQ1i&=2u<4In3TayScv#XuS#Ke`WQ=QZ9!(Su RDn$SQ002ovPDHLkV1oN>cY^=` delta 315 zcmV-B0mS~=0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n@FuJYE5dZ)H z_en%SR5;6HU>F61988)&pJDo(iJw#dGcYi~oy~~ur1kSX|G#+kkAahm zpMi;)nc>UV_YD94{9#~VU}9ine$0?scAb&vA!w}c>tm?z>l@^W4FCcOT@#R9KyUy6 N002ovPDHLkV1iI)n*sm; diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/platinum_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/platinum_small_dust.png index 39d45a01fc122022a458d76ce0b08cb7fe29c510..3026afe03a0fd3a4eb6d9a0b5ca6e85b18afa48e 100644 GIT binary patch delta 321 zcmV-H0lxm`0^9tQiJihA@Fi3IJXM za@(f;2Vp1|E5K<0NTZ~P5QDwBF+*PabQD97!vL!RAk83+5r6)!U_QtoYu~88LYN5C4AKPB3^D`+ zczF33%#BSM)OGbS3}O2I^EZ^qz;O21VX$VH)BESHWKdI9Wcc#=6T|a2?-<^_dkq#x z2B;na0+F61988)&pJDobN6+5;@0*m5(-05P>l@^W4FH88cY4LS=~4gy002ov JPDHLkV1iSSoy`CM diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/pyrite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/pyrite_small_dust.png index 4b0fe99a4be217df60b65ab379099a914eac994c..0aff4debeb6e0e95fea4d0370cf5947c177bfa82 100644 GIT binary patch delta 320 zcmV-G0l)t00^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z&eg>H2Vp1|E5K<0NF%SfID?##F~j-VSQJB$!vL!RAk83+5`RY8U_Qv8Du28GAdSeH zL4Ya1SO&_30GMWWaejuMFF!K8fBJ;s-Mt44dZK&`m43Du-eF>8LYN5C4AKPB3^D`+ zSh+bFObj#_0+hut3}O2I^EZ^qz_9w#L$GF;({FFz#~>&z!|?m-cZSa|UozbL^aCu8 z3^39G%m$E?l{xr0z+xbcmtKDYv)eZvM$v;|01Tiz60_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n|1zE6ge*gdg z_en%SR5;6HU>F61988)&pJDox3?Z=r49vS%Vl{;6`_JDP zn!^i7{UcGtC!2Ihw!-ucG7?}S3VfgUl55uu19~io}9%96500RR9!-6=+{|{b%V&LcI zVqj!tX87>=JHwy<{~5miVPIfm=Va*Ia*&beA!w}c>tm?z>l@^W4FE=iYb7C7`VasB N002ovPDHLkV1iMaoS^^! diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/pyrope_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/pyrope_small_dust.png index 7369488a9e815069bff0438cee5ae8f9606a73f6..6ecc482c87bddd8e97b3b1a03ca2d04529c76dc6 100644 GIT binary patch delta 315 zcmV-B0mS~*0@ebMB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO>q$gGR5(w~lFJUkKoo|5BjQq_l~jTv5^rF|n!Pvj2A)qu(y-{p z!X+&lVK`$ZEp=&P!IwavhdpL86jLBAG%6GhIZx)Pj-HBOz?>A7u$l-MNre>yw!c!^mOjZ{Qw0 zoKC*j4-@$h)HDgyax$3~dn9hpdr>de&YcqpP&~H!D8^zm9*gnM02lVlOZSp>1pxp6 N002ovPDHLkV1n6Pf(`%x delta 294 zcmV+>0onf60@VVLBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n{2dk7R5;7+lCes|Pyj{GiwIRjq0vEf(TGdasi5dkCwCG20l^QDd_V`OV+LEOTOr?8 z5V1p0N%NZaUFXoK;MBphpL3TB|13FA!y$tt`I|gQ62f|*rXT3X$W?2oGSzhg!QTk#k0{{&_&~)ZlU#Wo+ slet9*s{&_SN&b~i9Mg&8B|qC2XX$5KSl8qi3;+NC07*qoM6N<$f|NXnW&i*H diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/red_garnet_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/red_garnet_small_dust.png index e42b97357133c3b1ce59b855bab2d033d3788b50..319693e0584ad8067229d6b0c6c4be78d68c5dd7 100644 GIT binary patch delta 320 zcmV-G0l)t40^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z7T8$+2Vp1|E5K<0NTZgF6oaRsKEpy=D-=VJ!vL!RAk83++JBCYU_Qto4{@>oAdSeH zL4Ya1SO&_30GMVT9UX=*SFSKTeEphX>)G=R(j06I?qZ@C-eF>8LYN5C4AKPB3^D`+ z6vf3EGOR2ZEckgb3}O2I^EZ^qz_9$*9k6DY(^oHE${;T)%5eYXONMJto-sWB`4cRT z3^39G%m$E?WjWc|!D1kdPk;OZvvF61988)&pJDo zgCI9A11mEt!?)+J7=Hc#$MEI%ABOM${xZzIC4YyJ=xD6(>tm?z>l@^W4FKozav+ml Rx<~*3002ovPDHLkV1n$Lo|pgt diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/redstone_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/redstone_small_dust.png index 17817254fa0afe5dd37a467888faeb7ab21d6db3..ce3e5702cf4ba02ba6a7e330e7ff7fc36dad4482 100644 GIT binary patch delta 304 zcmV-00nh%70?PuBB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO;7LS5R5(w~k}(c~KoCX$Y=Y1j8)Kta(8k8fBN!VyIg2Ndi+B+` zV>|FT2YcnxK1%K8^P=;-+L}kw}@>a0) zp=Ft4ZC(ll>?Ob~AcO%uNy>LnD-c+~wKE*g$IPP4{g80000tW delta 220 zcmV<203-j)0*nHXBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`q$2AQQ{&Hw-a znMp)JR5;7+k|7SlKoCV=Ee?k$2S5ylz#W<(FkGY@pbp0hDk_`o8Mq083*d3sk6E#7 zD4U=v_{k(QnY=$=4E!~6o%^27``_TsdkkctuO_=yIS30>tQiJihA@Fi3IJXM zHkrHp2Vp1|E5K<0NTY~`Dua4J5W{8*R}@2#!vL!RAk83+`hUsEU_Qv8SboX>AdSeH zL4Ya1SO&_30GMVOYcqx?M^7=ly>Xf0_<<7)iaY`gF?8LYN5C4AKPB3^D`+ zR3(HNJY5|b3r z1B`S4vjOB}0XbGquoy_={VyND>?NOGpy0_p;gBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`l9F}D~r4FCWD z_en%SR5;7+lCes|P!vEH7jF zCqKiXbyWz7HLYl3(uQ1DgK1qmc-DK*xyyxrCY-BglZMt~cZ^YkhSmgDOCohEV_Q;4aZ4`dVv8CnY`hw`i0pI8Fv`W#etQiJihA@Fi3IJXg zynb;SY_*8E35Gg?E&yp}W?^CAi&Z? zB5MW#rT}9ZC=&u;nwgnd8UFtL&G75jCx$PdKQm})sxVBST8j~yOsq@@6JeS`nn0RC zhJXMkCntlho*sj@mn()LOy7V0hB6r#)~wwG)(ms{m(MR5*x2|OzJLGD@b}LjhWq#L zgT;{nM(Dz906RHZQBe^r2GV%#`W-MkGrJi@4~79SfbLXujYNU^zCJJ>%z%Lb078da U(?)2oDF6Tf07*qoM6N<$f?1w`ApigX delta 310 zcmV-60m=T|0_6gbBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n}F5V&9`~Uy| z@<~KNR5;7+lEF#>Q51&1xp;9vOfIvSjW8iXbt4)o%E#z6!iR7Xw46mQTnf`G^Z-F` z(7shA65?1YqN5#mg4IY%7yY}#IseBG|ABvPxo+EST5-JbMrAEpam;a`B&=xJ1W}i# zAYi%0U${dX0tiQlz4f46C9kJf@bmsjp#T5?07*qo IM6N<$g4zUtQiJihA@Fi3IJXM zoHEw_2Vp1|E5K<0NTZ;T1cQ#L6N7W+Iut{Y!vL!RAk83+;eUZvU_QtoF?ILRWqH1m!-eF>8LYN5C4AKPB3^D`+ zL?z`I%$#EwBs4uS3}O2I^EZ^qz;JorOt5B{(`U?G#~`h&#qj$1BZl|yUNC%kaSJSt z3^39G%m$E?1vwr SNp+wA0000F61988)&pJDox1N7xurxMcn6U5H|F+4KQ4Bz_UN^hzzqg$& z!^bcG8D#l+7;ZlM!SMCxUxrs7e=;yIFfhFT{Egx5#mx-Q4oqjnY5)TR1A}hXg#X`O ze_#;d;$&cFVP<&t{s+VFzyBEi{`k!B@7FhmCujSoG7=q)^?iK|^?iMVJh1@)G6{50 T@z5JX00000NkvXXu0mjf!)Ty1 diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/saw_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/saw_small_dust.png index 4f1a067f21e788ebc719574d14385e49e50fee0c..17c11a8f297b8f7f5f8274191847edac1d1a179b 100644 GIT binary patch delta 320 zcmV-G0l)s-0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z=C}C%2Vp1|E5K<0NTUEZ2ZN-55W|92KNLfd!vL!RAk83+!hd|cU_Qv8j6mK0AdSeH zL4Ya1SO&_30GMVjPG*L0-~Tdv|NV{O`O`NH;zHaE=>a+z-eF>8LYN5C4AKPB3^D`+ zI0bkZ40Yug^i@PL3}O2I^EZ^qz;NQseXwSj)9*fi&A`dZ#qj;Z7lsdCe=xjw_YEwL z3^39G%m$E?B{_t+z+xbcFW-FyvuAF&f}#h*02n}bD!N9ZKz&~y7!PK^zyJWmy;G8m SD{LwN0000 delta 301 zcmV+|0n+~40^9F61988)&pJDotQiJihA@Fi3IJXg z?7ngpY_*HF7KS>4E&yp3;p1b_kdk89bM+dEACSWUs{tU*Ab*W2!a`s^$e^;NEB=Et zB5MW#rT}9ZC=&u;ng!U|7(V>`#qj3K7lyO9?=pxA@iUYzS&k8!Osq@@6JeS`nn0RC zhJb*)xG00GjxK|`q$GwROy7V0hB6r#c3rpx)(ms{iTe*2M0j`@9=?3d@aEGehIc=| zfyI#lM(Dz906RHZh@A^82GaQY-A6FHJ0=oE4~79SfbLXujYNU^zCJJ>%z%Lb0C-he UVIB%1`v3p{07*qoM6N<$f;hT;{Qv*} delta 305 zcmV-10nYy20^kCWBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oA0h5Qi_y7O^ z?MXyIR5;6HU>F61988)&pJDo-+%xAw{6&h(-0RM_-5G^zGXWg52B;Pd|TV z`2FWE!>^w|7(V>?#lXwU%W#!P@IM0s1Kin+=uT?eu;u^HS1%dF1^F3R+1MD~fBDMr z{`(JxUw?iveBwU^NOUyT_w_N<_w^0(7sLhtd5C4i)q$gGR5(w~l1mE0Fcd{^BXwZ0Dxy{Jhps@~g-+a&JLujNCyoR` z{0)>!6)h5dF`>2f2M+W=nwP-2c?reO(d7IV&bh3vlICk41%Cu(g$iNf`vorptY(MP zkjsZW4InXRTBv2~D73nFA;C9z7(g`H4yo^;pa{1b7C)kI+hY7Pzy%zAOaNJDgK+== N002ovPDHLkV1m%ceAxg1 delta 297 zcmV+^0oMN30@wnOBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`n|Bo*0UApigX zt%7}}VR`#Ly6X+$qR(=l<+p2 zvbAsMdjq*2jS7LnykqL(9MrHjV|#ChBzh&a6>J)Uu8_xblJJpm_Ml1w0B-d}a+RPr vcTrZ6C(-v+7K7M={3o98tQiJihA@Fi3IJXM zHW#G+2Vp1|E5K<0NF$e!0E3vG2E&%ZG!#RS!vL!RAk83+YJW~{U_Qv8KslNJAdSeH zL4Ya1SO&_30GMVeH9dxBw=OY!dGdnc-sy7;S^|6w0kYB<-eF>8LYN5C4AKPB3^D`+ zB$SmHoI`yWybUxk3}O2I^EZ^qz%Y01Hn3)x(=V)9#lRyY!SLelJ%(@ZJ}}&W@C+=D z3^39G%m$E?6*(28z+xbc*FJm#vo}0`ilPU@02n}bD!N9ZKz&~y7!PK^zyJVBuv7Wr SIhsTO0000F61988)&pJDo;lqn(3=BWNF+?YXGhCY7i`5XO?>~Q|XudqT z?|*hxe<8z%7q1w;ynn~QE3M4%@ZnPi8yQK4o9(Ut+a^y&F#yH-bR+HmE{1vxpa1`5 z5ar`%c=hTH1N*DD3?DyzW%$p?!0_SMFNULU-Z5-{{1mQ_1=)a^=dLm`|7ZOF<<}1e zK5lLXRt83f4{tv*{Qdur;oIN84Bwa-Q8W_-AoYEH4E23|gFLYT0K`shR>tQiJihA@Fi3IJXM z8oIszgD{kf72q@gq)|dbfk8*tnxV1B2gMNNFu-a6NHa*ImVb^Nm=7|@)>-vGNF%al z5MT;0mVq)M0H#??T$$n3%exG3UO#2HcI6s_w2T0Qjgtz7cbHh25GKMjgEWCOgA4%y zArUSHM^|$OBU4!nLzuq*{0(I?FznfW6Ra8L^nH64F^GstGrW8Ajp4?8Z`pya Sbt0Mo0000F61988)&pJDotk0A8qbssbpd)Bpeg M07*qoM6N<$g4EoW&Hw-a diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/steel_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/steel_small_dust.png index 6f345e82347ed0bfaa298611e94b537d12523f7d..8d8bd16c42120e9b5142c3656f6c53766682b06a 100644 GIT binary patch delta 310 zcmV-60m=Tr0?`7HB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO=1D|BR5(w~l06E8Fc^kk16{?zL9jS_09{4!20etHqc`vx-p0wv zU2t#^mr^>UerbZy*dOT7J`nRI@VxmF#Luzh{1(o+tY*ntw11BRbXlQ7nD~Cd%YZ!3 zISskoHlc>uCJHA>0Bo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oA77$cFKL7v# z%}GQ-R5;7+lA#KNP#8u(ht;fM>-Mp91@9xQ>~X}lXqaJ5!L}^eZu1R9AK<=$AnLes z|J4c8!IEL8ec_z+0e?2mElqLHvft!;mVq%woO4=@oR9mDGUuFx5F~_Hk6ccNMY*nP zDvE;gc06B zP)eciduXlEbseOXsH)2N7ytm@_h}dgSe6CTG|{##rfGsw3R>%#{FN|@5Ju6)&-McH W^KemlV=;RG00000^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zrpGJ)2Vp1|E5K<0NTawkD}%f#JHw0w6%<2|!vL!RAk83++<&^VU_Qv8cs;TIAdSeH zL4Ya1SO&_30GMWGVQGfHZ=W*!c=nIs;kBO(0^BSNak`=y-eF>8LYN5C4AKPB3^D`+ zIQW?u9Gv(W43&8>3}O2I^EZ^qz;OKBC$MIi)9>xL$G{=Q#PH+eKZci2e>2>F@dGT5 z3^39G%m$E?6*(n1z+xbcAHMzpvlm@{jiLv`02n}bD!N9ZKz&~y7!PK^zyJUZB~b1m S#|EhY0000 z?MXyIR5;6HU>F61988)&pJDo081~{ego%}j5kvF;Jq`cm0+krPynD>>hmnCn%AAcs@N5fKLzuq*{EcC= zy1NR)f8V!H8JPY-#5w-SFmMPnF|cfD{NFZtGKv8x)=vpl`Y)@;&cMLH!0?ylKf|w& z{}?#9m>7P%{m1b0&wqyB-~Th5JokxV_JvoBSPfucU|^USr}+QQvmXq+g3JsIYzz$V z-~47^_zh9^~8eSHk|eSL#G7qI~V-e+24iJlD<00000NkvXXu0mjf DJHC@c diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/tin_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/tin_small_dust.png index e0dbea7e420a7c12bf6e368940b93ee34d2ad99b..758275be66dc71a7c33465f2cc9ef7045ffedd52 100644 GIT binary patch delta 302 zcmV+}0nz@;0?7i9B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO-bqA3R5(w~kUH|~22SG`eh;BoXWq8kq& z2x2W=q)wW_Xi6<~(LRWdlJ_$c{2WKWcac)+YL=Wu`zXMa8GjBD>iGq4JE-eg9i1eJ zwQsirl6~Jt6h&y7W;KI(2QLFiCNYj<^-V!#SxOR3nGomGQI}6x4uSxE-(#94v~3H| z^H3Cpb(`WKmPD3GBAG&nFbt8VsTyY+BCfZ)E`h45l+3Nqv%_^=bX|vG7%+~b`fp<0 zE}uXx(;`S@IVa1qm16}k+g7*YM_lq;t$zl10Kt}A7^*Kv5C8xG07*qoM6N<$g4;!Q AQ~&?~ delta 284 zcmV+%0ptG30?PuBBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oBCs>gVL;wH) z*hxe|R5;7+k}+YQ7Je}uPT@XK6St5sD2uq+E@S+bTS{P>(#&C@gi(DyyY7z%53x8HvQ+`PWMpN9L* zM)N$U>pJ2%W*kRE1QEe|Pm&}&TC2b*cJMQjb54h0Aj>kMD8hS>_nvv4Nz;_Nu7f|< ixNRD?O>^bX_66VZUnYu{mZ|^%002ovPDHLk0$_r!F@7Ha diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/titanium_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/titanium_small_dust.png index 4476c6042bc4258721e96217ccec6f63794dcd5b..36048e5f1dd9b7a3e887a90102b19a3a217545de 100644 GIT binary patch delta 317 zcmV-D0mA;-0@wnOB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?MXyIR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXg z96WR$Y_*-O0fstcZ(s!=%?}x*W{@V3W{@EuAR{Be z;O%A2prRs!VF=UrpTD6@28II%&VV(`%S(d!hYnw05EkZVc=F^0!^1}}89sdY0v1OG z7(ofM0pw%>0X8167)axrHy^<4`npsUJvie6-Kppri30U~ePBG80Rsa77%+GB<%6{z P00000NkvXXu0mjf0_Ass delta 298 zcmV+_0oDH40@(tPBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oE2i8$g!2kdN z=1D|BR5;7+lCeqyK@f(&TjJVy5G+#p1eVD&q!*h!ffnW=(y7%Iw?)dpRrdfshk}j9 z&O(TYa?5c!*4<>%1wwMcGKGIP%zQsTGXwuRaHW$8<1E`dqnaAyEaUg*SiIG;*W{vi zwi8ZGe=duq$YLpyn!M3O9jRyw_EyVqH~=8{!1dK7O-WSkd?P%s<^W9J-syJF@m9;N zF&hT0hv(V4sJ>d#@Ar6me4*VwVfI-NLclpkS=PjH%*X4u0PEP%*5*wv&XsgJr)aGy wiV|xpoO9H*;{NU?`tun_Nx~>e4*c0xdem;d5W93ZS^xk507*qoM6N<$f|)&!tQiJihA@Fi3IJXM ze1pRNgD{kf72q@gq)|v%m_b)phrus69K{giFu-a6NHa*IqkpY6m=7{YUQzi!NF%al z5MT;0mVq)M0H#?@S&8A+-FpmApFL-|b^RIxI|n<1oPrXDcbHh25GKMjgEav)gA4%y z5ixNFD_aK!X&G4zLzuq*{0(I?FkC!$2CNz8^tBr{F-S{EGQ4^9lHuLkw+wIIyaJ0O z1B`S4vjOB}5jhbtuoy_=&mTX*>_-poq3FRd00z*Vims6;P~X=F#)BC!FaQ9qd{4dn SbF<(80000!aQ delta 310 zcmV-60m=T`0_6gbBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oEAH_Y$mjD0& z@<~KNR5;7+(!EZ?U=+sjrw3hRgO$M;2$YWm3_knsf0hIM@5t914l!_?zu|%7pitDgRIc)mk;YZ-ATE`w z{5l%*f8&$EdZqSlgicA@!#$(R?fVCKQx9<*PY?=7N&O8@`>07*qo IM6N<$f<}9g@Bjb+ diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/uvarovite_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/uvarovite_small_dust.png index c389f504368806f8c7b738dda04b8294c8efbfce..15f5ddb1b9660e239b0f489bdfc6c6ceae8169a1 100644 GIT binary patch delta 320 zcmV-G0l)s~0^0(RB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO@JU2LR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM zLg#z_2Vp1|E5K<0NTV#TGJ}Je4@1}jFBC(N!vL!RAk83+o_`j8U_QtoRZsc8LYN5C4AKPB3^D`+ zL}f%6Y+M`|WUR$83}O2I^EZ^qz;J%$Rj_85(`W7OXHeGEWO)7L4a4KlcNxAt{SFpK z1{mo8W&_B{TshL5U@?%!cMm>+*>`q4LeYa^01Tiz6F61988)&pJDok;n|004Br^OGx)}YF)TdMgVhkG?>~Q|XkK)( z_kVhJe-Xp$_b(XUeR<2E#3#@2=KgaA1v3SPMJIdzw@sdmVgQQu#u-}w4P12@etiDR zAS5Ed@c!jnhVKmD7`}h_#_)&vFT;=bzZssLe93TU$0N8t7Gwj?&bY?N%*^=z+vlGQ z+&EX*tnU*3IX`19v4!@uwU7=Hi!gQA%rAgJ%_W2o=z8{~-%09ylZGt)8r`~Uy| M07*qoM6N<$f?D62{Qv*} diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/yellow_garnet_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/yellow_garnet_small_dust.png index 06a687ba0d0122dac04081ba0f52759133d65ff6..828af8c8bb9d0718a4493703592722fe14880735 100644 GIT binary patch delta 318 zcmV-E0m1(60@(tPB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?ny*JR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXM z)=jqh55iC`R)Et0kVXYrVFr6EHHP(5tWgX>4g;(PfHZ?N>VI0=f%zbV3Vqf8gES&* z1_7o3V;LwD0$`f?WV9JRJ-N#8@bO!QV@IAdhzK(=6!@rNc!!CV31K2kGe{FiGsqAS zkdkL(@CsCAP|@JSFofy*&)-lc1H+-6Z@`*iPT#z0J%c>Z`OhByVt4=)|M2%z%Lb0O`P0Pq*(B Qz5oCK07*qoM6N<$g3w=j_y7O^ delta 319 zcmV-F0l@y*0`3BkBo78+OGiWi=K$&e+t$PWnvp&je+P6)O+^Rb1r`oC59++SaR2}S z`$F61988)&pJDostmvaZQFVZ|*Tzn(8xryEOHG+vLe82B28qm}m0e-Nl*V z@6XQ++=B89U*A1o`2F)U!}rgx85kHC7~XyS!LaN2GlqqmZZl#vfPsO5p{vOB|CH diff --git a/src/main/resources/assets/techreborn/textures/item/smalldust/zinc_small_dust.png b/src/main/resources/assets/techreborn/textures/item/smalldust/zinc_small_dust.png index f60a51d8db87e341f32bf77acc2fde3781323d86..c01ff7b2cb626fae86cc51de93a799f149f42325 100644 GIT binary patch delta 317 zcmV-D0mA;=0@wnOB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XU z000XU0RWnu7ytkO?MXyIR5(v#7;wM{r3r%n|Nlc-KuwGYZA2M>tQiJihA@Fi3IJXg zoH%m?Y_++uHHJEZE&yrf=Hg+{P}OEQdG;uZACSWUD*$Q!@PF|=(Ch!f^yO<8{`XC7 z#|#J{Uu_c3ooDzm1Oy7V0hB6r#j-5OV)~utc59R~?&LAr-&+zQ|Q--hKzA(K1@D41F z3@}0iW&_A}K{f#)uoy@q$VDJflwFCU2WN1iI~83cQJ}uB4~z#hU|;|MCV*%bjsN4V P00000NkvXXu0mjf3d4Ij delta 301 zcmV+|0n+~10^9*MOyZk?G%4Dq)d^oz4shGxEJP`@f`R2*gT)OqpJos&uOSPG0MqA$#!$? zUpOnQf5aFi#wb}~D Date: Mon, 9 Sep 2019 14:46:53 +0300 Subject: [PATCH 14/17] Helper for rubber stuff --- src/main/java/techreborn/utils/InitUtils.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/techreborn/utils/InitUtils.java b/src/main/java/techreborn/utils/InitUtils.java index c07d227f4..b21811de3 100644 --- a/src/main/java/techreborn/utils/InitUtils.java +++ b/src/main/java/techreborn/utils/InitUtils.java @@ -24,9 +24,14 @@ package techreborn.utils; +import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.Block; +import net.minecraft.block.Block.Settings; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundEvent; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; @@ -60,4 +65,20 @@ public class InitUtils { itemList.add(uncharged); itemList.add(charged); } + + public static Settings setupRubberBlockSettings(boolean noCollision, float hardness, float resistance) { + + FabricBlockSettings settings = FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE); + settings.strength(hardness, resistance); + settings.sounds(BlockSoundGroup.WOOD); + if (noCollision) { + settings.noCollision(); + } + + return settings.build(); + } + + public static Settings setupRubberBlockSettings(float hardness, float resistance) { + return setupRubberBlockSettings(false, hardness, resistance); + } } From 9075f320d4fa8ffd7f2f989c14e72cbe9a0abc2b Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 9 Sep 2019 14:49:47 +0300 Subject: [PATCH 15/17] Refactoring for rubber blocks --- .../blocks/misc/RubberButtonBlock.java | 6 +- .../blocks/misc/RubberDoorBlock.java | 7 +- .../blocks/misc/RubberPressurePlateBlock.java | 7 +- .../blocks/misc/RubberTrapdoorBlock.java | 8 +- .../java/techreborn/events/ModRegistry.java | 181 ++++++------------ 5 files changed, 65 insertions(+), 144 deletions(-) diff --git a/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java b/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java index b03b2509d..ab21abed7 100644 --- a/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java +++ b/src/main/java/techreborn/blocks/misc/RubberButtonBlock.java @@ -24,10 +24,8 @@ package techreborn.blocks.misc; -import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Material; import net.minecraft.block.WoodButtonBlock; -import net.minecraft.sound.BlockSoundGroup; +import techreborn.utils.InitUtils; /** * @author drcrazy @@ -36,6 +34,6 @@ import net.minecraft.sound.BlockSoundGroup; public class RubberButtonBlock extends WoodButtonBlock { public RubberButtonBlock() { - super(FabricBlockSettings.of(Material.PART).noCollision().strength(0.5f, 0.5f).sounds(BlockSoundGroup.WOOD).build()); + super(InitUtils.setupRubberBlockSettings(true, 0.5F, 0.5F)); } } diff --git a/src/main/java/techreborn/blocks/misc/RubberDoorBlock.java b/src/main/java/techreborn/blocks/misc/RubberDoorBlock.java index b737dcb49..8723b87ee 100644 --- a/src/main/java/techreborn/blocks/misc/RubberDoorBlock.java +++ b/src/main/java/techreborn/blocks/misc/RubberDoorBlock.java @@ -24,11 +24,8 @@ package techreborn.blocks.misc; -import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.DoorBlock; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.sound.BlockSoundGroup; +import techreborn.utils.InitUtils; /** * @author drcrazy @@ -37,6 +34,6 @@ import net.minecraft.sound.BlockSoundGroup; public class RubberDoorBlock extends DoorBlock { public RubberDoorBlock() { - super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(3.0f, 3.0f).sounds(BlockSoundGroup.WOOD).build()); + super(InitUtils.setupRubberBlockSettings(3.0F, 3.0F)); } } diff --git a/src/main/java/techreborn/blocks/misc/RubberPressurePlateBlock.java b/src/main/java/techreborn/blocks/misc/RubberPressurePlateBlock.java index 390d52b4e..02c956acd 100644 --- a/src/main/java/techreborn/blocks/misc/RubberPressurePlateBlock.java +++ b/src/main/java/techreborn/blocks/misc/RubberPressurePlateBlock.java @@ -24,11 +24,8 @@ package techreborn.blocks.misc; -import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; import net.minecraft.block.PressurePlateBlock; -import net.minecraft.sound.BlockSoundGroup; +import techreborn.utils.InitUtils; /** * @author drcrazy @@ -37,7 +34,7 @@ import net.minecraft.sound.BlockSoundGroup; public class RubberPressurePlateBlock extends PressurePlateBlock { public RubberPressurePlateBlock() { - super(PressurePlateBlock.ActivationRule.EVERYTHING, FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).noCollision().strength(0.5f, 0.5f).sounds(BlockSoundGroup.WOOD).build()); + super(PressurePlateBlock.ActivationRule.EVERYTHING, InitUtils.setupRubberBlockSettings(true, 0.5F, 0.5F)); } } diff --git a/src/main/java/techreborn/blocks/misc/RubberTrapdoorBlock.java b/src/main/java/techreborn/blocks/misc/RubberTrapdoorBlock.java index c6eb2878e..8b77fb883 100644 --- a/src/main/java/techreborn/blocks/misc/RubberTrapdoorBlock.java +++ b/src/main/java/techreborn/blocks/misc/RubberTrapdoorBlock.java @@ -24,11 +24,8 @@ package techreborn.blocks.misc; -import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; import net.minecraft.block.TrapdoorBlock; -import net.minecraft.sound.BlockSoundGroup; +import techreborn.utils.InitUtils; /** * @author drcrazy @@ -37,7 +34,6 @@ import net.minecraft.sound.BlockSoundGroup; public class RubberTrapdoorBlock extends TrapdoorBlock { public RubberTrapdoorBlock() { - super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(3f, 3f).sounds(BlockSoundGroup.WOOD).build()); + super(InitUtils.setupRubberBlockSettings(3.0F, 3.0F)); } - } diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index be1f9c8f5..5cc459537 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -24,16 +24,12 @@ package techreborn.events; -import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.FenceBlock; import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; import net.minecraft.block.SlabBlock; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; -import net.minecraft.sound.BlockSoundGroup; import reborncore.RebornRegistry; import techreborn.TechReborn; import techreborn.blocks.misc.BlockComputerCube; @@ -117,18 +113,9 @@ public class ModRegistry { RebornRegistry.registerBlock(TRContent.RUBBER_LOG = InitUtils.setup(new BlockRubberLog(), "rubber_log"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PLANKS = InitUtils.setup(new BlockRubberPlank(), "rubber_planks"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"), itemGroup); - RebornRegistry.registerBlock( - TRContent.RUBBER_PLANK_SLAB = InitUtils - .setup(new SlabBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) - .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_plank_slab"), itemGroup); - RebornRegistry.registerBlock( - TRContent.RUBBER_FENCE = InitUtils - .setup(new FenceBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) - .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_fence"), itemGroup); - RebornRegistry.registerBlock( - TRContent.RUBBER_FENCE_GATE = InitUtils - .setup(new FenceGateBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) - .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_fence_gate"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_SLAB = InitUtils.setup(new SlabBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_plank_slab"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_FENCE = InitUtils.setup(new FenceBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_fence"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_FENCE_GATE = InitUtils.setup(new FenceGateBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_fence_gate"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_plank_stair"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_TRAPDOOR = InitUtils.setup(new RubberTrapdoorBlock(), "rubber_trapdoor"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_BUTTON = InitUtils.setup(new RubberButtonBlock(), "rubber_button"), itemGroup); @@ -151,139 +138,85 @@ public class ModRegistry { // Gem armor & tools if (TechRebornConfig.enableGemArmorAndTools) { // Todo: repair with tags - RebornRegistry.registerItem( - TRContent.BRONZE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE), "bronze_sword")); - RebornRegistry.registerItem( - TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.BRONZE), "bronze_pickaxe")); - RebornRegistry.registerItem( - TRContent.BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.BRONZE), "bronze_spade")); - RebornRegistry.registerItem( - TRContent.BRONZE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.BRONZE), "bronze_axe")); - RebornRegistry.registerItem( - TRContent.BRONZE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.BRONZE), "bronze_hoe")); + RebornRegistry.registerItem(TRContent.BRONZE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE), "bronze_sword")); + RebornRegistry.registerItem(TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.BRONZE), "bronze_pickaxe")); + RebornRegistry.registerItem(TRContent.BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.BRONZE), "bronze_spade")); + RebornRegistry.registerItem(TRContent.BRONZE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.BRONZE), "bronze_axe")); + RebornRegistry.registerItem(TRContent.BRONZE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.BRONZE), "bronze_hoe")); - RebornRegistry.registerItem(TRContent.BRONZE_HELMET = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.HEAD), "bronze_helmet")); - RebornRegistry.registerItem(TRContent.BRONZE_CHESTPLATE = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.CHEST), "bronze_chestplate")); - RebornRegistry.registerItem(TRContent.BRONZE_LEGGINGS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.LEGS), "bronze_leggings")); - RebornRegistry.registerItem(TRContent.BRONZE_BOOTS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.FEET), "bronze_boots")); + RebornRegistry.registerItem(TRContent.BRONZE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.HEAD), "bronze_helmet")); + RebornRegistry.registerItem(TRContent.BRONZE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.CHEST), "bronze_chestplate")); + RebornRegistry.registerItem(TRContent.BRONZE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.LEGS), "bronze_leggings")); + RebornRegistry.registerItem(TRContent.BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.FEET), "bronze_boots")); - RebornRegistry.registerItem( - TRContent.RUBY_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY), "ruby_sword")); - RebornRegistry.registerItem( - TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.RUBY), "ruby_pickaxe")); - RebornRegistry.registerItem( - TRContent.RUBY_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.RUBY), "ruby_spade")); - RebornRegistry - .registerItem(TRContent.RUBY_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.RUBY), "ruby_axe")); - RebornRegistry - .registerItem(TRContent.RUBY_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.RUBY), "ruby_hoe")); + RebornRegistry.registerItem(TRContent.RUBY_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY), "ruby_sword")); + RebornRegistry.registerItem(TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.RUBY), "ruby_pickaxe")); + RebornRegistry.registerItem(TRContent.RUBY_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.RUBY), "ruby_spade")); + RebornRegistry.registerItem(TRContent.RUBY_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.RUBY), "ruby_axe")); + RebornRegistry.registerItem(TRContent.RUBY_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.RUBY), "ruby_hoe")); - RebornRegistry.registerItem(TRContent.RUBY_HELMET = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.HEAD), "ruby_helmet")); - RebornRegistry.registerItem(TRContent.RUBY_CHESTPLATE = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.CHEST), "ruby_chestplate")); - RebornRegistry.registerItem(TRContent.RUBY_LEGGINGS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.LEGS), "ruby_leggings")); - RebornRegistry.registerItem(TRContent.RUBY_BOOTS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.FEET), "ruby_boots")); + RebornRegistry.registerItem(TRContent.RUBY_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.HEAD), "ruby_helmet")); + RebornRegistry.registerItem(TRContent.RUBY_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.CHEST), "ruby_chestplate")); + RebornRegistry.registerItem(TRContent.RUBY_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.LEGS), "ruby_leggings")); + RebornRegistry.registerItem(TRContent.RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.FEET), "ruby_boots")); - RebornRegistry.registerItem( - TRContent.SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE), "sapphire_sword")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils - .setup(new ItemTRPickaxe(TRToolTier.SAPPHIRE), "sapphire_pickaxe")); - RebornRegistry.registerItem( - TRContent.SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.SAPPHIRE), "sapphire_spade")); - RebornRegistry.registerItem( - TRContent.SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.SAPPHIRE), "sapphire_axe")); - RebornRegistry.registerItem( - TRContent.SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.SAPPHIRE), "sapphire_hoe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE), "sapphire_sword")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.SAPPHIRE), "sapphire_pickaxe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.SAPPHIRE), "sapphire_spade")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.SAPPHIRE), "sapphire_axe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.SAPPHIRE), "sapphire_hoe")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_HELMET = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.HEAD), "sapphire_helmet")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_CHESTPLATE = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.CHEST), "sapphire_chestplate")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_LEGGINGS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.LEGS), "sapphire_leggings")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_BOOTS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.FEET), "sapphire_boots")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.HEAD), "sapphire_helmet")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.CHEST), "sapphire_chestplate")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.LEGS), "sapphire_leggings")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.FEET), "sapphire_boots")); - RebornRegistry.registerItem( - TRContent.PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT), "peridot_sword")); - RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils - .setup(new ItemTRPickaxe(TRToolTier.PERIDOT), "peridot_pickaxe")); - RebornRegistry.registerItem( - TRContent.PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.PERIDOT), "peridot_spade")); - RebornRegistry.registerItem( - TRContent.PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.PERIDOT), "peridot_axe")); - RebornRegistry.registerItem( - TRContent.PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.PERIDOT), "peridot_hoe")); + RebornRegistry.registerItem(TRContent.PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT), "peridot_sword")); + RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.PERIDOT), "peridot_pickaxe")); + RebornRegistry.registerItem(TRContent.PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.PERIDOT), "peridot_spade")); + RebornRegistry.registerItem(TRContent.PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.PERIDOT), "peridot_axe")); + RebornRegistry.registerItem(TRContent.PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.PERIDOT), "peridot_hoe")); - RebornRegistry.registerItem(TRContent.PERIDOT_HELMET = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.HEAD), "peridot_helmet")); - RebornRegistry.registerItem(TRContent.PERIDOT_CHESTPLATE = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.CHEST), "peridot_chestplate")); - RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.LEGS), "peridot_leggings")); - RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils - .setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.FEET), "peridot_boots")); + RebornRegistry.registerItem(TRContent.PERIDOT_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.HEAD), "peridot_helmet")); + RebornRegistry.registerItem(TRContent.PERIDOT_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.CHEST), "peridot_chestplate")); + RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.LEGS), "peridot_leggings")); + RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.FEET), "peridot_boots")); } // Battery - RebornRegistry.registerItem( - TRContent.RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); - RebornRegistry.registerItem( - TRContent.LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); - RebornRegistry.registerItem( - TRContent.LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); - RebornRegistry - .registerItem(TRContent.ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal")); - RebornRegistry.registerItem( - TRContent.LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal")); - RebornRegistry - .registerItem(TRContent.LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb")); - RebornRegistry.registerItem( - TRContent.LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); + RebornRegistry.registerItem(TRContent.RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); + RebornRegistry.registerItem(TRContent.LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); + RebornRegistry.registerItem(TRContent.LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); + RebornRegistry.registerItem(TRContent.ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal")); + RebornRegistry.registerItem(TRContent.LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal")); + RebornRegistry.registerItem(TRContent.LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb")); + RebornRegistry.registerItem(TRContent.LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); // Tools RebornRegistry.registerItem(TRContent.TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap")); RebornRegistry.registerItem(TRContent.WRENCH = InitUtils.setup(new ItemWrench(), "wrench")); RebornRegistry.registerItem(TRContent.BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill")); - RebornRegistry - .registerItem(TRContent.BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); - RebornRegistry.registerItem( - TRContent.BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); - RebornRegistry.registerItem( - TRContent.ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); + RebornRegistry.registerItem(TRContent.BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); + RebornRegistry.registerItem(TRContent.BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); + RebornRegistry.registerItem(TRContent.ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); - RebornRegistry - .registerItem(TRContent.ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill")); - RebornRegistry.registerItem( - TRContent.ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw")); - RebornRegistry.registerItem( - TRContent.ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer")); + RebornRegistry.registerItem(TRContent.ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill")); + RebornRegistry.registerItem(TRContent.ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw")); + RebornRegistry.registerItem(TRContent.ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer")); RebornRegistry.registerItem(TRContent.ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter")); - RebornRegistry.registerItem( - TRContent.INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill")); - RebornRegistry.registerItem( - TRContent.INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw")); - RebornRegistry.registerItem(TRContent.INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), - "industrial_jackhammer")); + RebornRegistry.registerItem(TRContent.INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill")); + RebornRegistry.registerItem(TRContent.INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw")); + RebornRegistry.registerItem(TRContent.INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer")); RebornRegistry.registerItem(TRContent.NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber")); RebornRegistry.registerItem(TRContent.OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool")); // Armor - RebornRegistry - .registerItem(TRContent.CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device")); + RebornRegistry.registerItem(TRContent.CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device")); // Other - RebornRegistry.registerItem(TRContent.FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), - "frequency_transmitter")); + RebornRegistry.registerItem(TRContent.FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter")); RebornRegistry.registerItem(TRContent.SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box")); RebornRegistry.registerItem(TRContent.MANUAL = InitUtils.setup(new ItemManual(), "manual")); RebornRegistry.registerItem(TRContent.DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool")); From 0b39eb986378edd78b894cbec4b500cd39bfe36e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 10 Sep 2019 14:21:23 +0100 Subject: [PATCH 16/17] Fixes #1836 --- .../recipe/recipes/RollingMachineRecipe.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/recipes/RollingMachineRecipe.java b/src/main/java/techreborn/api/recipe/recipes/RollingMachineRecipe.java index 246f5ba0a..8d290a269 100644 --- a/src/main/java/techreborn/api/recipe/recipes/RollingMachineRecipe.java +++ b/src/main/java/techreborn/api/recipe/recipes/RollingMachineRecipe.java @@ -24,16 +24,21 @@ package techreborn.api.recipe.recipes; +import com.google.common.collect.Iterables; import com.google.gson.JsonObject; import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.Inventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapedRecipe; +import net.minecraft.tag.ItemTags; +import net.minecraft.tag.Tag; import net.minecraft.util.DefaultedList; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; @@ -53,8 +58,9 @@ public class RollingMachineRecipe extends RebornRecipe { @Override public void deserialize(JsonObject jsonObject) { - shaped = JsonHelper.getObject(jsonObject, "shaped"); - shapedRecipe = RecipeSerializer.SHAPED.read(getId(), shaped); + JsonObject json = JsonHelper.getObject(jsonObject, "shaped"); + shapedRecipe = RecipeSerializer.SHAPED.read(getId(), json); + shaped = withoutTags(json); } @Override @@ -62,6 +68,27 @@ public class RollingMachineRecipe extends RebornRecipe { jsonObject.add("shaped", shaped); } + //This needs to be done to remove the item tags, and replace them with just items for when syncing to the server + private JsonObject withoutTags(JsonObject jsonObject) { + JsonObject key = jsonObject.get("key").getAsJsonObject(); + key.entrySet().forEach(entry -> { + if(entry.getValue().isJsonObject()){ + JsonObject value = entry.getValue().getAsJsonObject(); + if(value.has("tag")){ + + Identifier tag = new Identifier(value.get("tag").getAsString()); + Tag itemTag = ItemTags.getContainer().get(tag); + Item item = Iterables.get(itemTag.values(), 0); + + //Remove the tag, and replace it with a basic s + value.remove("tag"); + value.addProperty("item", Registry.ITEM.getId(item).toString()); + } + } + }); + return jsonObject; + } + @Override public DefaultedList getRebornIngredients() { return DefaultedList.of(); From cc51e9b01647ed3612e841731cc40703416cc454 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 10 Sep 2019 14:24:26 +0100 Subject: [PATCH 17/17] #betaBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec8a09184..2c9afd736 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ repositories { } } -version = "3.0.11" +version = "3.0.12" configurations { shade