Added Limestone button

Fixed Ceramic tiles
TeamMetallurgy · Oct 31, 2020 · 12a22c9 · 12a22c9
1 parent 6b3cdc5
commit 12a22c9
Show file tree

Hide file tree

Showing 43 changed files with 248 additions and 96 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/init/AtumBlocks.java b/src/main/java/com/teammetallurgy/atum/init/AtumBlocks.java
@@ -383,6 +383,7 @@ public class AtumBlocks {
     public static final Block DEADWOOD_HATCH = registerBlock(new AtumTrapDoorBlock(Block.Properties.create(Material.WOOD, MaterialColor.OBSIDIAN).hardnessAndResistance(3.0F).sound(SoundType.WOOD).notSolid()), "deadwood_hatch");
     public static final Block PALM_DOOR = registerBlock(new DoorAtumBlock(from(PALM_PLANKS)), "palm_door");
     public static final Block DEADWOOD_DOOR = registerBlock(new DoorAtumBlock(from(DEADWOOD_PLANKS)), "deadwood_door");
+    public static final Block LIMESTONE_BUTTON = registerBlock(new StoneButtonBlock(AbstractBlock.Properties.create(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0.5F)), "limestone_button");
     public static final Block PALM_BUTTON = registerBlock(new WoodButtonBlock(AbstractBlock.Properties.create(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0.5F).sound(SoundType.WOOD)), "palm_button");
     public static final Block DEADWOOD_BUTTON = registerBlock(new WoodButtonBlock(AbstractBlock.Properties.create(Material.MISCELLANEOUS).doesNotBlockMovement().hardnessAndResistance(0.5F).sound(SoundType.WOOD)), "deadwood_button");
     public static final Block HEART_OF_RA = AtumItems.HEART_OF_RA;

diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_black.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_black.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_black" }
+        "": { "model": "atum:block/ceramic_tile_black" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_blue.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_blue.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_blue" }
+        "": { "model": "atum:block/ceramic_tile_blue" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_brown.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_brown.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_brown" }
+        "": { "model": "atum:block/ceramic_tile_brown" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_cyan.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_cyan.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_cyan" }
+        "": { "model": "atum:block/ceramic_tile_cyan" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_gray.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_gray.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_gray" }
+        "": { "model": "atum:block/ceramic_tile_gray" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_green.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_green.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_green" }
+        "": { "model": "atum:block/ceramic_tile_green" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_light_blue.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_light_blue.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_light_blue" }
+        "": { "model": "atum:block/ceramic_tile_light_blue" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_light_gray.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_light_gray.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_light_gray" }
+        "": { "model": "atum:block/ceramic_tile_light_gray" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_lime.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_lime.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_lime" }
+        "": { "model": "atum:block/ceramic_tile_lime" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_magenta.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_magenta.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_magenta" }
+        "": { "model": "atum:block/ceramic_tile_magenta" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_orange.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_orange.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_orange" }
+        "": { "model": "atum:block/ceramic_tile_orange" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_pink.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_pink.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_pink" }
+        "": { "model": "atum:block/ceramic_tile_pink" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_purple.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_purple.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_purple" }
+        "": { "model": "atum:block/ceramic_tile_purple" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_red.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_red.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_red" }
+        "": { "model": "atum:block/ceramic_tile_red" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_white.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_white.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_white" }
+        "": { "model": "atum:block/ceramic_tile_white" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/ceramic_tile_yellow.json b/src/main/resources/assets/atum/blockstates/ceramic_tile_yellow.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-        "": { "model": "atum:block/ceramic_yellow" }
+        "": { "model": "atum:block/ceramic_tile_yellow" }
     }
 }
diff --git a/src/main/resources/assets/atum/blockstates/limestone_button.json b/src/main/resources/assets/atum/blockstates/limestone_button.json
@@ -0,0 +1,118 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 270,
+      "x": 180
+    },
+    "face=ceiling,facing=east,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 270,
+      "x": 180
+    },
+    "face=ceiling,facing=north,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 180,
+      "x": 180
+    },
+    "face=ceiling,facing=north,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 180,
+      "x": 180
+    },
+    "face=ceiling,facing=south,powered=false": {
+      "model": "atum:block/limestone_button",
+      "x": 180
+    },
+    "face=ceiling,facing=south,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "x": 180
+    },
+    "face=ceiling,facing=west,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 90,
+      "x": 180
+    },
+    "face=ceiling,facing=west,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 90,
+      "x": 180
+    },
+    "face=floor,facing=east,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 90
+    },
+    "face=floor,facing=east,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 90
+    },
+    "face=floor,facing=north,powered=false": {
+      "model": "atum:block/limestone_button"
+    },
+    "face=floor,facing=north,powered=true": {
+      "model": "atum:block/limestone_button_pressed"
+    },
+    "face=floor,facing=south,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 180
+    },
+    "face=floor,facing=south,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 180
+    },
+    "face=floor,facing=west,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 270
+    },
+    "face=floor,facing=west,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 270
+    },
+    "face=wall,facing=east,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 90,
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=east,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 90,
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=north,powered=false": {
+      "model": "atum:block/limestone_button",
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=north,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=south,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 180,
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=south,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 180,
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=west,powered=false": {
+      "model": "atum:block/limestone_button",
+      "y": 270,
+      "x": 90,
+      "uvlock": true
+    },
+    "face=wall,facing=west,powered=true": {
+      "model": "atum:block/limestone_button_pressed",
+      "y": 270,
+      "x": 90,
+      "uvlock": true
+    }
+  }
+}
diff --git a/src/main/resources/assets/atum/lang/en_us.json b/src/main/resources/assets/atum/lang/en_us.json
@@ -44,6 +44,7 @@
   "block.atum.limestone_brick_cracked_brick_door": "Cracked Limestone Bricks Door",
   "block.atum.limestone_brick_chiseled_door": "Chiseled Limestone Bricks Door",
   "block.atum.limestone_brick_carved_door": "Carved Limestone Bricks Door",
