From 0965c430c3b5c7964c0440340ba03bb4e1e25d1b Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Fri, 26 Aug 2022 08:09:34 -0500 Subject: [PATCH] Misc --- port.MD | 4 +- .../api/ActuallyAdditionsAPI.java | 49 --------------- .../api/recipe/BallOfFurReturn.java | 25 -------- .../api/recipe/CoffeeIngredient.java | 1 + .../api/recipe/CompostRecipe.java | 56 ----------------- .../api/recipe/LensConversionRecipe.java | 1 + .../api/recipe/TreasureChestLoot.java | 29 --------- .../mod/crafting/ItemCrafting.java | 60 ------------------- 8 files changed, 4 insertions(+), 221 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java diff --git a/port.MD b/port.MD index 4f323d59d..1cf82df3c 100644 --- a/port.MD +++ b/port.MD @@ -3,7 +3,7 @@ - [x] 11 lens (lens of disruption) - [ ] Smiley cloud - [x] Occasional solidified XP drop from mobs -- [ ] Treasure chests +- [x] Treasure chests - [x] Composter and bio-mash, biomass, bio coal and fertilizer - [x] Charcoal blocks - [x] Ender pearl blocks @@ -88,7 +88,7 @@ - [ ] Wings of the Bats and wing items dropped from bats - [ ] Drills and drill upgrades - [ ] Batteries -- [ ] Crafting table on a stick +- [x] Crafting table on a stick - [ ] Leaf blowers - [ ] The book - [x] The Crystal Flux name and rainbow effect diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java index 172c775f4..2e0fba2c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -40,9 +40,6 @@ public final class ActuallyAdditionsAPI { public static final String API_VERSION = "34"; public static final List CRUSHER_RECIPES = new ArrayList<>(); - public static final List BALL_OF_FUR_RETURN_ITEMS = new ArrayList<>(); - // public static final List TREASURE_CHEST_LOOT = new ArrayList<>(); - //public static final List RECONSTRUCTOR_LENS_CONVERSION_RECIPES = new ArrayList<>(); public static final List EMPOWERER_RECIPES = new ArrayList<>(); public static final List COLOR_CHANGE_RECIPES = new ArrayList<>(); public static final List SOLID_FUEL_RECIPES = new ArrayList<>(); @@ -177,52 +174,6 @@ public final class ActuallyAdditionsAPI { public static boolean addCrusherRecipes(List inputs, ItemStack outputOne, int outputOneAmount, ItemStack outputTwo, int outputTwoAmount, int outputTwoChance) { return methodHandler.addCrusherRecipes(inputs, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance); } - /** - * Adds a new conversion recipe to the compost. - * - * @param input The itemstack to be input into the compost - * @param inputDisplay The block to display when there is input in the compost - * @param output The itemstack to be output from the compost once conversion finishes - * @param outputDisplay The block to display when there is output in the compost - */ - @Deprecated - public static void addCompostRecipe(ItemStack input, Block inputDisplay, ItemStack output, Block outputDisplay) { - // COMPOST_RECIPES.add(new CompostRecipe(input, inputDisplay, output, outputDisplay)); - } - - /** - * Adds a new conversion recipe to the compost. - * - * @param input The ingredient to be input into the compost - * @param inputDisplay The state to display when there is input in the compost - * @param output The itemstack to be output from the compost once conversion finishes - * @param outputDisplay The state to display when there is output in the compost - */ - public static void addCompostRecipe(Ingredient input, BlockState inputDisplay, ItemStack output, BlockState outputDisplay) { - // COMPOST_RECIPES.add(new CompostRecipe(input, inputDisplay, output, outputDisplay)); - } - - /** - * Adds an item to the list of possible items to be returned when right-clicking a Ball Of Fur - * - * @param stack The ItemStack to be returned - * @param chance The chance (this is from WeightedRandom.Item) - */ - public static void addBallOfFurReturnItem(ItemStack stack, int chance) { - BALL_OF_FUR_RETURN_ITEMS.add(new BallOfFurReturn(stack, chance)); - } - - /** - * Adds an item to the list of possible items to be returned when opening a Treasure Chest - * - * @param stack The ItemStack to be returned, the stacksize is ignored - * @param chance The chance (this is from WeightedRandom.Item) - * @param minAmount The minimum stacksize of the returned stack - * @param maxAmount The maximum stacksize of the returned stack - */ - public static void addTreasureChestLoot(ItemStack stack, int chance, int minAmount, int maxAmount) { - // TREASURE_CHEST_LOOT.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount)); - } public static void addEmpowererRecipe(ResourceLocation id, Ingredient input, ItemStack output, Ingredient modifier1, Ingredient modifier2, Ingredient modifier3, Ingredient modifier4, int energyPerStand, int time, int particleColor) { EMPOWERER_RECIPES.add(new EmpowererRecipe(id, output, input, modifier1, modifier2, modifier3, modifier4, energyPerStand, time, particleColor)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java deleted file mode 100644 index ef77dc8ee..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file ("BallOfFurReturn.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.api.recipe; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -public class BallOfFurReturn extends WeightedRandom.Item { - - public final ItemStack returnItem; - - public BallOfFurReturn(ItemStack returnItem, int chance) { - super(chance); - this.returnItem = returnItem; - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java index 704923b50..6a1fa6381 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.potion.EffectInstance; +@Deprecated public class CoffeeIngredient { protected final Ingredient input; diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java deleted file mode 100644 index a6800fbb0..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java +++ /dev/null @@ -1,56 +0,0 @@ -///* -// * This file ("CompostRecipe.java") is part of the Actually Additions mod for Minecraft. -// * It is created and owned by Ellpeck and distributed -// * under the Actually Additions License to be found at -// * http://ellpeck.de/actaddlicense -// * View the source code at https://github.com/Ellpeck/ActuallyAdditions -// * -// * © 2015-2017 Ellpeck -// */ -// -//package de.ellpeck.actuallyadditions.api.recipe; -// -//import net.minecraft.block.Block; -//import net.minecraft.item.ItemStack; -//import net.minecraft.item.crafting.Ingredient; -// -//public class CompostRecipe { -// -// protected final Ingredient input; -// protected final ItemStack output; -// protected final BlockState inputDisplay; -// protected final BlockState outputDisplay; -// -// @Deprecated -// public CompostRecipe(ItemStack input, Block inputDisplay, ItemStack output, Block outputDisplay) { -// this(Ingredient.fromStacks(input), inputDisplay.getDefaultState(), output, outputDisplay.getDefaultState()); -// } -// -// public CompostRecipe(Ingredient input, BlockState inputDisplay, ItemStack output, BlockState outputDisplay) { -// this.input = input; -// this.output = output; -// this.inputDisplay = inputDisplay; -// this.outputDisplay = outputDisplay; -// } -// -// public boolean matches(ItemStack stack) { -// return this.input.apply(stack); -// } -// -// public Ingredient getInput() { -// return this.input; -// } -// -// public ItemStack getOutput() { -// return this.output; -// } -// -// public BlockState getInputDisplay() { -// return this.inputDisplay; -// } -// -// public BlockState getOutputDisplay() { -// return this.outputDisplay; -// } -// -//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java index aa70e3252..8623fda8f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.math.BlockPos; +Mi@Deprecated public class LensConversionRecipe { protected final Ingredient input; diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java deleted file mode 100644 index 8a148710c..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java +++ /dev/null @@ -1,29 +0,0 @@ -///* -// * This file ("TreasureChestLoot.java") is part of the Actually Additions mod for Minecraft. -// * It is created and owned by Ellpeck and distributed -// * under the Actually Additions License to be found at -// * http://ellpeck.de/actaddlicense -// * View the source code at https://github.com/Ellpeck/ActuallyAdditions -// * -// * © 2015-2017 Ellpeck -// */ -// -//package de.ellpeck.actuallyadditions.api.recipe; -// -//import net.minecraft.item.ItemStack; -//import net.minecraft.util.WeightedRandom; -// -//public class TreasureChestLoot extends WeightedRandom.Item { -// -// public final ItemStack returnItem; -// public final int minAmount; -// public final int maxAmount; -// -// public TreasureChestLoot(ItemStack returnItem, int chance, int minAmount, int maxAmount) { -// super(chance); -// this.returnItem = returnItem; -// this.minAmount = minAmount; -// this.maxAmount = maxAmount; -// } -// -//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 15c619543..74040468d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -13,66 +13,6 @@ package de.ellpeck.actuallyadditions.mod.crafting; // TODO: [port] MOVE TO DATA_GENERATOR @Deprecated public final class ItemCrafting { - // - // public static final ArrayList RECIPES_POTION_RINGS = new ArrayList<>(); - // public static final ArrayList RECIPES_DRILL_COLORING = new ArrayList<>(); - // public static IRecipe recipePhantomConnector; - // public static IRecipe recipeCoil; - // public static IRecipe recipeCoilAdvanced; - // public static IRecipe recipeBook; - // public static IRecipe recipeTinyCoal; - // public static IRecipe recipeTinyChar; - // public static IRecipe recipeDrill; - // public static IRecipe recipeDrillSpeedI; - // public static IRecipe recipeDrillSpeedII; - // public static IRecipe recipeDrillSpeedIII; - // public static IRecipe recipeDrillFortuneI; - // public static IRecipe recipeDrillFortuneII; - // public static IRecipe recipeDrillSilk; - // public static IRecipe recipeDrillPlacing; - // public static IRecipe recipeDrillThree; - // public static IRecipe recipeDrillFive; - // public static IRecipe recipeBattery; - // public static IRecipe recipeBatteryDouble; - // public static IRecipe recipeBatteryTriple; - // public static IRecipe recipeBatteryQuadruple; - // public static IRecipe recipeBatteryQuintuple; - // public static IRecipe recipeStaff; - // public static IRecipe recipeGrowthRing; - // public static IRecipe recipeMagnetRing; - // public static IRecipe recipeWaterRing; - // public static IRecipe recipeWings; - // public static IRecipe recipeCup; - // public static IRecipe recipeKnifeHandle; - // public static IRecipe recipeKnifeBlade; - // public static IRecipe recipeKnife; - // public static IRecipe recipeRing; - // public static IRecipe recipeDough; - // public static IRecipe recipeRiceDough; - // public static IRecipe recipeLeafBlower; - // public static IRecipe recipeLeafBlowerAdvanced; - // public static IRecipe recipeChestToCrateUpgrade; - // public static IRecipe recipeSmallToMediumCrateUpgrade; - // public static IRecipe recipeMediumToLargeCrateUpgrade; - // public static IRecipe recipeLaserWrench; - // public static IRecipe recipeDrillCore; - // public static IRecipe recipeBlackDye; - // public static IRecipe recipeLens; - // public static IRecipe recipeCrateKeeper; - // public static IRecipe recipeEnderStar; - // public static IRecipe recipeSpawnerChanger; - // public static IRecipe recipeFilter; - // public static IRecipe recipePlayerProbe; - // public static IRecipe recipeDisenchantingLens; - // public static IRecipe recipeMiningLens; - // public static IRecipe recipeBag; - // public static IRecipe recipeVoidBag; - // public static IRecipe recipeLensMoreDeath; - // public static IRecipe recipeFillingWand; - // public static IRecipe recipeLaserUpgradeInvisibility; - // public static IRecipe recipeLaserUpgradeRange; - // public static IRecipe recipeGoggles; - // public static IRecipe recipeGogglesAdvanced; // // public static void init() { //