R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate data, reduce setBlock calls when Mechanical Hammer is off

Browse Source
This commit is contained in:
thedarkcolour 2024-02-01 19:15:21 -08:00
parent 22a163891a
commit 8945f095fa
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
View File

@ -1,4 +1,4 @@
// 1.20.1 2024-01-25T14:16:46.237861 Loot Tables
// 1.20.1 2024-02-01T18:59:58.2832542 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,7 +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
f07a24644303ad3416c03ebb943f7643ec6e5628 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

4
src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439
View File

@ -1,7 +1,7 @@
// 1.20.1 2024-01-16T13:09:09.030463 Tags for minecraft:block mod id exdeorum
// 1.20.1 2024-02-01T18:59:58.282244 Tags for minecraft:block mod id exdeorum
77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/blocks/watering_can_tickable.json
f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/blocks/leaves.json
6118dd1a976e5c95335fe0271c784eef3dac5bf5 data/minecraft/tags/blocks/mineable/axe.json
f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/blocks/mineable/hoe.json
04df8bfadf9a85eec21f001c37015bf49fb3c95c data/minecraft/tags/blocks/mineable/pickaxe.json
0cdcc5fc12eebe1808d6af184772b92e587e853f data/minecraft/tags/blocks/mineable/pickaxe.json
0fc927ffe01dd23fd511dea057c7894680ae9807 data/minecraft/tags/blocks/mineable/shovel.json

4
src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767
View File

@ -1,2 +1,2 @@
// 1.20.1 2024-01-25T14:16:46.2316734 ModKit Language: en_us for mod 'exdeorum'
248ab1a837b9857fb1928e826cb02f9f142e8d96 assets/exdeorum/lang/en_us.json
// 1.20.1 2024-02-01T18:59:58.2800312 ModKit Language: en_us for mod 'exdeorum'
1452b3f0ae2b5a3c1e74a4df38d2a8b7a4d836e7 assets/exdeorum/lang/en_us.json

4
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View File

@ -1,4 +1,4 @@
// 1.20.1 2024-01-26T13:06:21.1726482 Recipes
// 1.20.1 2024-02-01T18:59:58.2852543 Recipes
e37b64428f17e304e91539ac0513456d7ce40cd1 data/exdeorum/advancements/recipes/building_blocks/sponge.json
5ad481a0c376c1a1785a5d3b992064d0ec0bf3b0 data/exdeorum/advancements/recipes/food/end_cake.json
25dd027e844a72b03c95dbe5e3c3dd8c738ceb00 data/exdeorum/advancements/recipes/misc/acacia_barrel.json
@ -43,6 +43,7 @@ f3d25fad0818f06ed341008daa157732a41702f0 data/exdeorum/advancements/recipes/misc
ef344cd03adefba1ff628f494569cb1e61ff5a5f data/exdeorum/advancements/recipes/misc/mangrove_barrel.json
a4325e653eba3a2cd86fa5055414c0b8f391d80d data/exdeorum/advancements/recipes/misc/mangrove_crucible.json
47657db106b7291a5fc2ebf281daa03dc7ec71c0 data/exdeorum/advancements/recipes/misc/mangrove_sieve.json
9073425076ced5fc311a87ebb614669bb680d715 data/exdeorum/advancements/recipes/misc/mechanical_hammer.json
3dc9943b92b254be691be3f6f555992e687fe0e1 data/exdeorum/advancements/recipes/misc/mechanical_sieve.json
8cde46d6245da58277653bb9877518f099150e3d data/exdeorum/advancements/recipes/misc/moss_block.json
a21315f6c45ed3300ae2dd79b1dbdbecce9d1305 data/exdeorum/advancements/recipes/misc/netherite_mesh.json
@ -293,6 +294,7 @@ b012c1b39678d3e560365bc01a59c9a88182388e data/exdeorum/recipes/mahogany_barrel.j
e288683a0ad5496b43667307e9a22b35a0482d77 data/exdeorum/recipes/maple_barrel.json
c6ab33d03646b9af8b2d624e28b7d21083772dda data/exdeorum/recipes/maple_crucible.json
f1b143b0f52102366fd79d608540e67e9909c43f data/exdeorum/recipes/maple_sieve.json
dd1b8a3eb6bcdf27034d1a456df4164b831b9fde data/exdeorum/recipes/mechanical_hammer.json
0e8f6c50263bda0f9c41da7df9f726f27ff0b374 data/exdeorum/recipes/mechanical_sieve.json
962586e6665baef84b573df40211ff3ce36d88b0 data/exdeorum/recipes/moss_block.json
f92abca4ddd5f75b770e81fc745a735a7fd0ee68 data/exdeorum/recipes/netherite_hammer.json

1
src/generated/resources/assets/exdeorum/lang/en_us.json
View File

@ -189,6 +189,7 @@
"item.exdeorum.lead_ore_chunk": "Lead Ore Chunk",
"item.exdeorum.lithium_ore_chunk": "Lithium Ore Chunk",
"item.exdeorum.magnesium_ore_chunk": "Magnesium Ore Chunk",
"item.exdeorum.mechanical_hammer.hammer_label": "Hammer: ",
"item.exdeorum.mechanical_sieve.mesh_label": "Mesh: ",
"item.exdeorum.mycelium_spores": "Mycelium Spores",
"item.exdeorum.netherite_hammer": "Netherite Hammer",

3
src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View File

@ -6,6 +6,7 @@
"exdeorum:crystallized_barrel",
"exdeorum:crystallized_crucible",
"exdeorum:crystallized_sieve",
"exdeorum:mechanical_sieve"
"exdeorum:mechanical_sieve",
"exdeorum:mechanical_hammer"
]
}

10
src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalHammerBlockEntity.java
View File

@ -102,19 +102,21 @@ public class MechanicalHammerBlockEntity extends AbstractMachineBlockEntity<Mech
if (!input.isEmpty()) {
if (canFitResultIntoOutput(input) != null) {
this.progress = 0;
this.level.setBlock(this.worldPosition, this.getBlockState().setValue(MechanicalHammerBlock.RUNNING, true), 3);
this.level.setBlock(this.worldPosition, getBlockState().setValue(MechanicalHammerBlock.RUNNING, true), 3);
return;
}
}
this.level.setBlock(this.worldPosition, this.getBlockState().setValue(MechanicalHammerBlock.RUNNING, false), 3);
if (getBlockState().getValue(MechanicalHammerBlock.RUNNING)) {
this.level.setBlock(this.worldPosition, getBlockState().setValue(MechanicalHammerBlock.RUNNING, false), 3);
}
}
@Override
protected void noEnergyTick() {
if (getBlockState().getValue(MechanicalHammerBlock.RUNNING)) {
this.level.setBlock(this.worldPosition, this.getBlockState().setValue(MechanicalHammerBlock.RUNNING, false), 3);
this.level.setBlock(this.worldPosition, getBlockState().setValue(MechanicalHammerBlock.RUNNING, false), 3);
}
}
@ -142,7 +144,7 @@ public class MechanicalHammerBlockEntity extends AbstractMachineBlockEntity<Mech
var input = this.inventory.getStackInSlot(INPUT_SLOT);
if (!input.isEmpty()) {
this.progress += PROGRESS_INTERVAL * this.efficiency;
this.progress += (int) (PROGRESS_INTERVAL * this.efficiency);
if (this.progress >= TOTAL_PROGRESS) {
var recipe = canFitResultIntoOutput(input);