+  "block.atum.limestone_button": "Limestone Button",
   "block.atum.ceramic_white": "White Ceramic Tile Block",
   "block.atum.ceramic_orange": "Orange Ceramic Tile Block",
   "block.atum.ceramic_magenta": "Magenta Ceramic Tile Block",
@@ -60,22 +61,22 @@
   "block.atum.ceramic_green": "Green Ceramic Tile Block",
   "block.atum.ceramic_red": "Red Ceramic Tile Block",
   "block.atum.ceramic_black": "Black Ceramic Tile Block",
-  "block.atum.ceramic_white": "White Ceramic Tile",
-  "block.atum.ceramic_orange": "Orange Ceramic Tile",
-  "block.atum.ceramic_magenta": "Magenta Ceramic Tile",
-  "block.atum.ceramic_light_blue": "Light Blue Ceramic Tile",
-  "block.atum.ceramic_yellow": "Yellow Ceramic Tile",
-  "block.atum.ceramic_lime": "Lime Ceramic Tile",
-  "block.atum.ceramic_pink": "Pink Ceramic Tile",
-  "block.atum.ceramic_gray": "Gray Ceramic Tile",
-  "block.atum.ceramic_light_gray": "Light Gray Ceramic Tile",
-  "block.atum.ceramic_cyan": "Cyan Ceramic Tile",
-  "block.atum.ceramic_purple": "Purple Ceramic Tile",
-  "block.atum.ceramic_blue": "Blue Ceramic Tile",
-  "block.atum.ceramic_brown": "Brown Ceramic Tile",
-  "block.atum.ceramic_green": "Green Ceramic Tile",
-  "block.atum.ceramic_red": "Red Ceramic Tile",
-  "block.atum.ceramic_black": "Black Ceramic Tile",
+  "block.atum.ceramic_tile_white": "White Ceramic Tile",
+  "block.atum.ceramic_tile_orange": "Orange Ceramic Tile",
+  "block.atum.ceramic_tile_magenta": "Magenta Ceramic Tile",
+  "block.atum.ceramic_tile_light_blue": "Light Blue Ceramic Tile",
+  "block.atum.ceramic_tile_yellow": "Yellow Ceramic Tile",
+  "block.atum.ceramic_tile_lime": "Lime Ceramic Tile",
+  "block.atum.ceramic_tile_pink": "Pink Ceramic Tile",
+  "block.atum.ceramic_tile_gray": "Gray Ceramic Tile",
+  "block.atum.ceramic_tile_light_gray": "Light Gray Ceramic Tile",
+  "block.atum.ceramic_tile_cyan": "Cyan Ceramic Tile",
+  "block.atum.ceramic_tile_purple": "Purple Ceramic Tile",
+  "block.atum.ceramic_tile_blue": "Blue Ceramic Tile",
+  "block.atum.ceramic_tile_brown": "Brown Ceramic Tile",
+  "block.atum.ceramic_tile_green": "Green Ceramic Tile",
+  "block.atum.ceramic_tile_red": "Red Ceramic Tile",
+  "block.atum.ceramic_tile_black": "Black Ceramic Tile",
   "block.atum.ceramic_slab_white": "White Ceramic Tile Slab",
   "block.atum.ceramic_slab_orange": "Orange Ceramic Tile Slab",
   "block.atum.ceramic_slab_magenta": "Magenta Ceramic Tile Slab",

