Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Misc

Browse source
This commit is contained in:
Flanks255 2022-08-26 08:09:34 -05:00
parent 904c408c94
commit 0965c430c3
8 changed files with 4 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
port.MD
View file

@ -3,7 +3,7 @@
- [x] 11 lens (lens of disruption) - [x] 11 lens (lens of disruption)
- [ ] Smiley cloud - [ ] Smiley cloud
- [x] Occasional solidified XP drop from mobs - [x] Occasional solidified XP drop from mobs
- [ ] Treasure chests - [x] Treasure chests
- [x] Composter and bio-mash, biomass, bio coal and fertilizer - [x] Composter and bio-mash, biomass, bio coal and fertilizer
- [x] Charcoal blocks - [x] Charcoal blocks
- [x] Ender pearl blocks - [x] Ender pearl blocks
@ -88,7 +88,7 @@
- [ ] Wings of the Bats and wing items dropped from bats - [ ] Wings of the Bats and wing items dropped from bats
- [ ] Drills and drill upgrades - [ ] Drills and drill upgrades
- [ ] Batteries - [ ] Batteries
- [ ] Crafting table on a stick - [x] Crafting table on a stick
- [ ] Leaf blowers - [ ] Leaf blowers
- [ ] The book - [ ] The book
- [x] The Crystal Flux name and rainbow effect - [x] The Crystal Flux name and rainbow effect

49
src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java
View file

@ -40,9 +40,6 @@ public final class ActuallyAdditionsAPI {
public static final String API_VERSION = "34"; public static final String API_VERSION = "34";
public static final List<CrushingRecipe> CRUSHER_RECIPES = new ArrayList<>(); public static final List<CrushingRecipe> CRUSHER_RECIPES = new ArrayList<>();
public static final List<BallOfFurReturn> BALL_OF_FUR_RETURN_ITEMS = new ArrayList<>();
// public static final List<TreasureChestLoot> TREASURE_CHEST_LOOT = new ArrayList<>();
//public static final List<LensConversionRecipe> RECONSTRUCTOR_LENS_CONVERSION_RECIPES = new ArrayList<>();
public static final List<EmpowererRecipe> EMPOWERER_RECIPES = new ArrayList<>(); public static final List<EmpowererRecipe> EMPOWERER_RECIPES = new ArrayList<>();
public static final List<ColorChangeRecipe> COLOR_CHANGE_RECIPES = new ArrayList<>(); public static final List<ColorChangeRecipe> COLOR_CHANGE_RECIPES = new ArrayList<>();
public static final List<SolidFuelRecipe> SOLID_FUEL_RECIPES = new ArrayList<>(); public static final List<SolidFuelRecipe> SOLID_FUEL_RECIPES = new ArrayList<>();
@ -177,52 +174,6 @@ public final class ActuallyAdditionsAPI {
public static boolean addCrusherRecipes(List<ItemStack> inputs, ItemStack outputOne, int outputOneAmount, ItemStack outputTwo, int outputTwoAmount, int outputTwoChance) { public static boolean addCrusherRecipes(List<ItemStack> inputs, ItemStack outputOne, int outputOneAmount, ItemStack outputTwo, int outputTwoAmount, int outputTwoChance) {
return methodHandler.addCrusherRecipes(inputs, outputOne, outputOneAmount, outputTwo, outputTwoAmount, 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) { 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)); EMPOWERER_RECIPES.add(new EmpowererRecipe(id, output, input, modifier1, modifier2, modifier3, modifier4, energyPerStand, time, particleColor));

25
src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java
View file

@ -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;
}
}

1
src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java
View file

@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
@Deprecated
public class CoffeeIngredient { public class CoffeeIngredient {
protected final Ingredient input; protected final Ingredient input;

56
src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java
View file

@ -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;
// }
//
//}

1
src/main/java/de/ellpeck/actuallyadditions/api/recipe/LensConversionRecipe.java
View file

@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
Mi@Deprecated
public class LensConversionRecipe { public class LensConversionRecipe {
protected final Ingredient input; protected final Ingredient input;

29
src/main/java/de/ellpeck/actuallyadditions/api/recipe/TreasureChestLoot.java
View file

@ -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;
// }
//
//}

60
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
View file

@ -13,66 +13,6 @@ package de.ellpeck.actuallyadditions.mod.crafting;
// TODO: [port] MOVE TO DATA_GENERATOR // TODO: [port] MOVE TO DATA_GENERATOR
@Deprecated @Deprecated
public final class ItemCrafting { public final class ItemCrafting {
//
// public static final ArrayList<IRecipe> RECIPES_POTION_RINGS = new ArrayList<>();
// public static final ArrayList<IRecipe> 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() { // public static void init() {
// //