Merge commit 'd48b5495615cafbac23ef6f60151f24d68161bae' into 2.9

Author: tier940

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.3.0
+- Separate Electric Implosion Compressor changes to [ImplosionNoBomb](https://www.curseforge.com/minecraft/mc-mods/implosionnobomb)
+    - Thanks to @MrKono for his support!!
+
+* * *
+
 # v2.2.14
 ## Ender IO
 - Fix Black Paper

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gtexpert
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.2.14-beta
+modVersion = 2.3.0-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

src/main/java/gtexpert/mixins/GTEMixinLoader.java

@@ -1,62 +1,62 @@
-package gtexpert.mixins;
-
-import java.util.AbstractMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import net.minecraftforge.fml.common.Loader;
-
-import gtexpert.api.GTEValues;
-import gtexpert.api.util.GTELog;
-import gtexpert.api.util.Mods;
-
-import zone.rong.mixinbooter.ILateMixinLoader;
-
-public class GTEMixinLoader implements ILateMixinLoader {
-
-    public static final Map<String, Boolean> modMixinsConfig = Stream.of(
-            new AbstractMap.SimpleImmutableEntry<>(Mods.Names.DRACONIC_ADDITIONS,
-                    Mods.DraconicAdditions.isModLoaded()))
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-    @Override
-    public List<String> getMixinConfigs() {
-        return modMixinsConfig.keySet().stream().map(mod -> "mixins." + GTEValues.MODID + "." + mod + ".json")
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public boolean shouldMixinConfigQueue(String mixinConfig) {
-        String[] parts = mixinConfig.split("\\.");
-
-        if (parts.length != 4) {
-            GTELog.logger.fatal("Mixin Config Check Failed! Invalid Length.");
-            GTELog.logger.fatal("Mixin Config: " + mixinConfig);
-            return true;
-        }
-
-        if (!Objects.equals(parts[1], GTEValues.MODID)) {
-            GTELog.logger.error("Non GTExpertCore Mixin Found in Mixin Queue. This is probably an error. Skipping...");
-            GTELog.logger.error("Mixin Config: " + mixinConfig);
-            return true;
-        }
-
-        if (!Loader.isModLoaded(parts[2])) {
-            GTELog.logger.error("Mod '" + parts[2] +
-                    "' is not loaded. If this is a normal GTExpertCore instance, this is probably an error.");
-            GTELog.logger.error("Not Loading Mixin Config " + mixinConfig);
-            return false;
-        }
-
-        if (!modMixinsConfig.containsKey(parts[2]) || !modMixinsConfig.get(parts[2])) {
-            GTELog.logger.info("Integration for Mod '" + parts[2] + "' is not enabled, or does not exist.");
-            GTELog.logger.info("Not Loading Mixin Config " + mixinConfig);
-            return false;
-        }
-
-        return true;
-    }
-}
+package gtexpert.mixins;
+
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import net.minecraftforge.fml.common.Loader;
+
+import gtexpert.api.GTEValues;
+import gtexpert.api.util.GTELog;
+import gtexpert.api.util.Mods;
+
+import zone.rong.mixinbooter.ILateMixinLoader;
+
+public class GTEMixinLoader implements ILateMixinLoader {
+
+    public static final Map<String, Boolean> modMixinsConfig = Stream.of(
+            new AbstractMap.SimpleImmutableEntry<>(Mods.Names.DRACONIC_ADDITIONS,
+                    Mods.DraconicAdditions.isModLoaded()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+    @Override
+    public List<String> getMixinConfigs() {
+        return modMixinsConfig.keySet().stream().map(mod -> "mixins." + GTEValues.MODID + "." + mod + ".json")
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public boolean shouldMixinConfigQueue(String mixinConfig) {
+        String[] parts = mixinConfig.split("\\.");
+
+        if (parts.length != 4) {
+            GTELog.logger.fatal("Mixin Config Check Failed! Invalid Length.");
+            GTELog.logger.fatal("Mixin Config: " + mixinConfig);
+            return true;
+        }
+
+        if (!Objects.equals(parts[1], GTEValues.MODID)) {
+            GTELog.logger.error("Non GTExpertCore Mixin Found in Mixin Queue. This is probably an error. Skipping...");
+            GTELog.logger.error("Mixin Config: " + mixinConfig);
+            return true;
+        }
+
+        if (!Loader.isModLoaded(parts[2])) {
+            GTELog.logger.error("Mod '" + parts[2] +
+                    "' is not loaded. If this is a normal GTExpertCore instance, this is probably an error.");
+            GTELog.logger.error("Not Loading Mixin Config " + mixinConfig);
+            return false;
+        }
+
+        if (!modMixinsConfig.containsKey(parts[2]) || !modMixinsConfig.get(parts[2])) {
+            GTELog.logger.info("Integration for Mod '" + parts[2] + "' is not enabled, or does not exist.");
+            GTELog.logger.info("Not Loading Mixin Config " + mixinConfig);
+            return false;
+        }
+
+        return true;
+    }
+}

src/main/resources/assets/gtexpert/lang/en_us.lang

@@ -237,7 +237,6 @@ recipemap.draconic_fusion_upgrade.property.1=Preserves upgrade info
 recipemap.draconic_fusion_upgrade.property.2= and stored energy
 recipemap.advanced_chemical_plant.name=Advanced Chemical Plant
 recipemap.large_gas_collector.name=Large Gas Collector
-recipemap.electric_implosion_compressor.name=Electric Implosion Compressor
 recipemap.steam_mixer.name=Steam Mixer
 recipemap.steam_assembler.name=Steam Assembler
 recipemap.steam_circuit_assembler.name=Steam Circuit Assembler

src/main/resources/assets/gtexpert/lang/ja_jp.lang

@@ -237,7 +237,6 @@ recipemap.draconic_fusion_upgrade.property.1=アップグレードの状態と
 recipemap.draconic_fusion_upgrade.property.2= 保持されます
 recipemap.advanced_chemical_plant.name=発展型化学プラント
 recipemap.large_gas_collector.name=大型ガス収集機
-recipemap.electric_implosion_compressor.name=電動内破圧縮機
 recipemap.steam_mixer.name=蒸気式ミキサー
 recipemap.steam_assembler.name=蒸気式組立機
 recipemap.steam_circuit_assembler.name=蒸気式回路作成機