diff --git a/src/main/resources/assets/atum/lang/fr_fr.json b/src/main/resources/assets/atum/lang/fr_fr.json
@@ -60,22 +60,22 @@
   "block.atum.ceramic_green": "Bloc de tuiles en céramique verte",
   "block.atum.ceramic_red": "Bloc de tuiles en céramique rouge",
   "block.atum.ceramic_black": "Bloc de tuiles en céramique noire",
-  "block.atum.ceramic_white": "Tuiles de céramique blanche",
-  "block.atum.ceramic_orange": "Tuiles de céramique orange",
-  "block.atum.ceramic_magenta": "Tuiles de céramique magenta",
-  "block.atum.ceramic_light_blue": "Tuiles de céramique bleu clair",
-  "block.atum.ceramic_yellow": "Tuiles de céramique jaune",
-  "block.atum.ceramic_lime": "Tuiles de céramique vert clair",
-  "block.atum.ceramic_pink": "Tuiles de céramique rose",
-  "block.atum.ceramic_gray": "Tuiles de céramique grise",
-  "block.atum.ceramic_light_gray": "Tuiles de céramique gris clair",
-  "block.atum.ceramic_cyan": "Tuiles de céramique cyan",
-  "block.atum.ceramic_purple": "Tuiles de céramique violette",
-  "block.atum.ceramic_blue": "Tuiles de céramique bleue",
-  "block.atum.ceramic_brown": "Tuiles de céramique marron",
-  "block.atum.ceramic_green": "Tuiles de céramique verte",
-  "block.atum.ceramic_red": "Tuiles de céramique rouge",
-  "block.atum.ceramic_black": "Tuiles de céramique noire",
+  "block.atum.ceramic_tile_white": "Tuiles de céramique blanche",
+  "block.atum.ceramic_tile_orange": "Tuiles de céramique orange",
+  "block.atum.ceramic_tile_magenta": "Tuiles de céramique magenta",
+  "block.atum.ceramic_tile_light_blue": "Tuiles de céramique bleu clair",
+  "block.atum.ceramic_tile_yellow": "Tuiles de céramique jaune",
+  "block.atum.ceramic_tile_lime": "Tuiles de céramique vert clair",
+  "block.atum.ceramic_tile_pink": "Tuiles de céramique rose",
+  "block.atum.ceramic_tile_gray": "Tuiles de céramique grise",
+  "block.atum.ceramic_tile_light_gray": "Tuiles de céramique gris clair",
+  "block.atum.ceramic_tile_cyan": "Tuiles de céramique cyan",
+  "block.atum.ceramic_tile_purple": "Tuiles de céramique violette",
+  "block.atum.ceramic_tile_blue": "Tuiles de céramique bleue",
+  "block.atum.ceramic_tile_brown": "Tuiles de céramique marron",
+  "block.atum.ceramic_tile_green": "Tuiles de céramique verte",
+  "block.atum.ceramic_tile_red": "Tuiles de céramique rouge",
+  "block.atum.ceramic_tile_black": "Tuiles de céramique noire",
   "block.atum.ceramic_slab_white": "Dalle de tuiles en céramique blanche",
   "block.atum.ceramic_slab_orange": "Dalle de tuiles en céramique orange",
   "block.atum.ceramic_slab_magenta": "Dalle de tuiles en céramique magenta",

