From b611d4d235245f5703e16664a0161b4a8b9a9e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Sat, 25 Jun 2016 08:27:13 +0200 Subject: [PATCH] Alloys won't provide XP --- TODO.txt | 1 - src/java/mmm/materials/MAlloyRecipe.java | 21 ++++----------------- src/java/mmm/materials/Materials.java | 4 ++-- src/java/mmm/tech/base/TechBase.java | 5 ++--- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/TODO.txt b/TODO.txt index f54670f..2a04033 100644 --- a/TODO.txt +++ b/TODO.txt @@ -41,7 +41,6 @@ materials.ores No Tin materials.ores No Zinc ------------------------------------------------------------------------------------------------------- tech.base No Alloy furnace - -> XP -> let output hoppers take empty buckets / invalid input (make that configurable) -> comparator signal configuration diff --git a/src/java/mmm/materials/MAlloyRecipe.java b/src/java/mmm/materials/MAlloyRecipe.java index 9af085f..6c01d7b 100644 --- a/src/java/mmm/materials/MAlloyRecipe.java +++ b/src/java/mmm/materials/MAlloyRecipe.java @@ -54,7 +54,6 @@ public class MAlloyRecipe { private ResourceLocation name; private int burnTime; - private float xp; private ItemStack output; private int slag; private final ItemStack[] inputs = new ItemStack[ MAlloyRecipe.MAX_ALLOY_INPUTS ]; @@ -84,16 +83,6 @@ public class MAlloyRecipe } - public MAlloyRecipe.Builder setExperience( final float xp ) - { - if ( xp < 0 ) { - throw new IllegalArgumentException( "invalid experience" ); - } - this.xp = xp; - return this; - } - - public MAlloyRecipe.Builder setOutput( final Item item ) { this.output = new ItemStack( item ); @@ -202,8 +191,8 @@ public class MAlloyRecipe inputs[ i ] = this.inputs[ i ].copy( ); } - final MAlloyRecipe recipe = new MAlloyRecipe( this.name , this.burnTime , this.xp , this.slag , - this.output.copy( ) , inputs ); + final MAlloyRecipe recipe = new MAlloyRecipe( this.name , this.burnTime , this.slag , this.output.copy( ) , + inputs ); registry.byName.put( this.name , recipe ); registry.list.add( recipe ); this.name = null; @@ -231,18 +220,16 @@ public class MAlloyRecipe public final ResourceLocation name; public final int burnTime; - public final float xp; public final int slag; public final ItemStack output; public final ItemStack[] inputs; - private MAlloyRecipe( final ResourceLocation name , final int burnTime , final float xp , final int slag , - final ItemStack output , final ItemStack[] inputs ) + private MAlloyRecipe( final ResourceLocation name , final int burnTime , final int slag , final ItemStack output , + final ItemStack[] inputs ) { this.name = name; this.burnTime = burnTime; - this.xp = xp; this.slag = slag; this.output = output; this.inputs = inputs; diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 5b14b27..7b44532 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -89,8 +89,8 @@ public class Materials public void registerRecipes( ) { // Alloy recipes - MAlloyRecipe.build( ).setName( "materials/coke" ).setBurnTime( 3200 ).setExperience( 0.1f ) - .addInput( Items.COAL , 2 ).setOutput( ITEM_COKE ).setSlag( 1 ).register( ); + MAlloyRecipe.build( ).setName( "materials/coke" ).setBurnTime( 3200 ).addInput( Items.COAL , 2 ) + .setOutput( ITEM_COKE ).setSlag( 1 ).register( ); } } diff --git a/src/java/mmm/tech/base/TechBase.java b/src/java/mmm/tech/base/TechBase.java index bd0f21f..f21a39e 100644 --- a/src/java/mmm/tech/base/TechBase.java +++ b/src/java/mmm/tech/base/TechBase.java @@ -32,9 +32,8 @@ public class TechBase URegistry.addServerMessage( TBAlloyFurnaceMessage.class ); // FIXME test, remove this later - MAlloyRecipe.build( ).setName( "test" ).setBurnTime( 50 ).setExperience( .05f ).setSlag( 1 ) - .setOutput( Items.COOKED_CHICKEN , 10 ).addInput( Items.COOKED_BEEF ).addInput( Items.COOKED_PORKCHOP ) - .register( ); + MAlloyRecipe.build( ).setName( "test" ).setBurnTime( 50 ).setSlag( 1 ).setOutput( Items.COOKED_CHICKEN , 10 ) + .addInput( Items.COOKED_BEEF ).addInput( Items.COOKED_PORKCHOP ).register( ); }