From db861fbe41729e37bac5eee00a8da120f87ed794 Mon Sep 17 00:00:00 2001
From: Pajang Forever <2548531078@qq.com>
Date: Mon, 12 Aug 2024 15:40:29 +0800
Subject: [PATCH] fix bugs
---
README.md | 11 ++--
.../4262057b8779fb25c4cac9d13a34a6930959ceea | 2 +-
.../65c8ec559d9c1880e18cf2013c184a16891053be | 6 +--
.../b19608dfb26cef311b91df9f5083f2e813750300 | 2 +-
.../c614eda209660f353f4b7eb172e89b6c05cd7b13 | 3 +-
.../cd6f0dde94593cb508072d9b97eb00f7ec70e3fb | 2 +-
.../dd87738999f3bb1675e2be9fb881d169bffebd5c | 4 +-
.../f682279c74c7c3d2be5a07eac83db3a0c872a245 | 2 +-
.../feeff468034db142ef86654d9c84df1eedef578f | 42 +++++++--------
.../minecraft/tags/block/wooden_fences.json | 5 --
.../synchro/mod_data/cow_working_feed.json | 34 ++++++-------
.../synchro/dataGeneration/BlockTagsData.java | 1 -
.../employment/AbstractWorkingHandler.java | 16 ++++--
.../synchro/employment/CowWorkingHandler.java | 4 +-
.../name/synchro/entities/DuckEntity.java | 21 +++++---
.../mixin/accessor/MobEntityAccessor.java | 15 ++++++
.../BigDripleafBlockMixin.java | 2 +-
.../BubbleColumnBlockMixin.java | 2 +-
.../BucketItemMixin.java | 2 +-
...ictedNeighborUpdater$SimpleEntryMixin.java | 5 +-
...ictedNeighborUpdater$SixWayEntryMixin.java | 5 +-
.../ChunkHolderMixin.java | 2 +-
.../ChunkSectionMixin.java | 2 +-
.../ChunkSerializerMixin.java | 6 +--
.../ConcretePowderBlockMixin.java | 2 +-
.../EndermanEntityMixin.java | 2 +-
.../FilledMapItemMixin.java | 2 +-
.../FishingBobberEntityMixin.java | 2 +-
.../FlowableFluidMixin.java | 2 +-
.../FluidBlockMixin.java | 2 +-
.../LandPathNodeMakerMixin.java | 2 +-
.../LavaFluidMixin.java | 2 +-
.../PatrolSpawnerMixin.java | 2 +-
.../PointedDripstoneBlockMixin.java | 2 +-
.../ServerWorldMixin.java | 2 +-
.../SimpleNeighborUpdaterMixin.java | 2 +-
.../SpawnLocatingMixin.java | 2 +-
.../SpongeBlockMixin.java | 2 +-
.../SpreadableBlockMixin.java | 2 +-
.../StriderEntityMixin.java | 2 +-
.../TallBlockItemMixin.java | 2 +-
.../WorldChunkMixin.java | 2 +-
.../WorldMixin.java | 2 +-
.../WorldViewMixin.java | 2 +-
src/main/resources/synchro.accesswidener | 8 ---
src/main/resources/synchro.mixins.json | 51 ++++++++++---------
46 files changed, 154 insertions(+), 141 deletions(-)
delete mode 100644 src/main/generated/data/minecraft/tags/block/wooden_fences.json
create mode 100644 src/main/java/name/synchro/mixin/accessor/MobEntityAccessor.java
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/BigDripleafBlockMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/BubbleColumnBlockMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/BucketItemMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java (87%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java (87%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ChunkHolderMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ChunkSectionMixin.java (99%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ChunkSerializerMixin.java (91%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ConcretePowderBlockMixin.java (97%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/EndermanEntityMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/FilledMapItemMixin.java (97%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/FishingBobberEntityMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/FlowableFluidMixin.java (99%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/FluidBlockMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/LandPathNodeMakerMixin.java (97%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/LavaFluidMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/PatrolSpawnerMixin.java (95%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/PointedDripstoneBlockMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/ServerWorldMixin.java (97%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/SimpleNeighborUpdaterMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/SpawnLocatingMixin.java (96%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/SpongeBlockMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/SpreadableBlockMixin.java (95%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/StriderEntityMixin.java (95%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/TallBlockItemMixin.java (94%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/WorldChunkMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/WorldMixin.java (98%)
rename src/main/java/name/synchro/mixin/{FluidConcerned => fluidConcerned}/WorldViewMixin.java (96%)
diff --git a/README.md b/README.md
index fc37523..496b2ea 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-This mod is in development and waiting for good news!
-Supporting Minecraft versions: 1.21
-模组开发中，敬请期待！
-支持的Minecraft版本：1.21
+# This mod is in development and waiting for good news!
+
+## Supporting Minecraft versions: 1.21
+
+# 模组开发中，敬请期待！
+
+## 支持的Minecraft版本：1.21
diff --git a/src/main/generated/.cache/4262057b8779fb25c4cac9d13a34a6930959ceea b/src/main/generated/.cache/4262057b8779fb25c4cac9d13a34a6930959ceea
index 06477f4..10b65e9 100644
--- a/src/main/generated/.cache/4262057b8779fb25c4cac9d13a34a6930959ceea
+++ b/src/main/generated/.cache/4262057b8779fb25c4cac9d13a34a6930959ceea
@@ -1,2 +1,2 @@
-// 1.21 2024-08-11T00:41:36.5734513 Synchro/Tags for minecraft:item
+// 1.21 2024-08-12T12:44:54.3460108 Synchro/Tags for minecraft:item
9e8498b1869e3fe2baf0b5f1828a31c1521a21a1 data\synchro\tags\item\raw_metal_ore.json
diff --git a/src/main/generated/.cache/65c8ec559d9c1880e18cf2013c184a16891053be b/src/main/generated/.cache/65c8ec559d9c1880e18cf2013c184a16891053be
index 240a00a..45fa356 100644
--- a/src/main/generated/.cache/65c8ec559d9c1880e18cf2013c184a16891053be
+++ b/src/main/generated/.cache/65c8ec559d9c1880e18cf2013c184a16891053be
@@ -1,4 +1,4 @@
-// 1.21 2024-08-11T00:41:36.5694657 Synchro/Block Loot Tables
+// 1.21 2024-08-12T12:44:54.3400281 Synchro/Block Loot Tables
054d63d74583c860ecbce5c3e25e83f33c7bfc05 data\synchro\loot_table\blocks\mossy_stone_bricks_slope.json
fa4a43902a8ceebb24a519f6afa095e5d1631667 data\synchro\loot_table\blocks\quartz_block_slope.json
18951f1b6b056928c3fa310acbdd7ed3d1130167 data\synchro\loot_table\blocks\sandstone_slope.json
@@ -12,8 +12,8 @@ ab7f8d04b79af453895804dd5e1d3b09a7297cc8 data\synchro\loot_table\blocks\birch_pl
1989ed13aba3836e4b99931cda58db62ee6bbdcb data\synchro\loot_table\blocks\polished_deepslate_slope.json
7811d8ce712661a87495c32d331f517edef6ab77 data\synchro\loot_table\blocks\cobblestone_slope.json
7dd739c81ac1db7f319d62616c4411679fe66b6e data\synchro\loot_table\blocks\fertile_farmland.json
-697369bd707d43b014171f920476860548b70e68 data\synchro\loot_table\blocks\polished_andesite_slope.json
78fdd3991dd064a07375f88c65e6e5146c44e944 data\synchro\loot_table\blocks\cobbled_deepslate_slope.json
+697369bd707d43b014171f920476860548b70e68 data\synchro\loot_table\blocks\polished_andesite_slope.json
3ea0a67d52878104c83a774d1ff6d9b4d9620380 data\synchro\loot_table\blocks\banana_block.json
1c639d95147f300201abe3552f1b6b921444ccef data\synchro\loot_table\blocks\polished_granite_slope.json
ace7670998913479968e30814b70f5e2ac7be95e data\synchro\loot_table\blocks\burnt_charcoal_fence.json
@@ -26,8 +26,8 @@ ddaa09b4c66f6c204392d7a9952cf0e36ebb3694 data\synchro\loot_table\blocks\prismari
13dbbc1895e286a7d8bdf1a9bd76c0d35174be95 data\synchro\loot_table\blocks\tuff_slope.json
ae2b130f62c653577965bcadb54f87dc1fdd86fc data\synchro\loot_table\blocks\crimson_planks_slope.json
4cae6e7bc36d51fbcce5bd2085f9aae78eae2aa8 data\synchro\loot_table\blocks\blackstone_slope.json
-e218e2038d5fb9c410a2ce3b89eddd79c6f5984d data\synchro\loot_table\blocks\smooth_sandstone_slope.json
b7f4386a1a304692b8c19b323894953b5f155705 data\synchro\loot_table\blocks\waxed_weathered_cut_copper_slope.json
+e218e2038d5fb9c410a2ce3b89eddd79c6f5984d data\synchro\loot_table\blocks\smooth_sandstone_slope.json
09ba4bbe32f8cad5c9635f86a085f86f8d84267e data\synchro\loot_table\blocks\waxed_cut_copper_slope.json
86f9473a8391272376d2870491bea35f169abc4e data\synchro\loot_table\blocks\andesite_slope.json
9b99aa0b4da32ac9ccb2b54b07b06a70a0c94784 data\synchro\loot_table\blocks\burnt_charcoal_block.json
diff --git a/src/main/generated/.cache/b19608dfb26cef311b91df9f5083f2e813750300 b/src/main/generated/.cache/b19608dfb26cef311b91df9f5083f2e813750300
index 5e06d58..3fda7e1 100644
--- a/src/main/generated/.cache/b19608dfb26cef311b91df9f5083f2e813750300
+++ b/src/main/generated/.cache/b19608dfb26cef311b91df9f5083f2e813750300
@@ -1,4 +1,4 @@
-// 1.21 2024-08-11T00:41:36.5714581 Synchro/Recipes
+// 1.21 2024-08-12T12:44:54.3420214 Synchro/Recipes
3903878af32a060219d9518f07ca7ab2ab575320 data\synchro\recipe\plant_fibre_from_its_block.json
456f5f64c7c195c52de5db3aaf2a9bdf363e858b data\synchro\advancement\recipes\building_blocks\mud_from_dirt.json
ea214a8398c2910fbb28c997bb3d7e52d49b3aaf data\synchro\recipe\millstone\dust_from_ores.json
diff --git a/src/main/generated/.cache/c614eda209660f353f4b7eb172e89b6c05cd7b13 b/src/main/generated/.cache/c614eda209660f353f4b7eb172e89b6c05cd7b13
index dde4d8b..de11525 100644
--- a/src/main/generated/.cache/c614eda209660f353f4b7eb172e89b6c05cd7b13
+++ b/src/main/generated/.cache/c614eda209660f353f4b7eb172e89b6c05cd7b13
@@ -1,8 +1,7 @@
-// 1.21 2024-08-11T00:41:36.5714581 Synchro/Tags for minecraft:block
+// 1.21 2024-08-12T12:44:54.3420214 Synchro/Tags for minecraft:block
5d0d344873362cf2559dbffa06cd15d859bf0bb0 data\synchro\tags\block\destroy_in_water.json
784c3999787fc0a1f1aa02d684dcd5928e013112 data\synchro\tags\block\never_fill_fluid.json
4381e6cc2d89af641762c55e3073b20eb13b2888 data\synchro\tags\block\burn_away_in_lava.json
-42690d032aa61e621b33ad1cc3d480f8c4cfd263 data\minecraft\tags\block\wooden_fences.json
42690d032aa61e621b33ad1cc3d480f8c4cfd263 data\minecraft\tags\block\fences.json
239d482467cea98ee764f8acca7d6720b2021875 data\synchro\tags\block\wash_away_by_water.json
98d367028944f144308cfc0ce205e9aa9993258c data\synchro\tags\block\can_store_fluid.json
diff --git a/src/main/generated/.cache/cd6f0dde94593cb508072d9b97eb00f7ec70e3fb b/src/main/generated/.cache/cd6f0dde94593cb508072d9b97eb00f7ec70e3fb
index b480032..7010500 100644
--- a/src/main/generated/.cache/cd6f0dde94593cb508072d9b97eb00f7ec70e3fb
+++ b/src/main/generated/.cache/cd6f0dde94593cb508072d9b97eb00f7ec70e3fb
@@ -1,2 +1,2 @@
-// 1.21 2024-08-11T00:41:36.5724554 Synchro/Advancements
+// 1.21 2024-08-12T12:44:54.343018 Synchro/Advancements
64a5107de59bddcd6fe9fd2b61e804e465544134 data\minecraft\advancement\synchro\root.json
diff --git a/src/main/generated/.cache/dd87738999f3bb1675e2be9fb881d169bffebd5c b/src/main/generated/.cache/dd87738999f3bb1675e2be9fb881d169bffebd5c
index dc06a5d..98d7c79 100644
--- a/src/main/generated/.cache/dd87738999f3bb1675e2be9fb881d169bffebd5c
+++ b/src/main/generated/.cache/dd87738999f3bb1675e2be9fb881d169bffebd5c
@@ -1,2 +1,2 @@
-// 1.21 2024-08-11T00:41:36.5724554 Synchro/Cow Feeds Data
-b4189b2d255a0ceb9e82886d42fb16d71207a688 data\synchro\mod_data\cow_working_feed.json
+// 1.21 2024-08-12T12:44:54.3460108 Synchro/Cow Feeds Data
+2393a78c692c9ad75b8011fca3aac722be012e99 data\synchro\mod_data\cow_working_feed.json
diff --git a/src/main/generated/.cache/f682279c74c7c3d2be5a07eac83db3a0c872a245 b/src/main/generated/.cache/f682279c74c7c3d2be5a07eac83db3a0c872a245
index d27cd6e..f31cc82 100644
--- a/src/main/generated/.cache/f682279c74c7c3d2be5a07eac83db3a0c872a245
+++ b/src/main/generated/.cache/f682279c74c7c3d2be5a07eac83db3a0c872a245
@@ -1,4 +1,4 @@
-// 1.21 2024-08-11T00:41:36.5724554 Synchro/synchroData
+// 1.21 2024-08-12T12:44:54.343018 Synchro/synchroData
d3a1f326b081df2fa4119a1427f753c0bc1b1b34 data\synchro\synchro\fluid_reaction\burn_wooden_slab_up_flowing.json
ef0396dee7e3d09c9d07e65f27fc4ce85566c3a4 data\synchro\synchro\fluid_reaction\burn_wooden_slab_down_flowing.json
022276e2710f22880b1c4308b831683771f97c05 data\synchro\synchro\fluid_reaction\burn_wooden_stairs_still.json
diff --git a/src/main/generated/.cache/feeff468034db142ef86654d9c84df1eedef578f b/src/main/generated/.cache/feeff468034db142ef86654d9c84df1eedef578f
index 0973613..b410cfa 100644
--- a/src/main/generated/.cache/feeff468034db142ef86654d9c84df1eedef578f
+++ b/src/main/generated/.cache/feeff468034db142ef86654d9c84df1eedef578f
@@ -1,49 +1,49 @@
-// 1.21 2024-08-11T00:41:36.5734513 Synchro/Model Definitions
+// 1.21 2024-08-12T12:44:54.3460108 Synchro/Model Definitions
c40b07d13e4f0b342af6d34af9177c2cf6503231 assets\synchro\blockstates\burnt_charcoal_block.json
-bb695a56f4541ba24d6a479c5bdf3af362c8a67b assets\synchro\models\item\burnt_charcoal_pressure_plate.json
28eccda560f50181b3c073503f8cff4e47ff1e6e assets\synchro\blockstates\sekite.json
dc4d213060ebb22a25c50ab3e9279fb44984ad03 assets\synchro\models\item\nganite.json
-98234352f7acfd711245f950de7362d310d6644a assets\synchro\models\block\midorite.json
-eab3311abad01fa28b7b81bb250b9b04b38aae88 assets\synchro\blockstates\baakite.json
-15f0de71508e986d78c5d8b4cdab65b8c952f9d2 assets\synchro\models\item\burnt_charcoal_slab.json
3992d7bf972479a3eb6e3e4715b0dc3d1f8e954f assets\synchro\models\item\baakite.json
83538b7871cfc21ce1bd47446949a3ecc646dfec assets\synchro\models\block\haakite.json
9235094b23019615918da670ba90217777f772bf assets\synchro\models\item\burnt_charcoal_stairs.json
-7de56d040612b1c6e18fc1164827c2d873b8f1ec assets\synchro\blockstates\nganite.json
-6c2866ba1e76a532c2c3b6d3eb01a72b33515116 assets\synchro\models\item\burnt_charcoal_fence.json
b871a7e8cdd429fad44d039f53c924177ad3496f assets\synchro\blockstates\plant_fibre_block.json
-6e0c859c24d6f4dbdde8a2345cde547d021558df assets\synchro\models\item\sekite.json
3c888c07069d41ae4273034e2f3043a86dd7f8fc assets\synchro\blockstates\gumite.json
f0f93f4d24b7c66a4246e3270985aa138620fd9f assets\synchro\models\block\burnt_charcoal_pressure_plate.json
-fdd243f56677b123edd7a14805ca3c618106b0bd assets\synchro\blockstates\midorite.json
47f0e1207ae4f6ec87363661b62aa0f560c8143e assets\synchro\models\item\haakite.json
+ea2ce540b4ee542136a4eea3e50177e70dcc59cd assets\synchro\blockstates\aoite.json
+da894802a99dbc2a878db69497c6bbffe73da958 assets\synchro\models\block\aoite.json
+b7d03ab547e154ee3613c9643fd31ff173a6434f assets\synchro\models\block\muraxkite.json
+b36bc73ebf965fa71384631c1ac78a5f7336d453 assets\synchro\models\block\burnt_charcoal_fence_post.json
+7984fbd22a5b73ce29f0c90b06dad34dd76a1486 assets\synchro\models\block\burnt_charcoal_pressure_plate_down.json
+07a09a4dd179cec70b238b5dab260f30a315d531 assets\synchro\models\block\burnt_charcoal_stairs_outer.json
+f2a560d04ce95ca1f62813f265c2c8cfb13d0306 assets\synchro\models\block\burnt_charcoal_fence_side.json
+b801428ce192beb95c938282128ea5f615eff627 assets\synchro\models\item\burnt_charcoal_block.json
+96d80539ae9775959e9870f8079a6243750996e3 assets\synchro\models\block\burnt_charcoal_block.json
+f83121e9cf2b6e67b822256b163c6a89ac7c9108 assets\synchro\blockstates\burnt_charcoal_stairs.json
+78fe4df87c78ce03af1f015a2f35f75acd0e73bb assets\synchro\models\block\plant_fibre_block.json
+4317e5e705f9fbdc9702c328c4514b01ccfda2e7 assets\synchro\models\item\aoite.json
+bb695a56f4541ba24d6a479c5bdf3af362c8a67b assets\synchro\models\item\burnt_charcoal_pressure_plate.json
+98234352f7acfd711245f950de7362d310d6644a assets\synchro\models\block\midorite.json
+15f0de71508e986d78c5d8b4cdab65b8c952f9d2 assets\synchro\models\item\burnt_charcoal_slab.json
+eab3311abad01fa28b7b81bb250b9b04b38aae88 assets\synchro\blockstates\baakite.json
+7de56d040612b1c6e18fc1164827c2d873b8f1ec assets\synchro\blockstates\nganite.json
+6c2866ba1e76a532c2c3b6d3eb01a72b33515116 assets\synchro\models\item\burnt_charcoal_fence.json
+6e0c859c24d6f4dbdde8a2345cde547d021558df assets\synchro\models\item\sekite.json
+fdd243f56677b123edd7a14805ca3c618106b0bd assets\synchro\blockstates\midorite.json
360d520a0fc6aede27d141c67fe05d97a0460ad0 assets\synchro\models\block\gumite.json
5a2503c78406dda342ed31db63db5d4e603ea96d assets\synchro\models\block\burnt_charcoal_slab_top.json
f32bdac3f221c681c592fbe87a4e4a8484f51c4d assets\synchro\blockstates\burnt_charcoal_pressure_plate.json
be205409658521f39226656def1e3bbecf795880 assets\synchro\blockstates\haakite.json
e1a941ad4094e3826f899288449899d1a9bb5e4d assets\synchro\models\block\burnt_charcoal_stairs.json
-ea2ce540b4ee542136a4eea3e50177e70dcc59cd assets\synchro\blockstates\aoite.json
7c909e52162638b59ad480d46dfd2953569e2c12 assets\synchro\blockstates\burnt_charcoal_fence.json
-da894802a99dbc2a878db69497c6bbffe73da958 assets\synchro\models\block\aoite.json
-b7d03ab547e154ee3613c9643fd31ff173a6434f assets\synchro\models\block\muraxkite.json
752395db47f690842f5a3e8cc2a3cba08c8b467d assets\synchro\models\item\plant_fibre_block.json
ccd6e8876ec85568dc7518348a4f7d27e0b0c6f5 assets\synchro\models\block\burnt_charcoal_slab.json
-b36bc73ebf965fa71384631c1ac78a5f7336d453 assets\synchro\models\block\burnt_charcoal_fence_post.json
1e211a45e9d1af29ce80579f74bc7be1f09273d8 assets\synchro\blockstates\muraxkite.json
f7d9884d7000be8a9b91214de467dd7cf6d57bb9 assets\synchro\blockstates\burnt_charcoal_slab.json
b695d80d46e48e8d76dd85f9fd40a27e5fe957c0 assets\synchro\models\block\baakite.json
-7984fbd22a5b73ce29f0c90b06dad34dd76a1486 assets\synchro\models\block\burnt_charcoal_pressure_plate_down.json
cb9b65e0716c49256db9ba5d6ebc037d40b25595 assets\synchro\models\item\muraxkite.json
-07a09a4dd179cec70b238b5dab260f30a315d531 assets\synchro\models\block\burnt_charcoal_stairs_outer.json
8993f61710bafbb2b5cbfabddd81ed9eae69c274 assets\synchro\models\block\nganite.json
-f2a560d04ce95ca1f62813f265c2c8cfb13d0306 assets\synchro\models\block\burnt_charcoal_fence_side.json
-b801428ce192beb95c938282128ea5f615eff627 assets\synchro\models\item\burnt_charcoal_block.json
-96d80539ae9775959e9870f8079a6243750996e3 assets\synchro\models\block\burnt_charcoal_block.json
184c6d2dc45c648b0cd696980147064080372c0a assets\synchro\models\block\sekite.json
-f83121e9cf2b6e67b822256b163c6a89ac7c9108 assets\synchro\blockstates\burnt_charcoal_stairs.json
77ccaf37fc401595e31a9be042cf539f5062648b assets\synchro\models\item\midorite.json
edaca2896b676e45ecec6bf076613423fbcf34d4 assets\synchro\models\block\burnt_charcoal_fence_inventory.json
-78fe4df87c78ce03af1f015a2f35f75acd0e73bb assets\synchro\models\block\plant_fibre_block.json
-4317e5e705f9fbdc9702c328c4514b01ccfda2e7 assets\synchro\models\item\aoite.json
faf011e968cdf07473d56a19a4bb51792ed2fa74 assets\synchro\models\block\burnt_charcoal_stairs_inner.json
a7869d2d2841272d4f620d771ac7b42263f96a9b assets\synchro\models\item\gumite.json
diff --git a/src/main/generated/data/minecraft/tags/block/wooden_fences.json b/src/main/generated/data/minecraft/tags/block/wooden_fences.json
deleted file mode 100644
index 847a764..0000000
--- a/src/main/generated/data/minecraft/tags/block/wooden_fences.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "values": [
- "synchro:burnt_charcoal_fence"
- ]
-}
\ No newline at end of file
diff --git a/src/main/generated/data/synchro/mod_data/cow_working_feed.json b/src/main/generated/data/synchro/mod_data/cow_working_feed.json
index 6b9a778..2fa452f 100644
--- a/src/main/generated/data/synchro/mod_data/cow_working_feed.json
+++ b/src/main/generated/data/synchro/mod_data/cow_working_feed.json
@@ -1,4 +1,18 @@
[
+ {
+ "items": [
+ {
+ "item": "minecraft:cake"
+ },
+ {
+ "item": "minecraft:hay_block"
+ },
+ {
+ "item": "minecraft:enchanted_golden_apple"
+ }
+ ],
+ "time": 7600
+ },
{
"items": {
"tag": "minecraft:cow_food"
@@ -19,16 +33,13 @@
{
"items": [
{
- "item": "minecraft:cake"
- },
- {
- "item": "minecraft:hay_block"
+ "item": "minecraft:short_grass"
},
{
- "item": "minecraft:enchanted_golden_apple"
+ "item": "minecraft:fern"
}
],
- "time": 7600
+ "time": 300
},
{
"items": [
@@ -40,16 +51,5 @@
}
],
"time": 300
- },
- {
- "items": [
- {
- "item": "minecraft:short_grass"
- },
- {
- "item": "minecraft:fern"
- }
- ],
- "time": 300
}
]
\ No newline at end of file
diff --git a/src/main/java/name/synchro/dataGeneration/BlockTagsData.java b/src/main/java/name/synchro/dataGeneration/BlockTagsData.java
index d77b9c5..dd345cf 100644
--- a/src/main/java/name/synchro/dataGeneration/BlockTagsData.java
+++ b/src/main/java/name/synchro/dataGeneration/BlockTagsData.java
@@ -77,6 +77,5 @@ private static void addUnstableBurnables(FabricTagBuilder builder){
private void extendVanillaTags(){
getOrCreateTagBuilder(BlockTags.FENCES).add(ModBlocks.BURNT_CHARCOAL_FENCE);
- getOrCreateTagBuilder(BlockTags.WOODEN_FENCES).add(ModBlocks.BURNT_CHARCOAL_FENCE);
}
}
diff --git a/src/main/java/name/synchro/employment/AbstractWorkingHandler.java b/src/main/java/name/synchro/employment/AbstractWorkingHandler.java
index 3118a6a..775349b 100644
--- a/src/main/java/name/synchro/employment/AbstractWorkingHandler.java
+++ b/src/main/java/name/synchro/employment/AbstractWorkingHandler.java
@@ -1,10 +1,12 @@
package name.synchro.employment;
import name.synchro.Synchro;
+import name.synchro.mixin.accessor.MobEntityAccessor;
import name.synchro.util.NbtTags;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.ai.goal.Goal;
+import net.minecraft.entity.ai.goal.GoalSelector;
import net.minecraft.entity.mob.MobEntity;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.util.math.BlockPos;
@@ -32,9 +34,9 @@ public void setEmploymentFromNbt(NbtCompound nbt, World world) {
BlockPos blockPos = BlockPos.fromLong(nbt.getLong(NbtTags.TYPE_BLOCK));
BlockEntity blockEntity = world.getBlockEntity(blockPos);
if (blockEntity instanceof Employer blockEmployer) this.setEmployer(blockEmployer);
- else Synchro.LOGGER.warn("Cannot identify a BlockEntity as an employer at " + blockPos);
+ else Synchro.LOGGER.warn("Cannot identify a BlockEntity as an employer at {}", blockPos);
} else if (nbt.contains(NbtTags.TYPE_ENTITY)) {
- Synchro.LOGGER.warn("Uncompleted feature: Entity as an employer");
+ Synchro.LOGGER.warn("Uncompleted feature at setEmploymentFromNbt: Entity as an employer");
} else this.employer = null;
this.workableTime = nbt.getInt(NbtTags.WORKABLE_TIME);
}
@@ -46,7 +48,7 @@ public NbtCompound getEmploymentNbt() {
nbt.putLong(NbtTags.TYPE_BLOCK, blockEntity.getPos().asLong());
}
else if (this.employer instanceof Entity){
- Synchro.LOGGER.warn("Uncompleted feature: Entity as an employer");
+ Synchro.LOGGER.warn("Uncompleted feature at getEmploymentNbt: Entity as an employer");
}
else Synchro.LOGGER.warn("Unacceptable employer type");
nbt.putInt(NbtTags.WORKABLE_TIME, this.workableTime);
@@ -72,7 +74,7 @@ public boolean join(Employer employer) {
private void setEmployer(Employer employer){
this.employer = employer;
for (Goal goal : this.availableJob().working.getGoals(this.mob)) {
- this.mob.goalSelector.add(this.workingGoalPriority(), goal);
+ goalSelector().add(this.workingGoalPriority(), goal);
}
}
@@ -81,12 +83,16 @@ public void leave() {
if (this.employer != null) {
this.employer.getWorkerManager().removeEmployee(this.mob.getUuid());
for (Goal goal : this.availableJob().working.getGoals(this.mob)) {
- this.mob.goalSelector.remove(goal);
+ goalSelector().remove(goal);
}
this.employer = null;
}
}
+ protected GoalSelector goalSelector() {
+ return ((MobEntityAccessor) this.mob).getGoalSelector();
+ }
+
public boolean willingToWork(){
return true;
}
diff --git a/src/main/java/name/synchro/employment/CowWorkingHandler.java b/src/main/java/name/synchro/employment/CowWorkingHandler.java
index 27d1f92..d12097c 100644
--- a/src/main/java/name/synchro/employment/CowWorkingHandler.java
+++ b/src/main/java/name/synchro/employment/CowWorkingHandler.java
@@ -30,7 +30,7 @@ public void leave() {
if (this.getEmployer() != null) {
this.getEmployer().getWorkerManager().removeEmployee(this.mob.getUuid());
Set toRemoveGoals = new HashSet<>();
- for (PrioritizedGoal prioritizedGoal : this.mob.goalSelector.getGoals()) {
+ for (PrioritizedGoal prioritizedGoal : goalSelector().getGoals()) {
Goal goal = prioritizedGoal.getGoal();
if (goal instanceof PushMillstoneGoal pushMillstoneGoal) {
pushMillstoneGoal.tryRelease((MillstoneBlockEntity) (this.getEmployer()));
@@ -40,7 +40,7 @@ else if (goal instanceof KeepInWorkingAreaGoal) {
toRemoveGoals.add(goal);
}
}
- toRemoveGoals.forEach(this.mob.goalSelector::remove);
+ toRemoveGoals.forEach(goalSelector()::remove);
this.employer = null;
}
}
diff --git a/src/main/java/name/synchro/entities/DuckEntity.java b/src/main/java/name/synchro/entities/DuckEntity.java
index 8ae9cef..feaa960 100644
--- a/src/main/java/name/synchro/entities/DuckEntity.java
+++ b/src/main/java/name/synchro/entities/DuckEntity.java
@@ -1,5 +1,6 @@
package name.synchro.entities;
+import name.synchro.mixin.accessor.MobEntityAccessor;
import name.synchro.registrations.ModEntities;
import net.minecraft.block.BlockState;
import net.minecraft.entity.EntityType;
@@ -24,14 +25,18 @@ public DuckEntity(EntityType entityType, World world) {
@Override
protected void initGoals() {
- this.goalSelector.add(0, new SwimGoal(this));
- this.goalSelector.add(1, new EscapeDangerGoal(this, 1.4));
- this.goalSelector.add(2, new AnimalMateGoal(this, 1.0));
- this.goalSelector.add(3, new TemptGoal(this, 1.0, this::isBreedingItem, false));
- this.goalSelector.add(4, new FollowParentGoal(this, 1.1));
- this.goalSelector.add(5, new WanderAroundFarGoal(this, 1.0));
- this.goalSelector.add(6, new LookAtEntityGoal(this, PlayerEntity.class, 6.0f));
- this.goalSelector.add(7, new LookAroundGoal(this));
+ goalSelector().add(0, new SwimGoal(this));
+ goalSelector().add(1, new EscapeDangerGoal(this, 1.4));
+ goalSelector().add(2, new AnimalMateGoal(this, 1.0));
+ goalSelector().add(3, new TemptGoal(this, 1.0, this::isBreedingItem, false));
+ goalSelector().add(4, new FollowParentGoal(this, 1.1));
+ goalSelector().add(5, new WanderAroundFarGoal(this, 1.0));
+ goalSelector().add(6, new LookAtEntityGoal(this, PlayerEntity.class, 6.0f));
+ goalSelector().add(7, new LookAroundGoal(this));
+ }
+
+ private GoalSelector goalSelector() {
+ return ((MobEntityAccessor) this).getGoalSelector();
}
@Override
diff --git a/src/main/java/name/synchro/mixin/accessor/MobEntityAccessor.java b/src/main/java/name/synchro/mixin/accessor/MobEntityAccessor.java
new file mode 100644
index 0000000..2e76549
--- /dev/null
+++ b/src/main/java/name/synchro/mixin/accessor/MobEntityAccessor.java
@@ -0,0 +1,15 @@
+package name.synchro.mixin.accessor;
+
+import net.minecraft.entity.ai.goal.GoalSelector;
+import net.minecraft.entity.mob.MobEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(MobEntity.class)
+public interface MobEntityAccessor {
+ @Accessor("goalSelector")
+ GoalSelector getGoalSelector();
+
+ @Accessor("targetSelector")
+ GoalSelector getTargetSelector();
+}
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/BigDripleafBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/BigDripleafBlockMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/BigDripleafBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/BigDripleafBlockMixin.java
index 4838058..ef92be1 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/BigDripleafBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/BigDripleafBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/BubbleColumnBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/BubbleColumnBlockMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/BubbleColumnBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/BubbleColumnBlockMixin.java
index 1ae1625..6765ca3 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/BubbleColumnBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/BubbleColumnBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/BucketItemMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/BucketItemMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/BucketItemMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/BucketItemMixin.java
index c8ecf57..0568163 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/BucketItemMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/BucketItemMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.sugar.Local;
import name.synchro.fluids.FluidHelper;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java
similarity index 87%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java
index 44b9f00..d3647dd 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SimpleEntryMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -6,11 +6,10 @@
import net.minecraft.fluid.FluidState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
-import net.minecraft.world.block.ChainRestrictedNeighborUpdater;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
-@Mixin(ChainRestrictedNeighborUpdater.SimpleEntry.class)
+@Mixin(targets = "net.minecraft.world.block.ChainRestrictedNeighborUpdater$SimpleEntry")
public class ChainRestrictedNeighborUpdater$SimpleEntryMixin {
@WrapOperation(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"))
private BlockState addPotentialFluidUpdate(World world, BlockPos pos, Operation original) {
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java
similarity index 87%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java
index d49594e..b608aa5 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ChainRestrictedNeighborUpdater$SixWayEntryMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -6,11 +6,10 @@
import net.minecraft.fluid.FluidState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
-import net.minecraft.world.block.ChainRestrictedNeighborUpdater;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
-@Mixin(ChainRestrictedNeighborUpdater.SixWayEntry.class)
+@Mixin(targets = "net.minecraft.world.block.ChainRestrictedNeighborUpdater$SixWayEntry")
public class ChainRestrictedNeighborUpdater$SixWayEntryMixin {
@WrapOperation(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"))
private BlockState addPotentialFluidUpdate(World world, BlockPos pos, Operation original) {
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkHolderMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkHolderMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ChunkHolderMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ChunkHolderMixin.java
index 43564c2..c5b9cee 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkHolderMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkHolderMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.sugar.Local;
import it.unimi.dsi.fastutil.shorts.ShortSet;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkSectionMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkSectionMixin.java
similarity index 99%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ChunkSectionMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ChunkSectionMixin.java
index 8359121..cb1cc4e 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkSectionMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkSectionMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import name.synchro.fluids.FluidHelper;
import name.synchro.fluids.FluidUtil;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkSerializerMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkSerializerMixin.java
similarity index 91%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ChunkSerializerMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ChunkSerializerMixin.java
index 30179b2..bac2e08 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ChunkSerializerMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ChunkSerializerMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -43,8 +43,8 @@ private static void modifyNewChunkSection(ChunkSection chunkSection, NbtCompound
}
@Inject(method = "serialize", at = @At(value = "INVOKE",
- target = "Lcom/mojang/serialization/Codec;encodeStart(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
- ordinal = 3, shift = At.Shift.BEFORE))
+ target = "Lnet/minecraft/nbt/NbtCompound;put(Ljava/lang/String;Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/nbt/NbtElement;",
+ ordinal = 2))
private static void serializeFluidStatePaletteContainer(
ServerWorld world, Chunk chunk, CallbackInfoReturnable cir,
@Local ChunkSection chunkSection, @Local(ordinal = 1) NbtCompound nbtCompound){
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ConcretePowderBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ConcretePowderBlockMixin.java
similarity index 97%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ConcretePowderBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ConcretePowderBlockMixin.java
index b8cddbd..501e062 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ConcretePowderBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ConcretePowderBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/EndermanEntityMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/EndermanEntityMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/EndermanEntityMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/EndermanEntityMixin.java
index f1926cd..d29e8f6 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/EndermanEntityMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/EndermanEntityMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/FilledMapItemMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/FilledMapItemMixin.java
similarity index 97%
rename from src/main/java/name/synchro/mixin/FluidConcerned/FilledMapItemMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/FilledMapItemMixin.java
index cab73c4..32f5fae 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/FilledMapItemMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/FilledMapItemMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/FishingBobberEntityMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/FishingBobberEntityMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/FishingBobberEntityMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/FishingBobberEntityMixin.java
index 47ddc2a..98fb248 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/FishingBobberEntityMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/FishingBobberEntityMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/FlowableFluidMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/FlowableFluidMixin.java
similarity index 99%
rename from src/main/java/name/synchro/mixin/FluidConcerned/FlowableFluidMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/FlowableFluidMixin.java
index 1d8aa18..a6b497c 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/FlowableFluidMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/FlowableFluidMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/FluidBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/FluidBlockMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/FluidBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/FluidBlockMixin.java
index fb0bb1a..b4055d3 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/FluidBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/FluidBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/LandPathNodeMakerMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/LandPathNodeMakerMixin.java
similarity index 97%
rename from src/main/java/name/synchro/mixin/FluidConcerned/LandPathNodeMakerMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/LandPathNodeMakerMixin.java
index 76ffd54..e66d90e 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/LandPathNodeMakerMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/LandPathNodeMakerMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/LavaFluidMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/LavaFluidMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/LavaFluidMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/LavaFluidMixin.java
index cc58fbf..26b5c83 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/LavaFluidMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/LavaFluidMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/PatrolSpawnerMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/PatrolSpawnerMixin.java
similarity index 95%
rename from src/main/java/name/synchro/mixin/FluidConcerned/PatrolSpawnerMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/PatrolSpawnerMixin.java
index 0b36b56..cea7023 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/PatrolSpawnerMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/PatrolSpawnerMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/PointedDripstoneBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/PointedDripstoneBlockMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/PointedDripstoneBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/PointedDripstoneBlockMixin.java
index 2f57550..e93dfa3 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/PointedDripstoneBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/PointedDripstoneBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/ServerWorldMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/ServerWorldMixin.java
similarity index 97%
rename from src/main/java/name/synchro/mixin/FluidConcerned/ServerWorldMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/ServerWorldMixin.java
index 6b52caa..12773f0 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/ServerWorldMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/ServerWorldMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/SimpleNeighborUpdaterMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/SimpleNeighborUpdaterMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/SimpleNeighborUpdaterMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/SimpleNeighborUpdaterMixin.java
index cdd1d63..b8cf899 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/SimpleNeighborUpdaterMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/SimpleNeighborUpdaterMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/SpawnLocatingMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/SpawnLocatingMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/SpawnLocatingMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/SpawnLocatingMixin.java
index 1621733..be3d99e 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/SpawnLocatingMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/SpawnLocatingMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/SpongeBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/SpongeBlockMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/SpongeBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/SpongeBlockMixin.java
index 02eeb95..123eea8 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/SpongeBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/SpongeBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import name.synchro.fluids.FluidHelper;
import net.minecraft.block.Block;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/SpreadableBlockMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/SpreadableBlockMixin.java
similarity index 95%
rename from src/main/java/name/synchro/mixin/FluidConcerned/SpreadableBlockMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/SpreadableBlockMixin.java
index bb8871d..7578a87 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/SpreadableBlockMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/SpreadableBlockMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/StriderEntityMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/StriderEntityMixin.java
similarity index 95%
rename from src/main/java/name/synchro/mixin/FluidConcerned/StriderEntityMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/StriderEntityMixin.java
index 1871a63..3a58e8e 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/StriderEntityMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/StriderEntityMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/TallBlockItemMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/TallBlockItemMixin.java
similarity index 94%
rename from src/main/java/name/synchro/mixin/FluidConcerned/TallBlockItemMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/TallBlockItemMixin.java
index b4e7371..983cefc 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/TallBlockItemMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/TallBlockItemMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/WorldChunkMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/WorldChunkMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/WorldChunkMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/WorldChunkMixin.java
index 011b827..f6ffb85 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/WorldChunkMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/WorldChunkMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/WorldMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/WorldMixin.java
similarity index 98%
rename from src/main/java/name/synchro/mixin/FluidConcerned/WorldMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/WorldMixin.java
index 7c3750b..defaadc 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/WorldMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/WorldMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import name.synchro.fluids.FluidHelper;
import name.synchro.fluids.FluidUtil;
diff --git a/src/main/java/name/synchro/mixin/FluidConcerned/WorldViewMixin.java b/src/main/java/name/synchro/mixin/fluidConcerned/WorldViewMixin.java
similarity index 96%
rename from src/main/java/name/synchro/mixin/FluidConcerned/WorldViewMixin.java
rename to src/main/java/name/synchro/mixin/fluidConcerned/WorldViewMixin.java
index 107f8ce..5fa64ea 100644
--- a/src/main/java/name/synchro/mixin/FluidConcerned/WorldViewMixin.java
+++ b/src/main/java/name/synchro/mixin/fluidConcerned/WorldViewMixin.java
@@ -1,4 +1,4 @@
-package name.synchro.mixin.FluidConcerned;
+package name.synchro.mixin.fluidConcerned;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/resources/synchro.accesswidener b/src/main/resources/synchro.accesswidener
index 57bbcda..8a79359 100644
--- a/src/main/resources/synchro.accesswidener
+++ b/src/main/resources/synchro.accesswidener
@@ -1,19 +1,11 @@
accessWidener v1 named
-accessible class net/minecraft/client/render/BackgroundRenderer$FogData
accessible class net/minecraft/client/gui/hud/InGameHud$HeartType
accessible method net/minecraft/client/gui/hud/InGameHud$HeartType fromPlayerState (Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/client/gui/hud/InGameHud$HeartType;
accessible field net/minecraft/client/render/model/json/JsonUnbakedModel textureMap Ljava/util/Map;
accessible field net/minecraft/client/render/model/json/JsonUnbakedModel parentId Lnet/minecraft/util/Identifier;
-accessible field net/minecraft/entity/mob/MobEntity goalSelector Lnet/minecraft/entity/ai/goal/GoalSelector;
-accessible field net/minecraft/entity/mob/MobEntity targetSelector Lnet/minecraft/entity/ai/goal/GoalSelector;
-accessible class net/minecraft/world/chunk/PalettedContainer$DataProvider
-accessible class net/minecraft/world/chunk/PalettedContainer$Data
accessible method net/minecraft/world/chunk/PalettedContainer$PaletteProvider (I)V
accessible class net/minecraft/client/render/chunk/ChunkBuilder$BuiltChunk$RebuildTask
accessible class net/minecraft/client/render/chunk/RenderedChunk
-accessible field net/minecraft/world/ChunkSerializer BLOCK_TICKS Ljava/lang/String;
-accessible class net/minecraft/world/block/ChainRestrictedNeighborUpdater$SimpleEntry
-accessible class net/minecraft/world/block/ChainRestrictedNeighborUpdater$SixWayEntry
accessible class net/minecraft/predicate/StatePredicate$Condition
accessible method net/minecraft/predicate/StatePredicate$Condition (Ljava/lang/String;Lnet/minecraft/predicate/StatePredicate$ValueMatcher;)V
accessible class net/minecraft/predicate/StatePredicate$ValueMatcher
diff --git a/src/main/resources/synchro.mixins.json b/src/main/resources/synchro.mixins.json
index b51ddec..571eade 100644
--- a/src/main/resources/synchro.mixins.json
+++ b/src/main/resources/synchro.mixins.json
@@ -22,31 +22,32 @@
"SlotMixin",
"SnowballEntityMixin",
"WorldMixin",
- "FluidConcerned.BucketItemMixin",
- "FluidConcerned.ChainRestrictedNeighborUpdater$SimpleEntryMixin",
- "FluidConcerned.ChainRestrictedNeighborUpdater$SixWayEntryMixin",
- "FluidConcerned.ChunkHolderMixin",
- "FluidConcerned.ChunkSectionMixin",
- "FluidConcerned.ChunkSerializerMixin",
- "FluidConcerned.ConcretePowderBlockMixin",
- "FluidConcerned.EndermanEntityMixin",
- "FluidConcerned.FilledMapItemMixin",
- "FluidConcerned.FishingBobberEntityMixin",
- "FluidConcerned.FlowableFluidMixin",
- "FluidConcerned.FluidBlockMixin",
- "FluidConcerned.LandPathNodeMakerMixin",
- "FluidConcerned.LavaFluidMixin",
- "FluidConcerned.PatrolSpawnerMixin",
- "FluidConcerned.PointedDripstoneBlockMixin",
- "FluidConcerned.ServerWorldMixin",
- "FluidConcerned.SimpleNeighborUpdaterMixin",
- "FluidConcerned.SpongeBlockMixin",
- "FluidConcerned.SpreadableBlockMixin",
- "FluidConcerned.StriderEntityMixin",
- "FluidConcerned.TallBlockItemMixin",
- "FluidConcerned.WorldChunkMixin",
- "FluidConcerned.WorldMixin",
- "FluidConcerned.WorldViewMixin"
+ "accessor.MobEntityAccessor",
+ "fluidConcerned.BucketItemMixin",
+ "fluidConcerned.ChainRestrictedNeighborUpdater$SimpleEntryMixin",
+ "fluidConcerned.ChainRestrictedNeighborUpdater$SixWayEntryMixin",
+ "fluidConcerned.ChunkHolderMixin",
+ "fluidConcerned.ChunkSectionMixin",
+ "fluidConcerned.ChunkSerializerMixin",
+ "fluidConcerned.ConcretePowderBlockMixin",
+ "fluidConcerned.EndermanEntityMixin",
+ "fluidConcerned.FilledMapItemMixin",
+ "fluidConcerned.FishingBobberEntityMixin",
+ "fluidConcerned.FlowableFluidMixin",
+ "fluidConcerned.FluidBlockMixin",
+ "fluidConcerned.LandPathNodeMakerMixin",
+ "fluidConcerned.LavaFluidMixin",
+ "fluidConcerned.PatrolSpawnerMixin",
+ "fluidConcerned.PointedDripstoneBlockMixin",
+ "fluidConcerned.ServerWorldMixin",
+ "fluidConcerned.SimpleNeighborUpdaterMixin",
+ "fluidConcerned.SpongeBlockMixin",
+ "fluidConcerned.SpreadableBlockMixin",
+ "fluidConcerned.StriderEntityMixin",
+ "fluidConcerned.TallBlockItemMixin",
+ "fluidConcerned.WorldChunkMixin",
+ "fluidConcerned.WorldMixin",
+ "fluidConcerned.WorldViewMixin"
],
"injectors": {
"defaultRequire": 1