Update mappings to stable_39-1.12 (#322)

This commit is contained in:
zeng-git
2023-11-08 05:21:59 +08:00
committed by GitHub
parent ba9b790a02
commit 4484863452
88 changed files with 239 additions and 212 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ public abstract class AEBaseItem extends Item {
@Override
public String toString() {
String regName = this.getRegistryName() != null ? this.getRegistryName().getResourcePath() : "unregistered";
String regName = this.getRegistryName() != null ? this.getRegistryName().getPath() : "unregistered";
return this.getClass().getSimpleName() + "[" + regName + "]";
}
@@ -63,6 +63,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nonnull;
import java.util.*;
import java.util.Map.Entry;
import java.util.regex.Matcher;
@@ -209,7 +210,8 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
}
@Override
public String getUnlocalizedName(final ItemStack is) {
@Nonnull
public String getTranslationKey(final ItemStack is) {
return "item.appliedenergistics2.material." + this.nameOf(is).toLowerCase();
}
@@ -39,6 +39,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Optional;
@@ -70,7 +71,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal {
{
crystalSeedStack.setItemDamage(certus2);
crystalSeedStack = newStyle(crystalSeedStack);
String itemName = crystalSeedStack.getItem().getRegistryName().getResourcePath();
String itemName = crystalSeedStack.getItem().getRegistryName().getPath();
return new ResolverResult(itemName, crystalSeedStack.getItemDamage(), crystalSeedStack.getTagCompound());
})
.orElse(null);
@@ -154,22 +155,23 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal {
}
@Override
public String getUnlocalizedName(final ItemStack is) {
@Nonnull
public String getTranslationKey(final ItemStack is) {
final int damage = getProgress(is);
if (damage < CERTUS + SINGLE_OFFSET) {
return this.getUnlocalizedName() + ".certus";
return this.getTranslationKey() + ".certus";
}
if (damage < NETHER + SINGLE_OFFSET) {
return this.getUnlocalizedName() + ".nether";
return this.getTranslationKey() + ".nether";
}
if (damage < FLUIX + SINGLE_OFFSET) {
return this.getUnlocalizedName() + ".fluix";
return this.getTranslationKey() + ".fluix";
}
return this.getUnlocalizedName();
return this.getTranslationKey();
}
@Override
@@ -94,7 +94,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
}
final NonNullList<ItemStack> tmpList = NonNullList.create();
b.getSubBlocks(b.getCreativeTabToDisplayOn(), tmpList);
b.getSubBlocks(b.getCreativeTab(), tmpList);
for (final ItemStack l : tmpList) {
final ItemStack facade = this.createFacadeForItem(l, false);
if (!facade.isEmpty()) {
@@ -141,7 +141,8 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
}
@Override
public String getUnlocalizedName(final ItemStack is) {
@Nonnull
public String getTranslationKey(final ItemStack is) {
Preconditions.checkNotNull(is);
return "item.appliedenergistics2.multi_part." + this.getTypeByStack(is).getUnlocalizedName().toLowerCase();
}
@@ -80,7 +80,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
static {
for (final AEColor color : AEColor.VALID_COLORS) {
final String dyeName = color.dye.getUnlocalizedName();
final String dyeName = color.dye.getTranslationKey();
final String oreDictName = "dye" + WordUtils.capitalize(dyeName);
final int oreDictId = OreDictionary.getOreID(oreDictName);