API cleanups (#3155)

* Remove obsolete api and fix some warning
* Move MEMonitorHandler to internal code and fix some warnings
* Rename exceptions to conform to naming scheme
This commit is contained in:
fscan
2017-10-14 14:15:28 +02:00
committed by yueh
parent 905dd6c888
commit 4f07b63b13
77 changed files with 298 additions and 398 deletions
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.exceptions.MissingDefinitionException;
import appeng.client.render.effects.ChargedOreFX;
import appeng.core.AEConfig;
import appeng.core.AppEng;
@@ -53,7 +53,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre
.materials()
.certusQuartzCrystalCharged()
.maybeItem()
.orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
.orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
}
@Override
@@ -64,7 +64,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre
.materials()
.certusQuartzCrystalCharged()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
.orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
.getItemDamage();
}
@@ -31,7 +31,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.api.exceptions.MissingDefinitionException;
import appeng.block.AEBaseBlock;
@@ -98,7 +98,7 @@ public class BlockQuartzOre extends AEBaseBlock
.materials()
.certusQuartzCrystal()
.maybeItem()
.orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) );
.orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) );
}
@Override
@@ -122,7 +122,7 @@ public class BlockQuartzOre extends AEBaseBlock
.materials()
.certusQuartzCrystal()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) )
.orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) )
.getItemDamage();
}