Tweaks and changes

changelog-next.txt

@@ -1,2 +1,3 @@
-- Fixed Pipes not being able to pull Honey from Bee Hives if they didn't face north.
-- Fixed Item Splitters thinking that left and right filters are equal when they aren't.
+- Increased damage done by Lava Splash to 2 hearts (from 0.5).
+- Increased damage done by Experience Splash x2 (compared to previously).
+- Recipes now use Fabric's Convention tag for Stripped Logs

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.4-rc3
-	yarn_mappings=1.21.4-rc3+build.1
+	minecraft_version=1.21.4
+	yarn_mappings=1.21.4.+build.1
 	loader_version=0.16.9
 
 # Mod Properties

src/main/java/eu/pb4/polyfactory/block/FactoryBlockTags.java

@@ -11,7 +11,6 @@ public class FactoryBlockTags {
     public static final TagKey<Block> CONVEYOR_SIDE_OUTPUT = of("conveyor/side_output");
     public static final TagKey<Block> SPLITTER_SIDE_OUTPUT = of("conveyor/splitter/side_output");
     public static final TagKey<Block> GRINDER_TOP_PLACEABLE = of("grinder/top_placeable");
-    public static final TagKey<Block> STRIPPED_LOGS = of("stripped_logs");
     public static final TagKey<Block> WIND_PASSTHROUGH = of("wind_passthrough");
     public static final TagKey<Block> SPRAY_CAN_COLORABLE = of("spray_can_colorable");
     public static final TagKey<Block> CONCRETE = of("concrete");

src/main/java/eu/pb4/polyfactory/datagen/BlockTagsProvider.java

@@ -20,19 +20,6 @@ public BlockTagsProvider(FabricDataOutput output, CompletableFuture<RegistryWrap
 
     @Override
     protected void configure(RegistryWrapper.WrapperLookup arg) {
-        this.getOrCreateTagBuilder(FactoryBlockTags.STRIPPED_LOGS)
-                .add(Blocks.STRIPPED_OAK_LOG)
-                .add(Blocks.STRIPPED_BIRCH_LOG)
-                .add(Blocks.STRIPPED_SPRUCE_LOG)
-                .add(Blocks.STRIPPED_JUNGLE_LOG)
-                .add(Blocks.STRIPPED_ACACIA_LOG)
-                .add(Blocks.STRIPPED_DARK_OAK_LOG)
-                .add(Blocks.STRIPPED_MANGROVE_LOG)
-                .add(Blocks.STRIPPED_CHERRY_LOG)
-                .add(Blocks.STRIPPED_CRIMSON_STEM)
-                .add(Blocks.STRIPPED_WARPED_STEM)
-        ;
-
         this.getOrCreateTagBuilder(FactoryBlockTags.SPRAY_CAN_COLORABLE)
                 .addOptionalTag(BlockTags.WOOL)
                 .addOptionalTag(BlockTags.WOOL_CARPETS)

src/main/java/eu/pb4/polyfactory/datagen/ItemTagsProvider.java

@@ -88,7 +88,5 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
 
         this.getOrCreateTagBuilder(FactoryItemTags.DRAIN_CATALYST).add(Items.ECHO_SHARD);
         this.getOrCreateTagBuilder(FactoryItemTags.XP_CONVERSION_CATALYST).add(Items.ECHO_SHARD);
-
-        this.copy(FactoryBlockTags.STRIPPED_LOGS, FactoryItemTags.STRIPPED_LOGS);
     }
 }

src/main/java/eu/pb4/polyfactory/datagen/RecipesProvider.java

@@ -455,7 +455,7 @@ public void generate() {
                         .pattern("www")
                         .pattern("sss")
                         .pattern("www")
-                        .input('w', FactoryItemTags.STRIPPED_LOGS).input('s', FactoryItems.STEEL_INGOT)
+                        .input('w', ConventionalItemTags.STRIPPED_LOGS).input('s', FactoryItems.STEEL_INGOT)
                         .criterion("get_steel", InventoryChangedCriterion.Conditions.items(FactoryItems.STEEL_INGOT))
                         .offerTo(exporter);
 
@@ -575,7 +575,7 @@ public void generate() {
                 ShapedRecipeJsonBuilder.create(itemWrap, RecipeCategory.REDSTONE, FactoryItems.HAND_CRANK)
                         .pattern("ip")
                         .pattern("l ")
-                        .input('l', FactoryItemTags.STRIPPED_LOGS).input('p', ItemTags.PLANKS).input('i', Items.IRON_INGOT)
+                        .input('l', ConventionalItemTags.STRIPPED_LOGS).input('p', ItemTags.PLANKS).input('i', Items.IRON_INGOT)
                         .criterion("get_axle", InventoryChangedCriterion.Conditions.items(Items.IRON_INGOT))
                         .offerTo(exporter);
 

src/main/java/eu/pb4/polyfactory/entity/splash/LavaSplashEntity.java

@@ -46,8 +46,8 @@ protected void onBlockHit(BlockHitResult context) {
     protected void onEntityHit(EntityHitResult entityHitResult) {
         if (this.random.nextFloat() < 0.3) {
             if (this.getWorld() instanceof ServerWorld world && entityHitResult.getEntity() instanceof LivingEntity livingEntity && this.canDamageEntity(livingEntity)) {
-                livingEntity.setOnFireFor(3);
-                livingEntity.damage(world, this.getDamageSources().create(DamageTypes.LAVA, this, this.getOwner()), 1F);
+                livingEntity.setOnFireFor(4);
+                livingEntity.damage(world, this.getDamageSources().create(DamageTypes.LAVA, this, this.getOwner()), 4F);
             }
         }
         super.onEntityHit(entityHitResult);

src/main/java/eu/pb4/polyfactory/item/FactoryItemTags.java

@@ -8,7 +8,6 @@
 public class FactoryItemTags {
     public static final TagKey<Item> ALLOWED_IN_MINER = of("allowed_in_miner");
     public static final TagKey<Item> ALLOWED_IN_PLANTER = of("allowed_in_planter");
-    public static final TagKey<Item> STRIPPED_LOGS = of("stripped_logs");
     public static final TagKey<Item> ROOT_ADVANCEMENT = of("root_advancement");
     public static final TagKey<Item> PLACER_USABLE = of("placer_usable");
     public static final TagKey<Item> DRAIN_CATALYST = of("drain_catalyst");