MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some Recipe related issues

Browse source
This commit is contained in:
Frank 2023-12-19 15:06:48 +01:00
parent 9a758565d7
commit 951a6d110c
8 changed files with 170 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/org/betterx/betterend/rituals/InfusionRitual.java
View file

@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.Container;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.chunk.LevelChunk.EntityCreationType;
@ -22,6 +23,7 @@ import net.minecraft.world.phys.Vec3;
import java.awt.*;
import java.util.Arrays;
import java.util.Objects;
import org.jetbrains.annotations.NotNull;
public class InfusionRitual implements Container {
private static final Point[] PEDESTALS_MAP = new Point[]{
@ -37,7 +39,7 @@ public class InfusionRitual implements Container {
private Level world;
private BlockPos worldPos;
private InfusionRecipe activeRecipe;
private RecipeHolder<InfusionRecipe> activeRecipe;
private boolean isDirty = false;
private boolean hasRecipe = false;
private int progress = 0;
@ -70,12 +72,14 @@ public class InfusionRitual implements Container {
public boolean checkRecipe() {
if (!isValid()) return false;
InfusionRecipe recipe = world.getRecipeManager().getRecipeFor(InfusionRecipe.TYPE, this, world).orElse(null);
RecipeHolder<InfusionRecipe> recipe = world.getRecipeManager()
.getRecipeFor(InfusionRecipe.TYPE, this, world)
.orElse(null);
if (hasRecipe()) {
if (recipe == null) {
reset();
return false;
} else if (activeRecipe == null || recipe.getInfusionTime() != time) {
} else if (activeRecipe == null || recipe.value().getInfusionTime() != time) {
updateRecipe(recipe);
}
return true;
@ -87,7 +91,7 @@ public class InfusionRitual implements Container {
return false;
}
private void updateRecipe(InfusionRecipe recipe) {
private void updateRecipe(RecipeHolder<InfusionRecipe> recipe) {
activeRecipe = recipe;
hasRecipe = true;
resetTimer();
@ -95,7 +99,7 @@ public class InfusionRitual implements Container {
}
private void resetTimer() {
time = activeRecipe != null ? activeRecipe.getInfusionTime() : 0;
time = activeRecipe != null ? activeRecipe.value().getInfusionTime() : 0;
progress = 0;
}
@ -115,7 +119,7 @@ public class InfusionRitual implements Container {
progress++;
if (progress == time) {
clearContent();
input.setItem(0, activeRecipe.assemble(this, world.registryAccess()));
input.setItem(0, activeRecipe.value().assemble(this, world.registryAccess()));
if (world instanceof ServerLevel sl) {
sl.getPlayers(p -> p.position()
.subtract(new Vec3(worldPos.getX(), worldPos.getY(), worldPos.getZ()))
@ -190,7 +194,7 @@ public class InfusionRitual implements Container {
}
@Override
public ItemStack getItem(int slot) {
public @NotNull ItemStack getItem(int slot) {
if (slot > 8) return ItemStack.EMPTY;
if (slot == 0) {
return input.getItem(0);
@ -200,12 +204,12 @@ public class InfusionRitual implements Container {
}
@Override
public ItemStack removeItem(int slot, int amount) {
public @NotNull ItemStack removeItem(int slot, int amount) {
return removeItemNoUpdate(slot);
}
@Override
public ItemStack removeItemNoUpdate(int slot) {
public @NotNull ItemStack removeItemNoUpdate(int slot) {
if (slot > 8) return ItemStack.EMPTY;
if (slot == 0) {
return input.removeItemNoUpdate(0);