diff --git a/src/main/java/net/mcreator/superbwarfare/block/DragonTeethBlock.java b/src/main/java/net/mcreator/superbwarfare/block/DragonTeethBlock.java index 2d6bc740f..a092eb8de 100644 --- a/src/main/java/net/mcreator/superbwarfare/block/DragonTeethBlock.java +++ b/src/main/java/net/mcreator/superbwarfare/block/DragonTeethBlock.java @@ -13,7 +13,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; public class DragonTeethBlock extends Block { public DragonTeethBlock() { - super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(13f, 28f).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((bs, br, bp) -> false)); + super(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(25f, 500f).requiresCorrectToolForDrops().noOcclusion().isRedstoneConductor((bs, br, bp) -> false)); } @Override @@ -33,12 +33,7 @@ public class DragonTeethBlock extends Block { @Override public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - return Shapes.or(box(1, 0, 1, 15, 3, 15), - box(2, 3, 2, 14, 6, 14), - box(3, 6, 3, 13, 9, 13), - box(4, 9, 4, 12, 12, 12), - box(5, 12, 5, 11, 15, 11), - box(6, 15, 6, 10, 16, 10)); + return Shapes.or(box(2, 0, 2, 14, 24, 14)); } } diff --git a/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.obj b/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.obj index 8849eda02..496bc4af3 100644 --- a/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.obj +++ b/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.obj @@ -2,54 +2,54 @@ mtllib dragon_teeth.mtl o cube -v 0.578125 1.109375 0.515625 -v 0.578125 1.109375 0.484375 -v 0.578125 1.078125 0.515625 -v 0.578125 1.078125 0.484375 -v 0.421875 1.109375 0.515625 -v 0.421875 1.109375 0.484375 -v 0.421875 1.078125 0.515625 -v 0.421875 1.078125 0.484375 -v 0.39062500000000006 1.109375 0.515625 -v 0.39062500000000006 1.109375 0.484375 -v 0.42187500000000006 1.109375 0.515625 -v 0.42187500000000006 1.109375 0.484375 -v 0.39062500000000006 0.996875 0.515625 -v 0.39062500000000006 0.996875 0.484375 -v 0.42187500000000006 0.996875 0.515625 -v 0.42187500000000006 0.996875 0.484375 -v 0.5781250000000001 1.109375 0.515625 -v 0.5781250000000001 1.109375 0.484375 -v 0.6093750000000001 1.109375 0.515625 -v 0.6093750000000001 1.109375 0.484375 -v 0.578125 0.996875 0.515625 -v 0.578125 0.996875 0.484375 -v 0.609375 0.996875 0.515625 -v 0.609375 0.996875 0.484375 -v 0.640625 1 0.640625 -v 0.640625 1 0.359375 -v 0.359375 1 0.640625 -v 0.359375 1 0.359375 -v 0.9375 0 0.9375 -v 0.9375 0 0.0625 -v 0.0625 0 0.9375 -v 0.0625 0 0.0625 -v -1.1102230246251565e-16 0.0625 0.953125 -v 0.3125 0.96875 0.640625 -v -1.1102230246251565e-16 0.0625 0.046874999999999944 -v 0.3125 0.96875 0.359375 -v 1 0.0625 0.953125 -v 0.6875 0.96875 0.640625 -v 1 0.0625 0.046874999999999944 -v 0.6875 0.96875 0.359375 -v 0.953125 0.0625 0 -v 0.640625 0.96875 0.3125 -v 0.046874999999999944 0.0625 0 -v 0.359375 0.96875 0.3125 -v 0.953125 0.0625 1 -v 0.640625 0.96875 0.6875 -v 0.046874999999999944 0.0625 1 -v 0.359375 0.96875 0.6875 +v 0.6171875 1.6640625 0.5234375 +v 0.6171875 1.6640625 0.4765625 +v 0.6171875 1.6171875 0.5234375 +v 0.6171875 1.6171875 0.4765625 +v 0.38281249999999994 1.6640625 0.5234375 +v 0.38281249999999994 1.6640625 0.4765625 +v 0.38281249999999994 1.6171875 0.5234375 +v 0.38281249999999994 1.6171875 0.4765625 +v 0.3359375000000001 1.6640625 0.5234375 +v 0.3359375000000001 1.6640625 0.4765625 +v 0.3828125000000001 1.6640625 0.5234375 +v 0.3828125000000001 1.6640625 0.4765625 +v 0.33593750000000006 1.4953125 0.5234375 +v 0.33593750000000006 1.4953125 0.4765625 +v 0.38281250000000006 1.4953125 0.5234375 +v 0.38281250000000006 1.4953125 0.4765625 +v 0.6171875000000001 1.6640625 0.5234375 +v 0.6171875000000001 1.6640625 0.4765625 +v 0.6640625000000001 1.6640625 0.5234375 +v 0.6640625000000001 1.6640625 0.4765625 +v 0.6171875 1.4953125 0.5234375 +v 0.6171875 1.4953125 0.4765625 +v 0.6640625 1.4953125 0.5234375 +v 0.6640625 1.4953125 0.4765625 +v 0.7109375 1.5 0.7109375 +v 0.7109375 1.5 0.2890625 +v 0.28906249999999994 1.5 0.7109375 +v 0.28906249999999994 1.5 0.2890625 +v 1.15625 0 1.15625 +v 1.15625 0 -0.15625 +v -0.15625 0 1.15625 +v -0.15625 0 -0.15625 +v -0.2500000000000002 0.09375 1.1796875 +v 0.21874999999999994 1.453125 0.7109375 +v -0.2500000000000002 0.09375 -0.1796875000000001 +v 0.21874999999999994 1.453125 0.2890625 +v 1.25 0.09375 1.1796875 +v 0.78125 1.453125 0.7109375 +v 1.25 0.09375 -0.1796875000000001 +v 0.78125 1.453125 0.2890625 +v 1.1796875 0.09375 -0.25 +v 0.7109375 1.453125 0.21875 +v -0.1796875000000001 0.09375 -0.25 +v 0.28906249999999994 1.453125 0.21875 +v 1.1796875 0.09375 1.25 +v 0.7109375 1.453125 0.78125 +v -0.1796875000000001 0.09375 1.25 +v 0.28906249999999994 1.453125 0.78125 vt 0.046875 0.984375 vt 0.046875 1 vt 0 1 @@ -207,41 +207,41 @@ vn 0 -1 0 vn 0 0 1 vn 0 0 -1 vn 0 1 0 -vn -1 2.467162276944792e-16 0 -vn 1 -2.467162276944792e-16 0 +vn -1 3.2895497025930557e-16 0 +vn 1 -3.2895497025930557e-16 0 vn 0 0 1 vn 0 0 -1 vn 0 1 0 -vn -1 2.467162276944792e-16 0 -vn 1 -2.467162276944792e-16 0 +vn -1 3.2895497025930557e-16 0 +vn 1 -3.2895497025930557e-16 0 vn 0 0 1 vn 0 0 -1 -vn 0.9453729816262723 0.32599068331940423 0 -vn -0.9453729816262723 0.3259906833194043 0 +vn 0.9453729816262721 0.32599068331940423 0 +vn -0.9453729816262721 0.3259906833194043 0 vn 0 1 0 vn 0 -1 0 -vn 0 0.32599068331940423 0.9453729816262723 -vn 0 0.32599068331940423 -0.9453729816262723 -vn 0.5547001962252293 0.8320502943378438 0 -vn -0.5547001962252293 0.8320502943378438 0 -vn 0 0.8320502943378438 0.5547001962252293 -vn 0 0.8320502943378438 -0.5547001962252293 +vn 0 0.32599068331940423 0.9453729816262721 +vn 0 0.3259906833194042 -0.9453729816262721 +vn 0.5547001962252291 0.8320502943378437 0 +vn -0.5547001962252291 0.8320502943378437 0 +vn 0 0.8320502943378437 0.5547001962252291 +vn 0 0.8320502943378437 -0.5547001962252291 vn 0.7071067811865476 -0.7071067811865476 0 -vn -0.7071067811865469 -0.7071067811865481 0 +vn -0.7071067811865467 -0.7071067811865483 0 vn 0 -0.7071067811865476 0.7071067811865476 vn 0 -0.7071067811865476 -0.7071067811865476 -vn 0.6355615789624307 0.43831833031891776 -0.6355615789624307 -vn 0.6355615789624312 0.43831833031891804 0.6355615789624303 -vn -0.6355615789624296 0.43831833031891776 -0.635561578962432 -vn -0.63556157896243 0.43831833031891787 0.6355615789624315 -vn 0.5298129428260174 -0.6622661785325222 0.5298129428260174 -vn -0.5298129428260165 -0.6622661785325225 0.5298129428260178 -vn 0.5298129428260174 -0.6622661785325222 -0.5298129428260174 -vn -0.5298129428260165 -0.6622661785325225 -0.5298129428260178 -vn 0.485071250072666 0.727606875108999 0.485071250072666 -vn -0.485071250072666 0.727606875108999 0.485071250072666 -vn 0.485071250072666 0.727606875108999 -0.485071250072666 -vn -0.485071250072666 0.727606875108999 -0.485071250072666 +vn 0.6355615789624307 0.4383183303189178 -0.6355615789624307 +vn 0.6355615789624312 0.4383183303189178 0.6355615789624304 +vn -0.6355615789624297 0.43831833031891776 -0.6355615789624319 +vn -0.6355615789624297 0.4383183303189178 0.6355615789624317 +vn 0.5298129428260173 -0.6622661785325222 0.5298129428260173 +vn -0.5298129428260163 -0.6622661785325227 0.529812942826018 +vn 0.5298129428260173 -0.6622661785325222 -0.5298129428260173 +vn -0.5298129428260163 -0.6622661785325227 -0.529812942826018 +vn 0.48507125007266594 0.7276068751089989 0.48507125007266594 +vn -0.48507125007266594 0.7276068751089989 0.48507125007266594 +vn 0.48507125007266594 0.7276068751089989 -0.48507125007266594 +vn -0.48507125007266594 0.7276068751089989 -0.48507125007266594 usemtl m_40ddb3f7-b960-0c4a-147f-2010aa6221ab f 1/1/1 2/2/1 6/3/1 5/4/1 f 4/5/2 3/6/2 7/7/2 8/8/2 diff --git a/src/main/resources/assets/superbwarfare/models/item/dragon_teeth.json b/src/main/resources/assets/superbwarfare/models/item/dragon_teeth.json index 229fe5d96..cca3e959e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/dragon_teeth.json +++ b/src/main/resources/assets/superbwarfare/models/item/dragon_teeth.json @@ -3,35 +3,40 @@ "display": { "thirdperson_righthand": { "rotation": [90, 0, 0], - "translation": [0, -2, -4.25], - "scale": [0.5, 0.5, 0.5] + "translation": [0, -2, -6.25], + "scale": [0.35, 0.35, 0.35] }, "thirdperson_lefthand": { "rotation": [90, 0, 0], - "translation": [0, -2, -4.25], - "scale": [0.5, 0.5, 0.5] + "translation": [0, -2, -6.25], + "scale": [0.35, 0.35, 0.35] }, "firstperson_righthand": { - "rotation": [13.63, -3.24, -13.11], - "translation": [0, 2.75, 0.5], - "scale": [0.5, 0.5, 0.5] + "rotation": [13, 0, 0], + "translation": [-1.5, 1.25, 0.5], + "scale": [0.35, 0.35, 0.35] }, "firstperson_lefthand": { - "rotation": [13.63, -3.24, -13.11], - "translation": [0, 2.75, 0.5], - "scale": [0.5, 0.5, 0.5] + "rotation": [13, 0, 0], + "translation": [-1.5, 1.25, 0.5], + "scale": [0.35, 0.35, 0.35] }, "ground": { - "translation": [0, 1.5, 0], - "scale": [0.5, 0.5, 0.5] + "translation": [0, 0.25, 0], + "scale": [0.4, 0.4, 0.4] }, "gui": { "rotation": [45, -45, 0], - "translation": [0, 1.75, 0], - "scale": [0.7, 0.7, 0.7] + "translation": [0, 0.25, 0], + "scale": [0.45, 0.45, 0.45] }, "head": { - "translation": [0, 14, 0] + "translation": [0, 11.5, 0], + "scale": [0.7, 0.7, 0.7] + }, + "fixed": { + "translation": [0, -2.5, 0], + "scale": [0.7, 0.7, 0.7] } } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/block/dragon_teeth.png b/src/main/resources/assets/superbwarfare/textures/block/dragon_teeth.png index e5e77d63d..ce23feab1 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/block/dragon_teeth.png and b/src/main/resources/assets/superbwarfare/textures/block/dragon_teeth.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 3539d455a..ebf6d8a35 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -4,6 +4,7 @@ "superbwarfare:galena_ore", "superbwarfare:deepslate_galena_ore", "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_scheelite_ore" + "superbwarfare:deepslate_scheelite_ore", + "superbwarfare:dragon_teeth" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 3539d455a..ebf6d8a35 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -4,6 +4,7 @@ "superbwarfare:galena_ore", "superbwarfare:deepslate_galena_ore", "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_scheelite_ore" + "superbwarfare:deepslate_scheelite_ore", + "superbwarfare:dragon_teeth" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json b/src/main/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json new file mode 100644 index 000000000..befb781c9 --- /dev/null +++ b/src/main/resources/data/superbwarfare/loot_tables/blocks/dragon_teeth.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "superbwarfare:dragon_teeth" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/dragon_teeth" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json b/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json index 681839b44..952759bc9 100644 --- a/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json @@ -16,6 +16,6 @@ }, "result": { "item": "superbwarfare:dragon_teeth", - "count": 6 + "count": 4 } } \ No newline at end of file