aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2023-01-24 21:56:38 +0800
committerGitHub <noreply@github.com>2023-01-24 21:56:38 +0800
commit5e2e495125b089ff6bbffd2acb640c08d8e557af (patch)
treefb9e2d4532c31919fe9bf93406f960f4a6d5598c
parent1e6f0bf1147ddbb5fe0817a7c751f2635f3ee18b (diff)
parent9c34dab0a979327394144a4e719d1c6ad0c9eccd (diff)
downloadGT5-Unofficial-5e2e495125b089ff6bbffd2acb640c08d8e557af.tar.gz
GT5-Unofficial-5e2e495125b089ff6bbffd2acb640c08d8e557af.tar.bz2
GT5-Unofficial-5e2e495125b089ff6bbffd2acb640c08d8e557af.zip
Merge 9c34dab0a979327394144a4e719d1c6ad0c9eccd into 1e6f0bf1147ddbb5fe0817a7c751f2635f3ee18b
-rw-r--r--src/main/java/kekztech/KekzCore.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 7c0a3c7726..baf9ad5817 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -65,19 +65,18 @@ public class KekzCore {
List<FMLMissingMappingsEvent.MissingMapping> missingMappings = event.get();
// intentionally not a static final field to save a bit of ram.
- Set<String> removedBlocks = ImmutableSet.of(
- "kekztech_tfftcasingblock_block",
- "kekztech_tfftmultihatch_block",
- "kekztech_tfftstoragefieldblock1_block",
- "kekztech_tfftstoragefieldblock2_block",
- "kekztech_tfftstoragefieldblock3_block",
- "kekztech_tfftstoragefieldblock4_block",
- "kekztech_tfftstoragefieldblock5_block");
+ Set<String> removedStuff = ImmutableSet.of(
+ MODID + ":kekztech_tfftcasingblock_block",
+ MODID + ":kekztech_tfftmultihatch_block",
+ MODID + ":kekztech_tfftstoragefieldblock1_block",
+ MODID + ":kekztech_tfftstoragefieldblock2_block",
+ MODID + ":kekztech_tfftstoragefieldblock3_block",
+ MODID + ":kekztech_tfftstoragefieldblock4_block",
+ MODID + ":kekztech_tfftstoragefieldblock5_block");
for (FMLMissingMappingsEvent.MissingMapping mapping : missingMappings) {
- if (mapping.type == GameRegistry.Type.BLOCK) {
- if (removedBlocks.contains(mapping.name)) mapping.ignore();
- }
+ if (removedStuff.contains(mapping.name)) mapping.ignore();
+ else mapping.warn(); // we don't know what happened. probably warn the user.
}
}
}