fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #4521: Register RecipeTypes. (#4523)

Browse Source
This commit is contained in:
shartte
2020-07-31 17:22:44 +02:00
committed by GitHub
parent 98e9faa262
commit 4fa78a2add
6 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/AERecipeType.java
-18
View File
@@ -1,18 +0,0 @@
package appeng.core;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.util.ResourceLocation;
public class AERecipeType<T extends IRecipe<?>> implements IRecipeType<T> {
private final String id;
public AERecipeType(ResourceLocation registryName) {
this.id = registryName.toString();
}
@Override
public String toString() {
return id;
}
}
src/main/java/appeng/core/Registration.java
-3
View File
@@ -418,9 +418,6 @@ final class Registration {
public void registerRecipeSerializers(RegistryEvent.Register<IRecipeSerializer<?>> event) {
IForgeRegistry<IRecipeSerializer<?>> r = event.getRegistry();
GrinderRecipe.TYPE = new AERecipeType<>(GrinderRecipeSerializer.INSTANCE.getRegistryName());
InscriberRecipe.TYPE = new AERecipeType<>(InscriberRecipeSerializer.INSTANCE.getRegistryName());
FacadeItem facadeItem = (FacadeItem) Api.INSTANCE.definitions().items().facade().item();
r.registerAll(DisassembleRecipe.SERIALIZER, GrinderRecipeSerializer.INSTANCE,
InscriberRecipeSerializer.INSTANCE, FacadeRecipe.getSerializer(facadeItem));
src/main/java/appeng/recipes/handlers/GrinderRecipe.java
+5 -1
View File
@@ -14,9 +14,13 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import appeng.core.AppEng;
public class GrinderRecipe implements IRecipe<IInventory> {
public static IRecipeType<GrinderRecipe> TYPE;
public static final ResourceLocation TYPE_ID = AppEng.makeId("grinder");
public static final IRecipeType<GrinderRecipe> TYPE = IRecipeType.register(TYPE_ID.toString());
private final ResourceLocation id;
private final String group;
src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class GrinderRecipeSerializer extends ForgeRegistryEntry<IRecipeSerialize
public static final GrinderRecipeSerializer INSTANCE = new GrinderRecipeSerializer();
static {
INSTANCE.setRegistryName(AppEng.MOD_ID, "grinder");
INSTANCE.setRegistryName(GrinderRecipe.TYPE_ID);
}
private GrinderRecipeSerializer() {
src/main/java/appeng/recipes/handlers/InscriberRecipe.java
+4 -1
View File
@@ -11,10 +11,13 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import appeng.api.features.InscriberProcessType;
import appeng.core.AppEng;
public class InscriberRecipe implements IRecipe<IInventory> {
public static IRecipeType<InscriberRecipe> TYPE;
public static final ResourceLocation TYPE_ID = AppEng.makeId("inscriber");
public static final IRecipeType<InscriberRecipe> TYPE = IRecipeType.register(TYPE_ID.toString());
private final ResourceLocation id;
private final String group;
src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class InscriberRecipeSerializer extends ForgeRegistryEntry<IRecipeSeriali
public static final InscriberRecipeSerializer INSTANCE = new InscriberRecipeSerializer();
static {
INSTANCE.setRegistryName(AppEng.MOD_ID, "inscriber");
INSTANCE.setRegistryName(InscriberRecipe.TYPE_ID);
}
private InscriberRecipeSerializer() {