Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

fix: yeet method handler methods for booklet until the booklet is added back

Browse source
This commit is contained in:
Michael Hillcox 2021-11-21 18:33:57 +00:00
parent eccf77dd54
commit 4273fdd0f5
2 changed files with 65 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java
View file

@ -10,15 +10,10 @@
package de.ellpeck.actuallyadditions.api.internal; package de.ellpeck.actuallyadditions.api.internal;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.List; import java.util.List;
@ -50,25 +45,25 @@ public interface IMethodHandler {
//Use Ingredient input on AA API class //Use Ingredient input on AA API class
boolean addCrusherRecipes(List<ItemStack> inputs, ItemStack outputOne, int outputOneAmount, ItemStack outputTwo, int outputTwoAmount, int outputTwoChance); boolean addCrusherRecipes(List<ItemStack> inputs, ItemStack outputOne, int outputOneAmount, ItemStack outputTwo, int outputTwoAmount, int outputTwoChance);
IBookletPage generateTextPage(int id); // IBookletPage generateTextPage(int id);
//
IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY); // IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY);
//
IBookletPage generateCraftingPage(int id, IRecipe... recipes); // IBookletPage generateCraftingPage(int id, IRecipe... recipes);
//
IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result); // IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result);
//
IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, IBookletPage... pages); // IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, IBookletPage... pages);
//
IBookletPage generateTextPage(int id, int priority); // IBookletPage generateTextPage(int id, int priority);
//
IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY, int priority); // IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY, int priority);
//
IBookletPage generateCraftingPage(int id, int priority, IRecipe... recipes); // IBookletPage generateCraftingPage(int id, int priority, IRecipe... recipes);
//
IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result, int priority); // IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result, int priority);
//
IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, int priority, IBookletPage... pages); // IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, int priority, IBookletPage... pages);
//
IBookletChapter createTrial(String identifier, ItemStack displayStack, boolean textOnSecondPage); // IBookletChapter createTrial(String identifier, ItemStack displayStack, boolean textOnSecondPage);
} }

93
src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java
View file

@ -11,9 +11,6 @@
package de.ellpeck.actuallyadditions.mod.misc.apiimpl; package de.ellpeck.actuallyadditions.mod.misc.apiimpl;
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
import de.ellpeck.actuallyadditions.api.internal.IMethodHandler; import de.ellpeck.actuallyadditions.api.internal.IMethodHandler;
import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.lens.Lens;
@ -31,13 +28,11 @@ import net.minecraft.block.Blocks;
import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemEntity;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.potion.Effect; import net.minecraft.potion.Effect;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3i; import net.minecraft.util.math.vector.Vector3i;
@ -314,58 +309,58 @@ public class MethodHandler implements IMethodHandler {
return hasWorkedOnce; return hasWorkedOnce;
} }
@Override // @Override
public IBookletPage generateTextPage(int id) { // public IBookletPage generateTextPage(int id) {
return this.generateTextPage(id, 0); // return this.generateTextPage(id, 0);
} // }
@Override // @Override
public IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY) { // public IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY) {
return this.generatePicturePage(id, resLoc, textStartY, 0); // return this.generatePicturePage(id, resLoc, textStartY, 0);
} // }
@Override // @Override
public IBookletPage generateCraftingPage(int id, IRecipe... recipes) { // public IBookletPage generateCraftingPage(int id, IRecipe... recipes) {
return this.generateCraftingPage(id, 0, recipes); // return this.generateCraftingPage(id, 0, recipes);
} // }
@Override // @Override
public IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result) { // public IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result) {
return this.generateFurnacePage(id, input, result, 0); // return this.generateFurnacePage(id, input, result, 0);
} // }
@Override // @Override
public IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, IBookletPage... pages) { // public IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, IBookletPage... pages) {
return this.generateBookletChapter(identifier, entry, displayStack, 0, pages); // return this.generateBookletChapter(identifier, entry, displayStack, 0, pages);
} // }
@Override // @Override
public IBookletPage generateTextPage(int id, int priority) { // public IBookletPage generateTextPage(int id, int priority) {
return new PageTextOnly(id, priority); // return new PageTextOnly(id, priority);
} // }
@Override // @Override
public IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY, int priority) { // public IBookletPage generatePicturePage(int id, ResourceLocation resLoc, int textStartY, int priority) {
return new PagePicture(id, resLoc, textStartY, priority); // return new PagePicture(id, resLoc, textStartY, priority);
} // }
@Override // @Override
public IBookletPage generateCraftingPage(int id, int priority, IRecipe... recipes) { // public IBookletPage generateCraftingPage(int id, int priority, IRecipe... recipes) {
return new PageCrafting(id, priority, recipes); // return new PageCrafting(id, priority, recipes);
} // }
@Override // @Override
public IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result, int priority) { // public IBookletPage generateFurnacePage(int id, ItemStack input, ItemStack result, int priority) {
return new PageFurnace(id, result, priority); // return new PageFurnace(id, result, priority);
} // }
@Override // @Override
public IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, int priority, IBookletPage... pages) { // public IBookletChapter generateBookletChapter(String identifier, IBookletEntry entry, ItemStack displayStack, int priority, IBookletPage... pages) {
return new BookletChapter(identifier, entry, displayStack, priority, pages); // return new BookletChapter(identifier, entry, displayStack, priority, pages);
} // }
@Override // @Override
public IBookletChapter createTrial(String identifier, ItemStack displayStack, boolean textOnSecondPage) { // public IBookletChapter createTrial(String identifier, ItemStack displayStack, boolean textOnSecondPage) {
return new BookletChapterTrials(identifier, displayStack, textOnSecondPage); // return new BookletChapterTrials(identifier, displayStack, textOnSecondPage);
} // }
} }