diff --git a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java index 30cab0a..26e1303 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -111,6 +111,17 @@ public class ModBlocks { .requiresTool() )); + public static final Block ORDERED_CORE = registerBlock("ordered_core", + new HeavyCoreBlock( + AbstractBlock.Settings.create() + .mapColor(MapColor.IRON_GRAY) + .instrument(NoteBlockInstrument.SNARE) + .sounds(BlockSoundGroup.HEAVY_CORE) + .strength(10.0F) + .pistonBehavior(PistonBehavior.NORMAL) + .resistance(1200.0F) + )); + public static final Block LEMONWOOD_LOG = registerBlock("lemonwood_log", new PillarBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_LOG))); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index ece2e1a..3bea89a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -106,6 +106,7 @@ public class ModItemGroups { entries.add(ModItems.BERSERKERS_PAULDRON); entries.add(ModItems.WILDFIRE_BOOTS); entries.add(ModItems.SOVS_PLATE_CARRIER); + entries.add(ModBlocks.ORDERED_CORE); }) diff --git a/src/main/resources/assets/acesbs/blockstates/ordered_core.json b/src/main/resources/assets/acesbs/blockstates/ordered_core.json new file mode 100644 index 0000000..2a48687 --- /dev/null +++ b/src/main/resources/assets/acesbs/blockstates/ordered_core.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/ordered_core" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index f51a58b..b9740ad 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -139,6 +139,8 @@ "block.acesbs.crystal_entropy": "Crystallized Entropy", "block.acesbs.crystal_entropy_pane": "Crystallized Entropy Pane", + "block.acesbs.ordered_core": "Ordered Core", + "block.acesbs.tobacco_crop": "Tobacco Crop", "itemgroup.acesbs.1_blocks": "Ace's BS Blocks", diff --git a/src/main/resources/assets/acesbs/models/block/ordered_core.json b/src/main/resources/assets/acesbs/models/block/ordered_core.json new file mode 100644 index 0000000..5064407 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/ordered_core.json @@ -0,0 +1,44 @@ +{ + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 4, 0], + "scale":[ 1, 1, 1 ] + }, + "thirdperson_righthand": { + "rotation": [ 45, 45, 0 ], + "translation": [ 0, 3, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + }, + "texture_size": [16, 16], + "textures": { + "all": "acesbs:block/ordered_core", + "particle": "acesbs:block/ordered_core" + }, + "elements": [ + { + "name": "ordered_core", + "from": [4, 0, 4], + "to": [12, 8, 12], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "all"}, + "east": {"uv": [0, 8, 8, 16], "texture": "all"}, + "south": {"uv": [0, 8, 8, 16], "texture": "all"}, + "west": {"uv": [0, 8, 8, 16], "texture": "all"}, + "up": {"uv": [0, 0, 8, 8], "texture": "all"}, + "down": {"uv": [8, 0, 16, 8], "texture": "all"} + } + } + ] +} diff --git a/src/main/resources/assets/acesbs/models/item/ordered_core.json b/src/main/resources/assets/acesbs/models/item/ordered_core.json new file mode 100644 index 0000000..d06bf2d --- /dev/null +++ b/src/main/resources/assets/acesbs/models/item/ordered_core.json @@ -0,0 +1,3 @@ +{ + "parent": "acesbs:block/ordered_core" +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/textures/block/order_core.png b/src/main/resources/assets/acesbs/textures/block/order_core.png deleted file mode 100644 index 504c50d..0000000 Binary files a/src/main/resources/assets/acesbs/textures/block/order_core.png and /dev/null differ diff --git a/src/main/resources/assets/acesbs/textures/block/ordered_core.png b/src/main/resources/assets/acesbs/textures/block/ordered_core.png new file mode 100644 index 0000000..18e8800 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/ordered_core.png differ