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

Update mappings to stable_39-1.12 (#322)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/services/CompassService.java
+1 -1
View File
@@ -115,7 +115,7 @@ public final class CompassService {
final int hi_y = low_y + 32;
// lower level...
final Chunk c = w.getChunkFromChunkCoords(cx, cz);
final Chunk c = w.getChunk(cx, cz);
Optional<Block> maybeBlock = AEApi.instance().definitions().blocks().skyStoneBlock().maybeBlock();
if (maybeBlock.isPresent()) {
src/main/java/appeng/services/export/MinecraftItemCSVExporter.java
+4 -4
View File
@@ -147,7 +147,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();
@@ -199,7 +199,7 @@ final class MinecraftItemCSVExporter implements Exporter {
return null;
} 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();
@@ -212,7 +212,7 @@ final class MinecraftItemCSVExporter implements Exporter {
try {
input.getSubItems(creativeTab, stacks);
} 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
@@ -232,7 +232,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);