This commit is contained in:
Jeremy Diamond committed 2015-08-15 01:17:06 -07:00
1 parent 37c92016a7
commit 9d14de583e
5 files changed
+66 -5

No files matched your search

@@ -13,6 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.avaritia.achievements.Achievements;
import fox.spiteful.avaritia.blocks.LudicrousBlocks;
import fox.spiteful.avaritia.compat.Compat;
import fox.spiteful.avaritia.crafting.Gregorizer;
import fox.spiteful.avaritia.crafting.Grinder;
import fox.spiteful.avaritia.crafting.Mincer;
import fox.spiteful.avaritia.entity.LudicrousEntities;
@@ -74,6 +75,7 @@ public class Avaritia {
@EventHandler
public void endGame(FMLPostInitializationEvent event){
Compat.compatify();
Gregorizer.balance();
if(Config.craftingOnly)
return;
Mincer.countThoseCalories();
@@ -141,7 +141,8 @@ public class CompressionHandler extends TemplateRecipeHandler
@SideOnly(Side.CLIENT)
@Override
public void drawForeground(int recipe){
fontRender.drawString(((CachedCompression)arecipes.get(recipe)).getCost() + "", 36, 38, 4210752);
super.drawForeground(recipe);
fontRender.drawString(((CachedCompression)arecipes.get(recipe)).getCost() + "", 50, 38, 4210752);
}
@Override
@@ -9,11 +9,15 @@ public class CompressOreRecipe extends CompressorRecipe {
private int oreID;
public CompressOreRecipe(ItemStack output, int amount, String lex){
super(output, amount, null);
public CompressOreRecipe(ItemStack output, int amount, String lex, boolean exact){
super(output, amount, null, exact);
oreID = OreDictionary.getOreID(lex);
}
public CompressOreRecipe(ItemStack output, int amount, String lex){
this(output, amount, lex, false);
}
@Override
public boolean validInput(ItemStack ingredient){
@@ -7,11 +7,17 @@ public class CompressorRecipe {
private ItemStack product;
private int cost;
private ItemStack input;
private boolean specific;
public CompressorRecipe(ItemStack output, int amount, ItemStack ingredient){
public CompressorRecipe(ItemStack output, int amount, ItemStack ingredient, boolean exact){
product = output;
cost = amount;
input = ingredient;
specific = exact;
}
public CompressorRecipe(ItemStack output, int amount, ItemStack ingredient){
this(output, amount, ingredient, false);
}
public ItemStack getOutput(){
@@ -19,7 +25,10 @@ public class CompressorRecipe {
}
public int getCost(){
return cost;
if(specific)
return cost;
else
return Gregorizer.balanceCost(cost);
}
public boolean validInput(ItemStack ingredient){
@@ -0,0 +1,45 @@
package fox.spiteful.avaritia.crafting;
import cpw.mods.fml.common.Loader;
public class Gregorizer {
public static int modifier = 0;
public static int multiplier = 1;
public static void balance(){
if(Loader.isModLoaded("magicalcrops"))
multiplier += 3;
if(Loader.isModLoaded("MineFactoryReloaded"))
multiplier += 1;
if(Loader.isModLoaded("BigReactors"))
modifier += 100;
if(Loader.isModLoaded("ProjectE"))
multiplier += 9;
if(Loader.isModLoaded("EE3"))
multiplier += 9;
if(Loader.isModLoaded("Botania"))
modifier += 50;
if(Loader.isModLoaded("IC2"))
modifier += 300;
if(Loader.isModLoaded("ThermalExpansion"))
modifier += 300;
if(Loader.isModLoaded("technom"))
modifier += 500;
if(Loader.isModLoaded("ExtraUtilities"))
modifier += 100;
if(Loader.isModLoaded("Thaumcraft"))
modifier += 100;
if(Loader.isModLoaded("appliedenergistics2"))
modifier += 200;
if(Loader.isModLoaded("gregtech"))
multiplier += 3;
if(Loader.isModLoaded("TSteelworks"))
modifier += 300;
}
public static int balanceCost(int cost){
return (cost + modifier) * multiplier;
}
}