v2.0 - tweaks

DakotaPride · Oct 6, 2024 · 3f61d33 · 3f61d33
1 parent d2243b4
commit 3f61d33
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java
@@ -4,7 +4,6 @@
 
 import javax.annotation.Nullable;
 
-import com.simibubi.create.AllFluids;
 import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import com.simibubi.create.foundation.fluid.FluidHelper;
@@ -31,7 +30,6 @@
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
@@ -258,7 +256,7 @@ public static BlockState whenFluidsMeet(LevelAccessor world, BlockPos pos, Block
 		for (Direction direction : Iterate.directions) {
 			FluidState metFluidState =
 					fluidState.isSource() ? fluidState : world.getFluidState(pos.relative(direction));
-			if (!metFluidState.is(FluidTags.WATER))
+			if (metFluidState.is(FluidTags.LAVA))
 				continue;
 			BlockState lavaInteraction = getLavaInteraction(metFluidState);
 			if (lavaInteraction == null)
@@ -281,7 +279,7 @@ public static BlockState getLavaInteraction(FluidState fluidState) {
 		if (fluid.isSame(APPLE_CIDER.get()))
 			return GarnishedBlocks.CARNOTITE.getDefaultState();
 		// Fluids.lavaInteraction(fluidState, CASHEW_MIXTURE.get(), Blocks.END_STONE);
-		if (fluid.isSame(PEANUT_OIL.get()))
+		if (fluid.isSame(CASHEW_MIXTURE.get()))
 			return Blocks.END_STONE.defaultBlockState();
 
 		// Fluids.lavaInteraction(fluidState, MASTIC_RESIN.get(), GarnishedBlocks.ZULTANITE.get());

diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedTags.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedTags.java
@@ -20,6 +20,7 @@ public class GarnishedTags {
 	public static final TagKey<Item> AVERSION_FOODS_TAG = garnishedTag("aversion_foods", BuiltInRegistries.ITEM);
 	public static final TagKey<Item> HATCHETS_TAG = commonTag("tools/hatchets", BuiltInRegistries.ITEM);
 	public static final TagKey<Fluid> GARNISHED_FLUIDS_TAG = garnishedTag("fluids", BuiltInRegistries.FLUID);
+	public static final TagKey<Fluid> MASTIC_RESIN_FLUIDS_TAG = garnishedTag("mastic_resin", BuiltInRegistries.FLUID);
 	public static final TagKey<Block> MINEABLE_WITH_HATCHET = commonTag("mineable/hatchet", BuiltInRegistries.BLOCK);
 	public static final TagKey<EntityType<?>> IS_AFFECTED_BY_SALVAGING = commonTag("affected_by/salvaging", BuiltInRegistries.ENTITY_TYPE);
 	public static final TagKey<EntityType<?>> IS_AFFECTED_BY_RAVAGING = commonTag("affected_by/ravaging", BuiltInRegistries.ENTITY_TYPE);

diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/ae2/magenta/paint_ball.json b/src/main/resources/data/garnished/recipes/dye_blowing/ae2/magenta/paint_ball.json
@@ -7,15 +7,15 @@
       ]
     }
   ],
-  "type": "garnished:blue_dye_blowing",
+  "type": "garnished:magenta_dye_blowing",
   "ingredients": [
     {
       "tag": "ae2:paint_balls"
     }
   ],
   "results": [
     {
-      "item": "ae2:blue_paint_ball",
+      "item": "ae2:magenta_paint_ball",
       "count": 1
     }
   ]