fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First update pass (1/3) - ~1400 -> 82 errors

Browse Source 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/features/BlockDefinition.java
+1 -1
View File
@@ -30,7 +30,7 @@ import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import appeng.api.definitions.IBlockDefinition;
src/main/java/appeng/core/features/registries/GrinderRecipeManager.java
+12 -12
View File
@@ -53,24 +53,24 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
this.ingots = new HashMap<ItemStack, String>();
this.dusts = new HashMap<String, ItemStack>();
this.addOre( "Coal", new ItemStack( Items.coal ) );
this.addOre( "Charcoal", new ItemStack( Items.coal, 1, 1 ) );
this.addOre( "Coal", new ItemStack( Items.COAL ) );
this.addOre( "Charcoal", new ItemStack( Items.COAL, 1, 1 ) );
this.addOre( "NetherQuartz", new ItemStack( Blocks.quartz_ore ) );
this.addIngot( "NetherQuartz", new ItemStack( Items.quartz ) );
this.addOre( "NetherQuartz", new ItemStack( Blocks.QUARTZ_ORE ) );
this.addIngot( "NetherQuartz", new ItemStack( Items.QUARTZ ) );
this.addOre( "Gold", new ItemStack( Blocks.gold_ore ) );
this.addIngot( "Gold", new ItemStack( Items.gold_ingot ) );
this.addOre( "Gold", new ItemStack( Blocks.GOLD_ORE ) );
this.addIngot( "Gold", new ItemStack( Items.GOLD_INGOT ) );
this.addOre( "Iron", new ItemStack( Blocks.iron_ore ) );
this.addIngot( "Iron", new ItemStack( Items.iron_ingot ) );
this.addOre( "Iron", new ItemStack( Blocks.IRON_ORE ) );
this.addIngot( "Iron", new ItemStack( Items.IRON_INGOT ) );
this.addOre( "Obsidian", new ItemStack( Blocks.obsidian ) );
this.addOre( "Obsidian", new ItemStack( Blocks.OBSIDIAN ) );
this.addIngot( "Ender", new ItemStack( Items.ender_pearl ) );
this.addIngot( "EnderPearl", new ItemStack( Items.ender_pearl ) );
this.addIngot( "Ender", new ItemStack( Items.ENDER_PEARL ) );
this.addIngot( "EnderPearl", new ItemStack( Items.ENDER_PEARL ) );
this.addIngot( "Wheat", new ItemStack( Items.wheat ) );
this.addIngot( "Wheat", new ItemStack( Items.WHEAT ) );
OreDictionaryHandler.INSTANCE.observe( this );
}
src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo
public MatterCannonAmmoRegistry()
{
OreDictionaryHandler.INSTANCE.observe( this );
this.registerAmmo( new ItemStack( Items.gold_nugget ), 196.96655 );
this.registerAmmo( new ItemStack( Items.GOLD_NUGGET ), 196.96655 );
}
@Override
src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+20 -20
View File
@@ -54,23 +54,23 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
/**
* light!
*/
this.addNewAttunement( new ItemStack( Blocks.torch ), TunnelType.LIGHT );
this.addNewAttunement( new ItemStack( Blocks.glowstone ), TunnelType.LIGHT );
this.addNewAttunement( new ItemStack( Blocks.TORCH ), TunnelType.LIGHT );
this.addNewAttunement( new ItemStack( Blocks.GLOWSTONE ), TunnelType.LIGHT );
/**
* attune based on most redstone base items.
*/
this.addNewAttunement( new ItemStack( Items.redstone ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Items.repeater ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.redstone_lamp ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.unpowered_comparator ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.powered_comparator ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.powered_repeater ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.unpowered_repeater ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.daylight_detector ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.redstone_wire ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.redstone_block ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.lever ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Items.REDSTONE ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Items.REPEATER ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.REDSTONE_LAMP ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.UNPOWERED_COMPARATOR ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.POWERED_COMPARATOR ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.POWERED_REPEATER ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.UNPOWERED_REPEATER ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.DAYLIGHT_DETECTOR ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.REDSTONE_WIRE ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.REDSTONE_BLOCK ), TunnelType.REDSTONE );
this.addNewAttunement( new ItemStack( Blocks.LEVER ), TunnelType.REDSTONE );
this.addNewAttunement( this.getModItem( "EnderIO", "itemRedstoneConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.REDSTONE );
/**
@@ -86,9 +86,9 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
this.addNewAttunement( parts.importBus(), TunnelType.ITEM );
this.addNewAttunement( parts.exportBus(), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.hopper ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.chest ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.trapped_chest ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.HOPPER ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.CHEST ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.TRAPPED_CHEST ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "ExtraUtilities", "extractor_base", 0 ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "Mekanism", "PartTransmitter", 9 ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "EnderIO", "itemItemConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.ITEM );
@@ -97,10 +97,10 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
/**
* attune based on lots of random item related stuff
*/
this.addNewAttunement( new ItemStack( Items.bucket ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.lava_bucket ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.milk_bucket ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.water_bucket ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.BUCKET ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.LAVA_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.MILK_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.WATER_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "Mekanism", "MachineBlock2", 11 ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "Mekanism", "PartTransmitter", 4 ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "ExtraUtilities", "extractor_base", 6 ), TunnelType.FLUID );
src/main/java/appeng/core/features/registries/WorldGenRegistry.java
+2 -2
View File
@@ -96,8 +96,8 @@ public final class WorldGenRegistry implements IWorldGen
}
final boolean isBadProvider = this.types[type.ordinal()].badProviders.contains( w.provider.getClass() );
final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains( w.provider.getDimensionId() );
final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains( w.provider.getDimensionId() );
final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains( w.provider.getDimension() );
final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains( w.provider.getDimension() );
if( isBadProvider || isBadDimension )
{