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

Fixed REI integration

Browse source
This commit is contained in:
paulevsGitch 2021-07-08 01:22:57 +03:00
parent 80918ea7e4
commit c623da26ed
6 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java
View file

@ -139,6 +139,7 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Block
if (blockEntity.age > blockEntity.maxAge) { if (blockEntity.age > blockEntity.maxAge) {
blockEntity.age = 0; blockEntity.age = 0;
} }
System.out.println(blockEntity.age);
} }
} }
} }

3
src/main/java/ru/betterend/client/render/EternalCrystalRenderer.java
View file

@ -44,8 +44,7 @@ public class EternalCrystalRenderer {
matrices.popPose(); matrices.popPose();
} }
public static float[] colors(int age) { public static float[] colors(float delta) {
double delta = age * 0.01;
int index = MHelper.floor(delta); int index = MHelper.floor(delta);
int index2 = (index + 1) & 3; int index2 = (index + 1) & 3;
delta -= index; delta -= index;

4
src/main/java/ru/betterend/integration/rei/REIPlugin.java
View file

@ -31,9 +31,9 @@ import java.util.stream.Collectors;
public class REIPlugin implements REIClientPlugin { public class REIPlugin implements REIClientPlugin {
public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin"); 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_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 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 END_STONE_SMELTER;
private EntryStack INFUSION_RITUAL; private EntryStack INFUSION_RITUAL;

2
src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java
View file

@ -28,11 +28,9 @@ import ru.betterend.util.ItemUtil;
import ru.betterend.util.RecipeHelper; import ru.betterend.util.RecipeHelper;
public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe { public class AlloyingRecipe implements Recipe<Container>, BetterEndRecipe {
public final static String GROUP = "alloying"; public final static String GROUP = "alloying";
public final static RecipeType<AlloyingRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static RecipeType<AlloyingRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); 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 RecipeType<?> type;
protected final ResourceLocation id; protected final ResourceLocation id;

1
src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java
View file

@ -34,7 +34,6 @@ import ru.betterend.util.RecipeHelper;
import java.util.Objects; import java.util.Objects;
public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe { public class AnvilRecipe implements Recipe<Container>, BetterEndRecipe {
public final static String GROUP = "smithing"; public final static String GROUP = "smithing";
public final static RecipeType<AnvilRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static RecipeType<AnvilRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer());

3
src/main/java/ru/betterend/recipe/builders/InfusionRecipe.java
View file

@ -2,7 +2,6 @@ package ru.betterend.recipe.builders;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
@ -28,11 +27,9 @@ import ru.betterend.util.ItemUtil;
import java.util.Arrays; import java.util.Arrays;
public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe { public class InfusionRecipe implements Recipe<InfusionRitual>, BetterEndRecipe {
public final static String GROUP = "infusion"; public final static String GROUP = "infusion";
public final static RecipeType<InfusionRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP); public final static RecipeType<InfusionRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(BetterEnd.MOD_ID, GROUP, new Serializer()); 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 ResourceLocation id;
private final Ingredient[] catalysts; private final Ingredient[] catalysts;