From 7a2d37a634bae9003a8f0bff5d277fd1491924aa Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:24:31 -0800 Subject: [PATCH] Placeholder models and balance changes (no longer requires hammer item) --- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 ++- .../93943142017732f21fbc4fa325d116c728b69767 | 4 ++-- .../fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 3 ++- .../resources/assets/exdeorum/lang/en_us.json | 2 ++ .../models/item/mechanical_hammer.json | 3 +++ .../loot_tables/blocks/mechanical_hammer.json | 21 ++++++++++++++++++ .../exdeorum/block/MechanicalHammerBlock.java | 2 ++ .../MechanicalHammerBlockEntity.java | 20 ++++++++++++----- .../thedarkcolour/exdeorum/data/English.java | 1 - .../exdeorum/data/TranslationKeys.java | 1 - .../exdeorum/registry/EBlocks.java | 2 +- .../models/block/mechanical_hammer_off.json | 2 +- .../block/mechanical_hammer_front.png | Bin 0 -> 623 bytes .../block/mechanical_hammer_front_on.png | Bin 0 -> 748 bytes .../mechanical_hammer_front_on.png.mcmeta | 6 +++++ .../textures/block/mechanical_hammer_side.png | Bin 0 -> 612 bytes .../textures/block/mechanical_hammer_top.png | Bin 0 -> 691 bytes 17 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/mechanical_hammer.json create mode 100644 src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png create mode 100644 src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png create mode 100644 src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png.mcmeta create mode 100644 src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_side.png create mode 100644 src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.png diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 25abef90..2ee36603 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-10T20:18:25.7260241 Loot Tables +// 1.20.1 2024-01-25T14:16:46.237861 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_tables/blocks/acacia_barrel.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_tables/blocks/acacia_crucible.json fcc00910a8cc94bed6339d6833fcec53c501a0d7 data/exdeorum/loot_tables/blocks/acacia_sieve.json @@ -73,6 +73,7 @@ b38104ee25127d9c65ad9e323ed879f76df7a048 data/exdeorum/loot_tables/blocks/mangro 475b89fd8f09834652f80c93d8a6d0964d708ead data/exdeorum/loot_tables/blocks/maple_barrel.json 54f36187d7fb97dedc4680d14e2ad7d70b5c64af data/exdeorum/loot_tables/blocks/maple_crucible.json 7ffe80360af055f3977d05b5684a299886bcb756 data/exdeorum/loot_tables/blocks/maple_sieve.json +926a9224e747bf53eb81448c1abb55d73fce5092 data/exdeorum/loot_tables/blocks/mechanical_hammer.json a84508222cb36b07cb20ee31915d802bcc411149 data/exdeorum/loot_tables/blocks/mechanical_sieve.json cad973c873a2e50ccfac91e88eadb3c2462d39d1 data/exdeorum/loot_tables/blocks/oak_barrel.json f94bc97efbfd26ccf7dba32d414fb5e33decd5f6 data/exdeorum/loot_tables/blocks/oak_crucible.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index ec55f3e3..6237fdac 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.20.1 2024-01-12T17:15:18.0568334 ModKit Language: en_us for mod 'exdeorum' -134e71f17cef95d72141a3d6431db5eb8438f3a0 assets/exdeorum/lang/en_us.json +// 1.20.1 2024-01-25T14:16:46.2316734 ModKit Language: en_us for mod 'exdeorum' +248ab1a837b9857fb1928e826cb02f9f142e8d96 assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index 57425b7f..f3d7bef9 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-10T20:18:25.7240245 ModKit Item Models for mod 'exdeorum' +// 1.20.1 2024-01-25T14:16:46.2347562 ModKit Item Models for mod 'exdeorum' 4ba3bb2c6174ac3728a4b85e34681f118ec8eb34 assets/exdeorum/models/item/acacia_barrel.json c03ce41f7c071498fcbd5f5225e91dcb2f365fbb assets/exdeorum/models/item/acacia_crucible.json 3b4f1d45c0d9c4cd1d9a5cdf6ddc8d2c9791bca5 assets/exdeorum/models/item/acacia_sieve.json @@ -105,6 +105,7 @@ ff89dc05408074da0e9d41bfef91dfe975302403 assets/exdeorum/models/item/mahogany_cr c3f2af2a88cd97148b05efbd6e24fc2558fcc0b8 assets/exdeorum/models/item/maple_barrel.json cc045825c562e9133858ce5cfe6e6f1dcb747d8e assets/exdeorum/models/item/maple_crucible.json a64e9b9ce91ac6b2f36690a770afc52b8900a614 assets/exdeorum/models/item/maple_sieve.json +59cdfe2c26f9d4a16ab7e8e7a87c97403eafa562 assets/exdeorum/models/item/mechanical_hammer.json 1e2b482f5fc4d283f5ca12919b575f86dc4a9541 assets/exdeorum/models/item/mechanical_sieve.json d543d3e18bdcf2bf79a762b52cc61a4161124db1 assets/exdeorum/models/item/mycelium_spores.json 1f48b2ce3452ce5d02142c9f663ae7bdb7d1d934 assets/exdeorum/models/item/netherite_hammer.json diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index 16e4643d..4f527d21 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -84,6 +84,7 @@ "block.exdeorum.maple_barrel": "Maple Barrel", "block.exdeorum.maple_crucible": "Maple Crucible", "block.exdeorum.maple_sieve": "Maple Sieve", + "block.exdeorum.mechanical_hammer": "Mechanical Hammer", "block.exdeorum.mechanical_sieve": "Mechanical Sieve", "block.exdeorum.oak_barrel": "Oak Barrel", "block.exdeorum.oak_crucible": "Oak Crucible", @@ -118,6 +119,7 @@ "block.exdeorum.willow_crucible": "Willow Crucible", "block.exdeorum.willow_sieve": "Willow Sieve", "block.exdeorum.witch_water": "Witch Water", + "exdeorum.container.mechanical_hammer": "Mechanical Hammer", "exdeorum.container.mechanical_sieve": "Mechanical Sieve", "fluid_type.exdeorum.witch_water": "Witch Water", "generator.exdeorum.void_world": "Void World", diff --git a/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json b/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json new file mode 100644 index 00000000..17f008c8 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/mechanical_hammer" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/mechanical_hammer.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/mechanical_hammer.json new file mode 100644 index 00000000..96c595e8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/mechanical_hammer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:mechanical_hammer" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/mechanical_hammer" +} \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/block/MechanicalHammerBlock.java b/src/main/java/thedarkcolour/exdeorum/block/MechanicalHammerBlock.java index 431f3ac3..05dd2eec 100644 --- a/src/main/java/thedarkcolour/exdeorum/block/MechanicalHammerBlock.java +++ b/src/main/java/thedarkcolour/exdeorum/block/MechanicalHammerBlock.java @@ -36,6 +36,8 @@ public class MechanicalHammerBlock extends EBlock { public MechanicalHammerBlock(Properties properties) { super(properties, EBlockEntities.MECHANICAL_HAMMER); + + registerDefaultState(defaultBlockState().setValue(RUNNING, false)); } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalHammerBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalHammerBlockEntity.java index bde705b7..4b161191 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalHammerBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalHammerBlockEntity.java @@ -49,12 +49,12 @@ public class MechanicalHammerBlockEntity extends AbstractMachineBlockEntity= TOTAL_PROGRESS) { @@ -178,9 +182,13 @@ public class MechanicalHammerBlockEntity extends AbstractMachineBlockEntity CRYSTALLIZED_SIEVE = registerSieve("crystallized_sieve", SoundType.GLASS); // Mechanical Sieve (todo add properties) public static final RegistryObject MECHANICAL_SIEVE = BLOCKS.register("mechanical_sieve", () -> new MechanicalSieveBlock(of())); - // Mechanical Hammer (todo add properties) + // Mechanical Hammer public static final RegistryObject MECHANICAL_HAMMER = BLOCKS.register("mechanical_hammer", () -> new MechanicalHammerBlock(of())); // Lava Crucibles diff --git a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json index b2d895cd..a56fbca2 100644 --- a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json +++ b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/orientable", "textures": { - "front": "exdeorum:block/mechanical_hammer_front_off", + "front": "exdeorum:block/mechanical_hammer_front", "side": "exdeorum:block/mechanical_hammer_side", "top": "exdeorum:block/mechanical_hammer_top" } diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png new file mode 100644 index 0000000000000000000000000000000000000000..b1be1bacd68d11d9aba0e8d1f4ffe29a3376625b GIT binary patch literal 623 zcmV-#0+9WQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t87!K~y+TWsyB^ z+E5gRv2ig58;sJF-w;-4Cbnj3R+0>?{1KMW4Jq9b3cm+LGp2G0feMU@1Q_r)?&Dfw z=^gGpAMZKmJ?|B|-LCKZsZ{E4I7pJ@I8HX3#SMahxF86*TyC{m5m8l@taLmcE0s#Q zTqeZPG>w}|Zrip&V1ThK3u8PU#|h5&r>CN>C-(n`-oNMb`-g}9elJB)MElKV^W)_O z8ni4Hi-5u~Ox#Q+BZ^|ZUS~L!BI6*f>pD3YlLqH`-r0p12GuM>UlAvn3l5vrUDt*2 z*(H@=w%cty4U1-!q6r~f3P_w?&=~o=ifx*v#2&D!R%=&RmG%11#l=V0bFH0q`RNh_ zG*nHUPNsBOnI^3znz47SR&`ugN~e>7g+d`bofr#scDTO&tmJZzZIhLj%Oy|rPdns7 zkfer2rBaC-7be_j6HiD*5eg26Lk#{aBg-G8xJ&YP5C#Vy&ez*pl!&7|++S{PTCEoJ z27^JP(STL2*K0PL%3vMk305M;exGmhMNwE07x}?W-`;k+9W}G}cj7-^Ut>xXsG0`X#bVKJx6|qLFT?oO>7c=AH0nG) z0-8)Fv`1o!h5Ng^m{kzquo;a{VTemm$!0y@N9!OAxnqFm{RJ)IbFL+(QU3q{002ov JPDHLkV1iZJ5NrSd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png new file mode 100644 index 0000000000000000000000000000000000000000..03af2409cc0ae0fd6fbd0210d7ebf6033bd0ae10 GIT binary patch literal 748 zcmVPx#1ZP1_K>z@;j|==^1poj6EKp2TMURhdU|?=g@tc#Z*y~V zudlDh#>Ugr)7RJ6&d$!fyu4XhSZHWybaZrtgoH^*NYGRb?Oh6DVq)!w3SVAc@S;Mu zx3_h5b!us9US3{&dwg&eSL|FiDP18p`f5vR#v;ayRfgXsHmu{tE;4= zqq4EFpP!$co12r8lAxcTsi~=5U0t-aw9CuO&CSil#l^tDz_GEhPEJl;TwJ)gxO{wk ze0zIQbc6MuOYHVw3Wn^SZN=m=Kzrw=8QBhH8X=$yktyNT1l#`QU zVPTt^nw^}Sj*X3ifq_<4Rf>s;O-xLnprE6pqo$^&goA^vtgL%_dRSOkOiWBlNl8UT zMNUmkNJvObOG{HyQX0SvqyPW_32;bRa{vGi!TE6m&!s8Fxek-v1r!1d72cWALQ?)1J#OKY+ub zI8~=paj9-iQ$64&lv1zP=krq2j3E;v!k`+c zVu2hP+F?YZpwcjM&h5)F7Fh-@uo5@ot81Q+x*pp|Y(g}-wVg`s?2>e*mDm@HgCxo3 z^7%sUkWxa9icl(7j!#a{sI|8p=L3`e~`dq|O~hZLE3h|ff1 z;=#ppEHY0IrWb6IZx3W;Hsis08~@)!)??ZaSr6F{8)GaYJp{&BWZwO-NoM-NnhbyR e1Nm<}M!heMh-`woR@^!O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T2#W=DKiX5Bh`JDWekR(ti7GsMXA(iG>QdK%?wNiaCp0cgpre)1~Kfg zF+I9tbXB}I%rwp6aHv9@+))ov*EG|z*Z?ki&{7dyEEcH7Hol5V0~i^oAf?_SUC~nY y<@p)so+LQj0Sp0f2{sHP23yL6PNXaf;`kqvaa6rUS1Sf*ZOGo6bs2~Xo#3&%>#-FG; z)dUxvb5GyX)m7E4ak*S@I-L?LD=S!CUB&Y9vYZU&Y&M(Z91aJTmX;)Vw^%IDFnM-% zhD1F66QxoKnRFUg*{nqJ@>25AlM}>ZF?s*z@KC@7AgvyIy+1{8 z&(GN3-^XAuko?xx7H)5Ead&rz69py=>~=dcnT!<-j|W-BOc<=MucKHfAfL}m@o+dqqtU?8(Gj}cE-IA@g25oF)hh1q?-4#Y!1wnz zE-o&_3k}U^Hk(rL_Vy;hf?BO6MFb@XWBjIGuZt&Es}&lz+byQCb3w5Pg+kKl>FEi{ zWD<{$k8-C378ev-e$z;^*$fS7Tq|wt==b}jkcOpFDe>ju;X&xKm>z9zZVI#0(^D9Y zMrcTb0Hpfz@*)ls==1YaK$&L&JNtb;BoYa^|5kYcSX^90R!!mc^;J-*|NZ@4m{2nd zsh<<+bUKJD?fi~Lqc9i@3SeOYaixc2;dn@yOTBv#zmT$nHd4_LJ5)MV|cc=r7Kxcf2-9J6KP(t zSd^vXMzTgE%+Jjsq{cGtkXHF4LlU4A;iSNP=;G9t>VgCX<|c1*)5zgjTDSFicNlVqyaNsi~jy*X*pk Z`w#P6>T7