diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java index cca3d7c5..e1853928 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java @@ -74,12 +74,8 @@ public class ContainerAutoChisel extends Container { // if we are in the auto chisel if (slotNumber <= 5) { - // merge hotbar if (!this.mergeItemStack(itemStack1, 33, 42, false)) { - // merge rest of inventory - if (!this.mergeItemStack(itemStack1, 6, 33, false)) { - return null; - } + return null; } } else { // if this is an upgrade, check the upgrade slots diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/black.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/black.png deleted file mode 100644 index fea03f8c..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/black.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/blue.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/blue.png deleted file mode 100644 index 179d04d4..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/blue.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/brown.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/brown.png deleted file mode 100644 index 18ddd7cc..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/brown.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/cyan.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/cyan.png deleted file mode 100644 index 47f19538..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/cyan.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/gray.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/gray.png deleted file mode 100644 index 86e4e06e..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/gray.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/green.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/green.png deleted file mode 100644 index 92a0b6bc..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/green.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hex.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hex.png deleted file mode 100644 index cce03ec5..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hex.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png deleted file mode 100644 index be826cc6..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta deleted file mode 100644 index 71538873..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexBlue.png.mcmeta +++ /dev/null @@ -1,18 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 4, - 3, - 2, - 1, - 0, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png deleted file mode 100644 index b3833888..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta deleted file mode 100644 index 71538873..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGray.png.mcmeta +++ /dev/null @@ -1,18 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 4, - 3, - 2, - 1, - 0, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png deleted file mode 100644 index e53bb0d8..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta deleted file mode 100644 index 71538873..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexGreen.png.mcmeta +++ /dev/null @@ -1,18 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 4, - 3, - 2, - 1, - 0, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png deleted file mode 100644 index 1e23fca9..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta deleted file mode 100644 index 71538873..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexPink.png.mcmeta +++ /dev/null @@ -1,18 +0,0 @@ -{ - "animation": { - "frametime": 4, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 4, - 3, - 2, - 1, - 0, - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexRed.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexRed.png deleted file mode 100644 index ff289cec..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/hexRed.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_blue.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_blue.png deleted file mode 100644 index ebff3b95..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_blue.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_gray.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_gray.png deleted file mode 100644 index 37548df6..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/light_gray.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/lime.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/lime.png deleted file mode 100644 index 628e7576..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/lime.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/magenta.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/magenta.png deleted file mode 100644 index 9291f58f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/magenta.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/orange.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/orange.png deleted file mode 100644 index 6369e888..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/orange.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/pink.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/pink.png deleted file mode 100644 index fd035ffe..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/pink.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/purple.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/purple.png deleted file mode 100644 index b141574f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/purple.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/red.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/red.png deleted file mode 100644 index 3835b6da..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/red.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/white.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/white.png deleted file mode 100644 index 6d1aa93d..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/white.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/hexPlating/yellow.png b/src/main/resources/assets/chisel/textures/blocks/hexPlating/yellow.png deleted file mode 100644 index aa52cf51..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/hexPlating/yellow.png and /dev/null differ