Minor code changes

Mrbysco · Jun 6, 2024 · 70bb33e · 70bb33e
1 parent da12fe9
commit 70bb33e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/com/mrbysco/forcecraft/blockentities/InfuserBlockEntity.java b/src/main/java/com/mrbysco/forcecraft/blockentities/InfuserBlockEntity.java
@@ -126,7 +126,7 @@ public FluidStack drain(int maxDrain, FluidAction action) {
 
 		@Override
 		public boolean isFluidValid(FluidStack stack) {
-			return stack.getFluid().is(ForceTags.FORCE);
+			return stack.is(ForceTags.FORCE);
 		}
 	};
 
@@ -550,10 +550,10 @@ private boolean applyModifier(ItemStack tool, ItemStack modifier, RecipeHolder<I
 		//test the ingredient of this recipe, if it matches me
 
 		InfuseRecipe recipe = recipeHolder.value();
-		if (recipe.resultModifier.apply(tool, modifier, bd)) {
+		if (recipe.getModifier().apply(tool, modifier, bd)) {
 			bd.onRecipeApply(recipeHolder, getBookInSlot());
 
-			if (recipe.resultModifier == InfuserModifierType.ITEM && recipe.hasOutput()) {
+			if (recipe.getModifier() == InfuserModifierType.ITEM && recipe.hasOutput()) {
 				//overwrite / convert item
 				handler.setStackInSlot(SLOT_TOOL, recipe.getResultItem(level.registryAccess()).copy());
 			} else {
@@ -1252,7 +1252,7 @@ public static boolean addRecipe(RecipeHolder<InfuseRecipe> holder) {
 		}
 		LEVEL_RECIPE_LIST.get(thisTier).add(recipe);
 		HASHES.add(id.toString());
-		ForceCraft.LOGGER.info("Recipe loaded {} -> {} , {}", id.toString(), recipe.resultModifier, recipe.ingredient);
+		ForceCraft.LOGGER.info("Recipe loaded {} -> {} , {}", id.toString(), recipe.getModifier(), recipe.getIngredient());
 		return true;
 	}
 }
diff --git a/src/main/java/com/mrbysco/forcecraft/recipe/InfuseRecipe.java b/src/main/java/com/mrbysco/forcecraft/recipe/InfuseRecipe.java
@@ -25,12 +25,12 @@
 
 public class InfuseRecipe implements Recipe<InfuserBlockEntity> {
 	private static final int MAX_SLOTS = 8;
-	public Ingredient ingredient = Ingredient.EMPTY;
-	public InfuserModifierType resultModifier;
-	ItemStack output = ItemStack.EMPTY;
-	private UpgradeBookTier tier;
-	private Ingredient center;
-	private int time;
+	protected Ingredient ingredient;
+	protected InfuserModifierType resultModifier;
+	protected ItemStack output;
+	protected UpgradeBookTier tier;
+	protected Ingredient center;
+	protected int time;
 
 	public InfuseRecipe(Ingredient center, Ingredient input, InfuserModifierType resultType, UpgradeBookTier tier, ItemStack outputStack, int time) {
 		this.ingredient = input;