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/services/CompassService.java
+4 -4
View File
@@ -82,9 +82,9 @@ public final class CompassService
@SubscribeEvent
public void unloadWorld( final WorldEvent.Unload event )
{
if( Platform.isServer() && this.worldSet.containsKey( event.world ) )
if( Platform.isServer() && this.worldSet.containsKey( event.getWorld() ) )
{
final CompassReader compassReader = this.worldSet.remove( event.world );
final CompassReader compassReader = this.worldSet.remove( event.getWorld() );
compassReader.close();
}
@@ -141,7 +141,7 @@ public final class CompassService
{
for( int k = low_y; k < hi_y; k++ )
{
final Block blk = c.getBlock( i, k, j );
final Block blk = c.getBlockState( i, k, j ).getBlock();
if( blk == skyStoneBlock )
{
return this.executor.submit( new CMUpdatePost( w, cx, cz, cdy, true ) );
@@ -182,7 +182,7 @@ public final class CompassService
if( cr == null )
{
cr = new CompassReader( w.provider.getDimensionId(), this.worldCompassFolder );
cr = new CompassReader( w.provider.getDimension(), this.worldCompassFolder );
this.worldSet.put( w, cr );
}
src/main/java/appeng/services/export/MinecraftItemCSVExporter.java
+5 -5
View File
@@ -43,7 +43,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry;
import appeng.core.AELog;
@@ -171,7 +171,7 @@ final class MinecraftItemCSVExporter implements Exporter
final Item item = input.getItem();
final String unlocalizedItem = input.getUnlocalizedName();
final Block block = Block.getBlockFromItem( item );
final boolean isBlock = !block.equals( Blocks.air );
final boolean isBlock = !block.equals( Blocks.AIR );
final Class<? extends ItemStack> stackClass = input.getClass();
final String stackClassName = stackClass.getName();
@@ -193,7 +193,7 @@ final class MinecraftItemCSVExporter implements Exporter
private static final class ItemRowExtractFunction implements Function<Item, String>
{
/**
* this extension is required to apply the {@link StatCollector}
* this extension is required to apply the {@link I18n}
*/
private static final String LOCALIZATION_NAME_EXTENSION = ".name";
private static final String EXPORTING_NOTHING_MESSAGE = "Exporting nothing";
@@ -266,7 +266,7 @@ final class MinecraftItemCSVExporter implements Exporter
final List<String> joinedBlockAttributes = Lists.newArrayListWithCapacity( 5 );
final String unlocalizedItem = input.getUnlocalizedName();
final String localization = StatCollector.translateToLocal( unlocalizedItem + LOCALIZATION_NAME_EXTENSION );
final String localization = I18n.translateToLocal( unlocalizedItem + LOCALIZATION_NAME_EXTENSION );
joinedBlockAttributes.add( itemName );
joinedBlockAttributes.add( localization );
@@ -274,7 +274,7 @@ final class MinecraftItemCSVExporter implements Exporter
if( this.mode == ExportMode.VERBOSE )
{
final Block block = Block.getBlockFromItem( input );
final boolean isBlock = !block.equals( Blocks.air );
final boolean isBlock = !block.equals( Blocks.AIR );
final Class<? extends Item> itemClass = input.getClass();
final String itemClassName = itemClass.getName();