From c623da26ed44199e06547795146c5e5c2b1ed827 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 8 Jul 2021 01:22:57 +0300 Subject: [PATCH] Fixed REI integration --- .../ru/betterend/blocks/entities/PedestalBlockEntity.java | 1 + .../ru/betterend/client/render/EternalCrystalRenderer.java | 3 +-- src/main/java/ru/betterend/integration/rei/REIPlugin.java | 4 ++-- .../java/ru/betterend/recipe/builders/AlloyingRecipe.java | 2 -- src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java | 1 - .../java/ru/betterend/recipe/builders/InfusionRecipe.java | 3 --- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index dab530c0..d62077f2 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -139,6 +139,7 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Block if (blockEntity.age > blockEntity.maxAge) { blockEntity.age = 0; } + System.out.println(blockEntity.age); } } } diff --git a/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java b/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java index a6ecb0ed..324c9584 100644 --- a/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java +++ b/src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java @@ -44,8 +44,7 @@ public class EternalCrystalRenderer { matrices.popPose(); } - public static float[] colors(int age) { - double delta = age * 0.01; + public static float[] colors(float delta) { int index = MHelper.floor(delta); int index2 = (index + 1) & 3; delta -= index; diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index c3330b46..507b9308 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -31,9 +31,9 @@ import java.util.stream.Collectors; public class REIPlugin implements REIClientPlugin { public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin"); public final static CategoryIdentifier ALLOYING_FUEL = CategoryIdentifier.of(BetterEnd.MOD_ID, "alloying_fuel"); - public final static CategoryIdentifier ALLOYING = AlloyingRecipe.ID; + public final static CategoryIdentifier ALLOYING = CategoryIdentifier.of(BetterEnd.MOD_ID, AlloyingRecipe.GROUP); public final static CategoryIdentifier SMITHING = CategoryIdentifier.of(BetterEnd.MOD_ID, AnvilRecipe.ID.getPath()); - public final static CategoryIdentifier INFUSION = InfusionRecipe.ID; + public final static CategoryIdentifier INFUSION = CategoryIdentifier.of(BetterEnd.MOD_ID, InfusionRecipe.GROUP); private EntryStack END_STONE_SMELTER; private EntryStack INFUSION_RITUAL; diff --git a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java index 13c325d9..db042ffb 100644 --- a/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java @@ -28,11 +28,9 @@ import ru.betterend.util.ItemUtil; import ru.betterend.util.RecipeHelper; public class AlloyingRecipe implements Recipe, BetterEndRecipe { - public final static String GROUP = "alloying"; public final static RecipeType TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); - public final static CategoryIdentifier ID = CategoryIdentifier.of(BetterEnd.MOD_ID, GROUP); protected final RecipeType type; protected final ResourceLocation id; diff --git a/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java index a401408b..7082a566 100644 --- a/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java @@ -34,7 +34,6 @@ import ru.betterend.util.RecipeHelper; import java.util.Objects; public class AnvilRecipe implements Recipe, BetterEndRecipe { - public final static String GROUP = "smithing"; public final static RecipeType TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); diff --git a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java index dfb58867..4ebdfb40 100644 --- a/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java @@ -2,7 +2,6 @@ package ru.betterend.recipe.builders; import com.google.gson.JsonObject; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.core.NonNullList; @@ -28,11 +27,9 @@ import ru.betterend.util.ItemUtil; import java.util.Arrays; public class InfusionRecipe implements Recipe, BetterEndRecipe { - public final static String GROUP = "infusion"; public final static RecipeType TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); - public final static CategoryIdentifier ID = CategoryIdentifier.of(BetterEnd.MOD_ID, GROUP); private final ResourceLocation id; private final Ingredient[] catalysts;