diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 4364821..4e489e6 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -14,6 +14,7 @@ import fox.spiteful.avaritia.achievements.Achievements; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.Grinder; +import fox.spiteful.avaritia.crafting.Mincer; import fox.spiteful.avaritia.gui.GooeyHandler; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.creativetab.CreativeTabs; @@ -64,6 +65,7 @@ public class Avaritia { @EventHandler public void endGame(FMLPostInitializationEvent event){ Compat.compatify(); + Mincer.countThoseCalories(); Achievements.achieve(); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/Lumberjack.java b/src/main/java/fox/spiteful/avaritia/Lumberjack.java index b98fea8..70925be 100644 --- a/src/main/java/fox/spiteful/avaritia/Lumberjack.java +++ b/src/main/java/fox/spiteful/avaritia/Lumberjack.java @@ -7,12 +7,16 @@ public class Lumberjack { public static final Logger logger = LogManager.getLogger("Avaritia"); - public static void log(Level level, Throwable e, String message) { + public static void log(Level level, Throwable e, Object message) { log(level, message); e.printStackTrace(); } - public static void log(Level level, String message) { + public static void log(Level level, Object message) { logger.log(level, message); } + + public static void info(Object message) { + log(Level.INFO, message); + } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 9f48dad..38868c0 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -60,7 +60,8 @@ public class Grinder { new ItemStack(Blocks.emerald_block, 1), new ItemStack(LudicrousItems.singularity, 1, 0), new ItemStack(LudicrousItems.singularity, 1, 1), new ItemStack(LudicrousItems.singularity, 1, 2), new ItemStack(LudicrousItems.singularity, 1, 3), - new ItemStack(LudicrousItems.singularity, 1, 4)}); + new ItemStack(LudicrousItems.singularity, 1, 4), new ItemStack(LudicrousItems.ultimate_stew), + new ItemStack(LudicrousItems.cosmic_meatballs)}); ItemStack result = new ItemStack(LudicrousItems.infinity_pickaxe, 1); result.addEnchantment(Enchantment.fortune, 10); diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java new file mode 100644 index 0000000..ebbb7a0 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java @@ -0,0 +1,266 @@ +package fox.spiteful.avaritia.crafting; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Random; + +import fox.spiteful.avaritia.Lumberjack; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +public class Mincer { + // here's where all the food magic goes on + private static String[] sacredCropNames = new String[]{"cropWheat", "cropCarrot", "cropPotato", "cropApple", "cropMelon", "cropPumpkin"}; + private static String[] knownMeatEntries = new String[]{"nuggetMeat", "ingotMeat", "dustMeat"}; + private static List knownMeats = new ArrayList(); + static { + knownMeats.add(new ItemStack(Items.beef)); + knownMeats.add(new ItemStack(Items.chicken)); + knownMeats.add(new ItemStack(Items.porkchop)); + + /*for (int i=0; i rawCrops = new ArrayList(); + List crops = new ArrayList(); + List meatNames = new ArrayList(); + List rawMeats = new ArrayList(); + List meats = new ArrayList(); + + String orename; + for (int i=0; i cropSortingList = new ArrayList(); + randy = new Random(12345); + + for (int i=0; i ores = OreDictionary.getOres(rawCrops.get(i)); + + if (ores.size() > 0) { + cropSortingList.add(new FoodInfo(rawCrops.get(i), ores.size())); + } + } + + //Lumberjack.info("pre-sort: "+cropSortingList); + + // sort into size/alphabetic order first to standardise them + Collections.sort(cropSortingList, new Comparator(){ + @Override + public int compare(FoodInfo a, FoodInfo b) { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; + } + + return a.orename.compareTo(b.orename); + } + }); + + //Lumberjack.info("first sort: "+cropSortingList); + + // sort into size/random order, should be deterministic because previous sort + Collections.sort(cropSortingList, new Comparator(){ + @Override + public int compare(FoodInfo a, FoodInfo b) { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; + } + + return randy.nextBoolean() ? 1 : -1; + } + }); + + //Lumberjack.info("second sort: "+cropSortingList); + + // CULL! + + if (cropSortingList.size() > 80 - crops.size()) { + int shouldHave = 80 - crops.size(); + cropSortingList = cropSortingList.subList(0, shouldHave); + } + for (int i=0; i stewInputs = stewRecipe.getInput(); + for (int i=0; i meatSortingList = new ArrayList(); + randy = new Random(54321); + + for (int i=0; i meatstacks = OreDictionary.getOres(knownMeatEntries[i]); + if (!meatstacks.isEmpty()) { + rawMeats.add(knownMeatEntries[i]); + meatSortingList.add(new FoodInfo(knownMeatEntries[i], meatstacks.size())); + } + } + } + + for (int i=0; i meatstacks = OreDictionary.getOres(meatNames.get(i)); + if (!meatstacks.isEmpty()) { + meatSortingList.add(new FoodInfo(meatNames.get(i), meatstacks.size())); + } + } + } + + Lumberjack.info("rawMeats: "+rawMeats); + Lumberjack.info("knownMeats: "+knownMeats); + + //Lumberjack.info("pre-sort: "+meatSortingList); + + // sort into size/alphabetic order first to standardise them + Collections.sort(meatSortingList, new Comparator(){ + @Override + public int compare(FoodInfo a, FoodInfo b) { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; + } + + return a.orename.compareTo(b.orename); + } + }); + + //Lumberjack.info("first sort: "+meatSortingList); + + // sort into size/random order, should be deterministic because previous sort + Collections.sort(meatSortingList, new Comparator(){ + @Override + public int compare(FoodInfo a, FoodInfo b) { + if (a.count != b.count) { + return b.count > a.count ? 1 : -1; + } + + return randy.nextBoolean() ? 1 : -1; + } + }); + + //Lumberjack.info("second sort: "+meatSortingList); + + // CULL! + + if (meatSortingList.size() > 80 - meats.size() - knownMeats.size()) { + int shouldHave = 80 - crops.size() - knownMeats.size(); + meatSortingList = meatSortingList.subList(0, shouldHave); + } + for (int i=0; i meatballInputs = meatballRecipe.getInput(); + + for (int i=0; i