diff --git a/src/main/resources/assets/atum/lang/ru_ru.json b/src/main/resources/assets/atum/lang/ru_ru.json
@@ -60,22 +60,22 @@
   "block.atum.ceramic_green": "Блок зелёной керамической плитки",
   "block.atum.ceramic_red": "Блок красной керамической плитки",
   "block.atum.ceramic_black": "Блок чёрной керамической плитки",
-  "block.atum.ceramic_white": "Белая керамическая плитка",
-  "block.atum.ceramic_orange": "Оранжевая керамическая плитка",
-  "block.atum.ceramic_magenta": "Пурпурная керамическая плитка",
-  "block.atum.ceramic_light_blue": "Голубая керамическая плитка",
-  "block.atum.ceramic_yellow": "Жёлтая керамическая плитка",
-  "block.atum.ceramic_lime": "Лаймовая керамическая плитка",
-  "block.atum.ceramic_pink": "Розовая керамическая плитка",
-  "block.atum.ceramic_gray": "Серая керамическая плитка",
-  "block.atum.ceramic_light_gray": "Светло-серая керамическая плитка",
-  "block.atum.ceramic_cyan": "Бирюзовая керамическая плитка",
-  "block.atum.ceramic_purple": "Фиолетовая керамическая плитка",
-  "block.atum.ceramic_blue": "Синяя керамическая плитка",
-  "block.atum.ceramic_brown": "Коричневая керамическая плитка",
-  "block.atum.ceramic_green": "Зелёная керамическая плитка",
-  "block.atum.ceramic_red": "Красная керамическая плитка",
-  "block.atum.ceramic_black": "Чёрная керамическая плитка",
+  "block.atum.ceramic_tile_white": "Белая керамическая плитка",
+  "block.atum.ceramic_tile_orange": "Оранжевая керамическая плитка",
+  "block.atum.ceramic_tile_magenta": "Пурпурная керамическая плитка",
+  "block.atum.ceramic_tile_light_blue": "Голубая керамическая плитка",
+  "block.atum.ceramic_tile_yellow": "Жёлтая керамическая плитка",
+  "block.atum.ceramic_tile_lime": "Лаймовая керамическая плитка",
+  "block.atum.ceramic_tile_pink": "Розовая керамическая плитка",
+  "block.atum.ceramic_tile_gray": "Серая керамическая плитка",
+  "block.atum.ceramic_tile_light_gray": "Светло-серая керамическая плитка",
+  "block.atum.ceramic_tile_cyan": "Бирюзовая керамическая плитка",
+  "block.atum.ceramic_tile_purple": "Фиолетовая керамическая плитка",
+  "block.atum.ceramic_tile_blue": "Синяя керамическая плитка",
+  "block.atum.ceramic_tile_brown": "Коричневая керамическая плитка",
+  "block.atum.ceramic_tile_green": "Зелёная керамическая плитка",
+  "block.atum.ceramic_tile_red": "Красная керамическая плитка",
+  "block.atum.ceramic_tile_black": "Чёрная керамическая плитка",
   "block.atum.ceramic_slab_white": "Белая керамическая плита",
   "block.atum.ceramic_slab_orange": "Оранжевая керамическая плита",
   "block.atum.ceramic_slab_magenta": "Пурпурная керамическая плита",