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

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/services/VersionChecker.java
+2 -2
View File
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.event.FMLInterModComms;
@@ -179,7 +179,7 @@ public final class VersionChecker implements Runnable
{
if( Loader.isModLoaded( "VersionChecker" ) )
{
final NBTTagCompound versionInf = new NBTTagCompound();
final CompoundNBT versionInf = new CompoundNBT();
versionInf.setString( "modDisplayName", AppEng.MOD_NAME );
versionInf.setString( "oldVersion", modFormatted );
versionInf.setString( "newVersion", ghFormatted );
src/main/java/appeng/services/export/MinecraftItemCSVExporter.java
+5 -5
View File
@@ -40,7 +40,7 @@ import org.apache.commons.io.FileUtils;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.block.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -168,7 +168,7 @@ final class MinecraftItemCSVExporter implements Exporter
if( this.mode == ExportMode.VERBOSE )
{
final Item item = input.getItem();
final String unlocalizedItem = input.getUnlocalizedName();
final String unlocalizedItem = input.getTranslationKey();
final Block block = Block.getBlockFromItem( item );
final boolean isBlock = block != Blocks.AIR && !block.equals( Blocks.AIR );
final Class<? extends ItemStack> stackClass = input.getClass();
@@ -226,7 +226,7 @@ final class MinecraftItemCSVExporter implements Exporter
}
else
{
AELog.debug( EXPORTING_SUBTYPES_MESSAGE, input.getUnlocalizedName(), input.getHasSubtypes() );
AELog.debug( EXPORTING_SUBTYPES_MESSAGE, input.getTranslationKey(), input.getHasSubtypes() );
}
final String itemName = ForgeRegistries.ITEMS.getKey( input ).toString();
@@ -243,7 +243,7 @@ final class MinecraftItemCSVExporter implements Exporter
}
catch( final Exception ignored )
{
AELog.warn( EXPORTING_SUBTYPES_FAILED_MESSAGE, input.getUnlocalizedName() );
AELog.warn( EXPORTING_SUBTYPES_FAILED_MESSAGE, input.getTranslationKey() );
AELog.debug( ignored );
// ignore if mods do bullshit in their code
@@ -264,7 +264,7 @@ final class MinecraftItemCSVExporter implements Exporter
}
final List<String> joinedBlockAttributes = Lists.newArrayListWithCapacity( 5 );
final String unlocalizedItem = input.getUnlocalizedName();
final String unlocalizedItem = input.getTranslationKey();
final String localization = I18n.translateToLocal( unlocalizedItem + LOCALIZATION_NAME_EXTENSION );
joinedBlockAttributes.add( itemName );