diff --git a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java index 5164c87cf..74c702695 100644 --- a/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java +++ b/src/main/java/resonantinduction/archaic/engineering/BlockEngineeringTable.java @@ -96,6 +96,8 @@ public class BlockEngineeringTable extends BlockRI } } } + + inventory.onInventoryChanged(); } } } diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/BiotaniumOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/BiotaniumOre.png deleted file mode 100644 index ca9e5ead6..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/BiotaniumOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/CopperWire.png b/src/main/resources/assets/resonantinduction/textures/blocks/CopperWire.png deleted file mode 100644 index bd54ce5c5..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/CopperWire.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/GlowGlass.png b/src/main/resources/assets/resonantinduction/textures/blocks/GlowGlass.png deleted file mode 100644 index 42ed544b5..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/GlowGlass.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MM_naturalgas.png b/src/main/resources/assets/resonantinduction/textures/blocks/MM_naturalgas.png deleted file mode 100644 index 6e0a29589..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MM_naturalgas.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png b/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png deleted file mode 100644 index bf8b55c87..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png.mcmeta b/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png.mcmeta deleted file mode 100644 index 10c3a8f50..000000000 --- a/src/main/resources/assets/resonantinduction/textures/blocks/MM_rubble.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineCowMilker.png b/src/main/resources/assets/resonantinduction/textures/blocks/MachineCowMilker.png deleted file mode 100644 index 4519add5e..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MachineCowMilker.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineEmptySide.png b/src/main/resources/assets/resonantinduction/textures/blocks/MachineEmptySide.png deleted file mode 100644 index a6b4aac74..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MachineEmptySide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineFertilizer.png b/src/main/resources/assets/resonantinduction/textures/blocks/MachineFertilizer.png deleted file mode 100644 index 72f17acd6..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MachineFertilizer.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineMilkSide.png b/src/main/resources/assets/resonantinduction/textures/blocks/MachineMilkSide.png deleted file mode 100644 index 149bda0b2..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MachineMilkSide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineRefinery.png b/src/main/resources/assets/resonantinduction/textures/blocks/MachineRefinery.png deleted file mode 100644 index 8506b75c5..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MachineRefinery.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.png b/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.png deleted file mode 100644 index ab6b2ff1a..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.txt b/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.txt deleted file mode 100644 index 083bf2d10..000000000 --- a/src/main/resources/assets/resonantinduction/textures/blocks/MilkFlow.txt +++ /dev/null @@ -1,8 +0,0 @@ -0*2 -1*2 -2*2 -3*2 -4*2 -5*2 -6*2 -7*2 \ No newline at end of file diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MilkStill.png b/src/main/resources/assets/resonantinduction/textures/blocks/MilkStill.png deleted file mode 100644 index 370b6abac..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/MilkStill.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/StainedGlass.png b/src/main/resources/assets/resonantinduction/textures/blocks/StainedGlass.png deleted file mode 100644 index fa5eca9a5..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/StainedGlass.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/batteryBox.png b/src/main/resources/assets/resonantinduction/textures/blocks/batteryBox.png deleted file mode 100644 index 5b644b00a..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/batteryBox.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/bauxiteOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/bauxiteOre.png deleted file mode 100644 index 6836cd1b3..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/bauxiteOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MachineWoodCutter.png b/src/main/resources/assets/resonantinduction/textures/blocks/circularSawBase.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/MachineWoodCutter.png rename to src/main/resources/assets/resonantinduction/textures/blocks/circularSawBase.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/coalGenerator.png b/src/main/resources/assets/resonantinduction/textures/blocks/coalGenerator.png deleted file mode 100644 index 6774b10e2..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/coalGenerator.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/copperOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/copperOre.png deleted file mode 100644 index 3a72f7429..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/copperOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/fertileDirt.png b/src/main/resources/assets/resonantinduction/textures/blocks/fertileDirt.png deleted file mode 100644 index bea63b07e..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/fertileDirt.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/gas.png b/src/main/resources/assets/resonantinduction/textures/blocks/gas.png deleted file mode 100644 index afc29d289..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/gas.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/infFluid.png b/src/main/resources/assets/resonantinduction/textures/blocks/infFluid.png deleted file mode 100644 index 8f4c45063..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/infFluid.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/infLoad.png b/src/main/resources/assets/resonantinduction/textures/blocks/infLoad.png deleted file mode 100644 index 3462250fc..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/infLoad.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/infSource.png b/src/main/resources/assets/resonantinduction/textures/blocks/infSource.png deleted file mode 100644 index 285efae31..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/infSource.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/inputMachineSide.png b/src/main/resources/assets/resonantinduction/textures/blocks/inputMachineSide.png deleted file mode 100644 index 7db5b4658..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/inputMachineSide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/ironMachineSide.png b/src/main/resources/assets/resonantinduction/textures/blocks/ironMachineSide.png deleted file mode 100644 index bf34da026..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/ironMachineSide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/iron_block.png b/src/main/resources/assets/resonantinduction/textures/blocks/iron_block.png deleted file mode 100644 index 7816799ef..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/iron_block.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/leadOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/leadOre.png deleted file mode 100644 index bb89a9d75..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/leadOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/leather.png b/src/main/resources/assets/resonantinduction/textures/blocks/leather.png deleted file mode 100644 index b28e02e57..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/leather.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/machinePart.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_metal_side.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/machinePart.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_metal_side.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/machinePart2.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_metal_top.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/machinePart2.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_metal_top.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/colorSand.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_sand.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/colorSand.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_sand.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/blockSteel.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_steel.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/blockSteel.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_steel.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basalt.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basalt.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltbrick.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_brick.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltbrick.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_brick.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltslabside.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_brick2.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltslabside.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_brick2.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltchiseled.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_chiseled.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltchiseled.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_chiseled.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltcobble.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_cobble.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltcobble.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_cobble.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltcracked.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_cracked.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltcracked.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_cracked.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltmossy.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_mossy.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltmossy.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_mossy.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/basaltslab.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_stone_slab.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/basaltslab.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_stone_slab.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MM_mechanizedBlock_side.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_wood_surface.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/MM_mechanizedBlock_side.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_wood_surface.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/MM_mechanizedBlock_top.png b/src/main/resources/assets/resonantinduction/textures/blocks/material_wood_top.png similarity index 100% rename from src/main/resources/assets/resonantinduction/textures/blocks/MM_mechanizedBlock_top.png rename to src/main/resources/assets/resonantinduction/textures/blocks/material_wood_top.png diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/mud.png b/src/main/resources/assets/resonantinduction/textures/blocks/mud.png deleted file mode 100644 index 62a8155c4..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/mud.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/obsidian.png b/src/main/resources/assets/resonantinduction/textures/blocks/obsidian.png deleted file mode 100644 index ff0a68363..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/obsidian.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/ore.xcf b/src/main/resources/assets/resonantinduction/textures/blocks/ore.xcf deleted file mode 100644 index 712b3273b..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/ore.xcf and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/outputMachineSide.png b/src/main/resources/assets/resonantinduction/textures/blocks/outputMachineSide.png deleted file mode 100644 index 0075b012c..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/outputMachineSide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/shit.png b/src/main/resources/assets/resonantinduction/textures/blocks/shit.png deleted file mode 100644 index f5b5eadaa..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/shit.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/silverOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/silverOre.png deleted file mode 100644 index 745595154..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/silverOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/tinOre.png b/src/main/resources/assets/resonantinduction/textures/blocks/tinOre.png deleted file mode 100644 index 7ae1f9a74..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/tinOre.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/void.png b/src/main/resources/assets/resonantinduction/textures/blocks/void.png deleted file mode 100644 index 363f4bd97..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/void.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png deleted file mode 100644 index 503fdb1af..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.copper.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.copper.png deleted file mode 100644 index 7e414b521..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.copper.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.iron.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.iron.png deleted file mode 100644 index 075c52e7c..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.iron.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.png index bd54ce5c5..af6c7e5c1 100644 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.png and b/src/main/resources/assets/resonantinduction/textures/blocks/wire.png differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.silver.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.silver.png deleted file mode 100644 index 43a7598ea..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.silver.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png deleted file mode 100644 index 73bf0e7f0..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/wire.tin.png b/src/main/resources/assets/resonantinduction/textures/blocks/wire.tin.png deleted file mode 100644 index 654dccfcd..000000000 Binary files a/src/main/resources/assets/resonantinduction/textures/blocks/wire.tin.png and /dev/null differ