diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index b1210341a..348cf1175 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -115,7 +115,7 @@ public class BOPBlocks public static Block hard_ice; public static Block dried_dirt; public static Block crag_rock; - public static Block mud_brick; + public static Block mud_brick_block; public static Block crystal; public static Block flower_vine; diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index 9621899f3..776a2e7cf 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -35,6 +35,16 @@ public class BOPItems public static Item honeycomb; public static Item gem; public static Item ash; + public static Item mud_brick; + public static Item blue_dye; + public static Item brown_dye; + public static Item green_dye; + public static Item white_dye; + public static Item black_dye; + public static Item ghastly_soul; + public static Item pixie_dust; + public static Item ichor; + public static Item pinecone; public static Item dart; public static Item dart_blower; diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index 0617342a0..e7b8eadae 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -118,7 +118,7 @@ public class ModBlocks hard_dirt = registerBlock( (new BlockBOPGeneric()).setHardness(0.7F), "hard_dirt" ); hard_ice = registerBlock( (new BlockBOPGeneric()).setHardness(0.75F), "hard_ice" ); hard_sand = registerBlock( (new BlockBOPGeneric(Material.sand)).setHardness(0.9F).setStepSound(Block.soundTypeSand), "hard_sand" ); - mud_brick = registerBlock( (new BlockBOPGeneric()).setResistance(2.0F), "mud_brick" ); + mud_brick_block = registerBlock( (new BlockBOPGeneric()).setResistance(2.0F), "mud_brick_block" ); // 16 wood types, 4 per BlockBOPLog instance, needs 4 'pages' log_0 = registerBlock( new BlockBOPLog0(), "log_0" ); diff --git a/src/main/java/biomesoplenty/common/init/ModItems.java b/src/main/java/biomesoplenty/common/init/ModItems.java index d83b6f17d..6b277c55b 100644 --- a/src/main/java/biomesoplenty/common/init/ModItems.java +++ b/src/main/java/biomesoplenty/common/init/ModItems.java @@ -84,6 +84,18 @@ public class ModItems honeycomb = registerItem(new Item(), "honeycomb"); gem = registerItem(new ItemGem(), "gem"); ash = registerItem(new Item(), "ash"); + mud_brick = registerItem(new Item(), "mud_brick"); + // TODO: move dyes to their own class? + blue_dye = registerItem(new Item(), "blue_dye"); + brown_dye = registerItem(new Item(), "brown_dye"); + green_dye = registerItem(new Item(), "green_dye"); + white_dye = registerItem(new Item(), "white_dye"); + black_dye = registerItem(new Item(), "black_dye"); + ghastly_soul = registerItem(new Item(), "ghastly_soul"); + ghastly_soul.setMaxStackSize(1); + pixie_dust = registerItem(new Item(), "pixie_dust"); + ichor = registerItem(new Item(), "ichor"); + pinecone = registerItem(new Item(), "pinecone"); dart = registerItem(new ItemDart(), "dart"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/mud_brick.json b/src/main/resources/assets/biomesoplenty/blockstates/mud_brick.json deleted file mode 100644 index a711c767a..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/mud_brick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "biomesoplenty:mud_brick" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/mud_brick_block.json b/src/main/resources/assets/biomesoplenty/blockstates/mud_brick_block.json new file mode 100644 index 000000000..f5bab8302 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/mud_brick_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "biomesoplenty:mud_brick_block" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_block.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/block/mud_brick.json rename to src/main/resources/assets/biomesoplenty/models/block/mud_brick_block.json index 17b066570..bfcf495de 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/mud_brick" + "all": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/black_dye.json b/src/main/resources/assets/biomesoplenty/models/item/black_dye.json new file mode 100644 index 000000000..0227ab93e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/black_dye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/black_dye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/blue_dye.json b/src/main/resources/assets/biomesoplenty/models/item/blue_dye.json new file mode 100644 index 000000000..dc1860b96 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/blue_dye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/blue_dye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/brown_dye.json b/src/main/resources/assets/biomesoplenty/models/item/brown_dye.json new file mode 100644 index 000000000..4a9f9a4d6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/brown_dye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/brown_dye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json b/src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json new file mode 100644 index 000000000..4776be8c7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/ghastly_soul.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/ghastly_soul" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/green_dye.json b/src/main/resources/assets/biomesoplenty/models/item/green_dye.json new file mode 100644 index 000000000..02875050c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/green_dye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/green_dye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/ichor.json b/src/main/resources/assets/biomesoplenty/models/item/ichor.json new file mode 100644 index 000000000..714c688f1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/ichor.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/ichor" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json b/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json index 86d5470d3..bec70a177 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_brick.json @@ -1,10 +1,18 @@ { - "parent": "biomesoplenty:block/mud_brick", + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/mud_brick" + }, "display": { "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] } } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_brick_block.json b/src/main/resources/assets/biomesoplenty/models/item/mud_brick_block.json new file mode 100644 index 000000000..e3bf26f52 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_brick_block.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/mud_brick_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pinecone.json b/src/main/resources/assets/biomesoplenty/models/item/pinecone.json new file mode 100644 index 000000000..0c915ba63 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pinecone.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/pinecone" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pixie_dust.json b/src/main/resources/assets/biomesoplenty/models/item/pixie_dust.json new file mode 100644 index 000000000..a6f39ff12 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pixie_dust.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/pixie_dust" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/whilte_dye.json b/src/main/resources/assets/biomesoplenty/models/item/whilte_dye.json new file mode 100644 index 000000000..a13c8cc45 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/whilte_dye.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/white_dye" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/black_dye.png b/src/main/resources/assets/biomesoplenty/textures/items/black_dye.png new file mode 100644 index 000000000..8c6a6a6eb Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/black_dye.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/blue_dye.png b/src/main/resources/assets/biomesoplenty/textures/items/blue_dye.png new file mode 100644 index 000000000..846587b65 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/blue_dye.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/brown_dye.png b/src/main/resources/assets/biomesoplenty/textures/items/brown_dye.png new file mode 100644 index 000000000..fcac6bf92 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/brown_dye.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ghastly_soul.png b/src/main/resources/assets/biomesoplenty/textures/items/ghastly_soul.png new file mode 100644 index 000000000..03185b662 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/ghastly_soul.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/green_dye.png b/src/main/resources/assets/biomesoplenty/textures/items/green_dye.png new file mode 100644 index 000000000..0d65f687e Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/green_dye.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ichor.png b/src/main/resources/assets/biomesoplenty/textures/items/ichor.png new file mode 100644 index 000000000..f058895b3 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/ichor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png new file mode 100644 index 000000000..52812717e Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/pinecone.png b/src/main/resources/assets/biomesoplenty/textures/items/pinecone.png new file mode 100644 index 000000000..81a748f49 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/pinecone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/pixie_dust.png b/src/main/resources/assets/biomesoplenty/textures/items/pixie_dust.png new file mode 100644 index 000000000..52e9ed7c4 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/pixie_dust.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/white_dye.png b/src/main/resources/assets/biomesoplenty/textures/items/white_dye.png new file mode 100644 index 000000000..18c54bbcd Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/white_dye.png differ