From 4381be10ea4dddba844ad13fbc83bc402e5963e0 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 12 Mar 2019 12:23:20 -0600 Subject: [PATCH] Dss mekanica rename (#50) Introduce mekanica rename --- Dockerfile | 4 +- Makefile | 10 +- README.md | 98 ++- build.gradle | 60 +- etc/core/mcmod.info | 48 +- etc/generators/mcmod.info | 45 +- etc/tools/mcmod.info | 45 +- .../java/mekanism/client/HolidayManager.java | 6 +- .../mekanism/client/MekanismKeyHandler.java | 11 +- .../client/jei/BaseRecipeCategory.java | 3 +- .../client/render/MekanismRenderer.java | 1 + .../mekanism/client/sound/SoundHandler.java | 2 +- .../java/mekanism/common/CommandMekanism.java | 15 +- .../java/mekanism/common/CommonProxy.java | 10 +- .../common/CommonWorldTickHandler.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 39 +- .../java/mekanism/common/MekanismBlocks.java | 5 +- .../java/mekanism/common/MekanismItems.java | 5 +- .../java/mekanism/common/MekanismSounds.java | 2 +- .../common/entity/EntityBabySkeleton.java | 3 +- .../common/integration/IMCHandler.java | 22 +- .../common/integration/TOPProvider.java | 3 +- .../crafttweaker/CrafttweakerIntegration.java | 2 +- .../handlers/ChemicalCrystallizer.java | 3 +- .../handlers/ChemicalDissolution.java | 3 +- .../handlers/ChemicalInfuser.java | 3 +- .../handlers/ChemicalInjection.java | 3 +- .../handlers/ChemicalOxidizer.java | 3 +- .../crafttweaker/handlers/ChemicalWasher.java | 3 +- .../crafttweaker/handlers/Combiner.java | 3 +- .../crafttweaker/handlers/Compressor.java | 3 +- .../crafttweaker/handlers/Crusher.java | 3 +- .../handlers/EnergizedSmelter.java | 3 +- .../crafttweaker/handlers/Enrichment.java | 3 +- .../crafttweaker/handlers/Infuser.java | 3 +- .../crafttweaker/handlers/Purification.java | 3 +- .../crafttweaker/handlers/Reaction.java | 3 +- .../crafttweaker/handlers/Sawmill.java | 3 +- .../crafttweaker/handlers/Separator.java | 3 +- .../handlers/SolarNeutronActivator.java | 3 +- .../handlers/ThermalEvaporation.java | 3 +- .../common/item/ItemAtomicDisassembler.java | 4 +- .../common/item/ItemConfigurationCard.java | 7 +- .../common/item/ItemConfigurator.java | 9 +- .../mekanism/common/item/ItemDictionary.java | 4 +- .../common/item/ItemNetworkReader.java | 7 +- .../common/item/ItemPortableTeleporter.java | 3 +- .../common/item/ItemSeismicReader.java | 4 +- .../common/recipe/ShapedMekanismRecipe.java | 11 +- .../recipe/ShapelessMekanismRecipe.java | 8 +- .../generation/MekanismGeneratorRecipes.java | 83 --- .../recipe/generation/MekanismRecipes.java | 634 ------------------ .../generation/MekanismToolsRecipes.java | 185 ----- .../recipe/generation/RecipeGenerator.java | 252 ------- .../common/tile/TileEntityBoilerCasing.java | 1 - .../common/tile/TileEntityChanceMachine.java | 3 +- .../common/tile/TileEntityChargepad.java | 10 - .../common/tile/TileEntityDynamicTank.java | 3 - .../common/tile/TileEntityElectricPump.java | 10 +- .../common/tile/TileEntityFactory.java | 3 +- .../tile/TileEntityFluidicPlenisher.java | 11 +- .../TileEntityFormulaicAssemblicator.java | 3 +- .../common/tile/TileEntityGasTank.java | 1 + .../common/tile/TileEntityInductionPort.java | 5 +- .../tile/TileEntityMetallurgicInfuser.java | 3 +- .../mekanism/common/tile/TileEntityPRC.java | 3 +- .../tile/prefab/TileEntityBasicBlock.java | 4 +- .../TileEntityDoubleElectricMachine.java | 3 +- .../prefab/TileEntityElectricMachine.java | 3 +- .../tile/prefab/TileEntityNoisyBlock.java | 3 +- .../TileEntityDiversionTransporter.java | 5 +- .../TileEntityLogisticalTransporter.java | 4 +- .../tile/transmitter/TileEntitySidedPipe.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 5 - .../mekanism/common/util/SecurityUtils.java | 2 +- .../common/util/TransporterUtils.java | 3 +- .../render/item/BakedGeneratorItemModel.java | 2 - .../generators/common/GeneratorsBlocks.java | 5 +- .../generators/common/GeneratorsItems.java | 5 +- .../generators/common/MekanismGenerators.java | 8 +- .../common/tile/TileEntityGasGenerator.java | 1 - .../common/tile/TileEntityGenerator.java | 4 +- .../reactor/TileEntityReactorController.java | 2 - .../tile/reactor/TileEntityReactorPort.java | 5 +- .../tile/turbine/TileEntityTurbineCasing.java | 3 - .../tile/turbine/TileEntityTurbineValve.java | 1 - .../mekanism/tools/common/MekanismTools.java | 10 +- .../mekanism/tools/common/ToolsItems.java | 5 +- src/main/resources/mcmod.info | 130 ++-- 89 files changed, 414 insertions(+), 1563 deletions(-) delete mode 100644 src/main/java/mekanism/common/recipe/generation/MekanismGeneratorRecipes.java delete mode 100644 src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java delete mode 100644 src/main/java/mekanism/common/recipe/generation/MekanismToolsRecipes.java delete mode 100644 src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java diff --git a/Dockerfile b/Dockerfile index db03c76c1..38f4d953a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,5 +10,5 @@ COPY gradle/ /tmp/gradle/ COPY build.gradle build.properties gradle* /tmp/ RUN (cd /tmp && ./gradlew setupCiWorkspace build) -RUN mkdir /mekanism -COPY . /mekanism +RUN mkdir /mekanica +COPY . /mekanica diff --git a/Makefile b/Makefile index 6f7a2fc90..06fcf377e 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,12 @@ clean: rm -rf build .gradle .idea run out *.iml *.ipr *.iws rel: - docker build -t mekanism . - docker run -a stdin -a stdout -a stderr -e CF_API_TOKEN -w /mekanism -it mekanism make docker.rel + docker build -t mekanica . + docker run -a stdin -a stdout -a stderr -e CF_API_TOKEN -w /mekanica -it mekanica make docker.rel docker.rel: python3 release.py \ - -project=315844:MekanismDz: \ - -project=315908:MekanismDzGenerators:mekanism-dz-edition \ - -project=315907:MekanismDzTools:mekanism-dz-edition \ + -project=315844:mekanica: \ + -project=315908:mekanica-generators:mekanica \ + -project=315907:mekanica-tools:mekanica \ -mcvsn 1.12.2 -rel release diff --git a/README.md b/README.md index 791f07496..b23e95e53 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,62 @@ -[![Build Status](https://travis-ci.org/aidancbrady/Mekanism.svg?branch=master)](https://travis-ci.org/aidancbrady/Mekanism) - -# Mekanism for Minecraft 1.12 # - -[**Official Website**](http://aidancbrady.com/mekanism/) - -Source code. More information can be found on the [mod's forum post](http://www.minecraftforum.net/topic/1361286-164-mekanism-557-universal-cable-dynamic-tanks-wind-power/). - -# About # - -Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools, armor, and weapons. - -# Modpacks, websites, reviews, or anything else # - -Some people really don't like others to review or distribute their mods, something which I honestly don't understand. You are the ones who help get this mod into the Minecraft community's hands, which seems like a good thing from my perspective. -As long as you follow the terms laid out in the license below, go right ahead. I honestly just don't want you messaging me on IRC or on the forums, asking my permission. If you need proof, provide a link to this page. - -# License # - -Licenses are not really my friend -- strict closed source software really drives me nuts. Even more, with a derivative work coded in a language such as Java, nothing can really prevent people from looking through my source with JD-GUI. I learned to program through a combination of textbooks, trial-and-error and browsing open source projects. As such, I have decided to license Mekanism under the MIT license, allowing for anyone with an interest in the project to fork/pull/distribute. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**Copyright © 2017 Aidan Brady** - -# Developers & Credits # - -**Lead Developer:** aidancbrady - -**Active Contributors:** thommy101, thiakil - -**Co-developer:** unpairedbracket - -**Artwork:** CyanideX, Cheapshot, Archadia - -**Contributors:** micdoodle, Bluexin, thommy101, JaSpr +# Mekanica for Minecraft 1.12 # + +Mekanica is a fork of the Mekanism mod featuring high-tech machinery that can be used to create powerful tools, armor, and weapons. This fork is fully backwards-compatible with Mekanism, with a focus on +delivering the same features with better performance and fewer bugs. + +As of the initial release of this mod, we've reduced the size of the code base by 12% (~18k LOC); less code means less bugs! Major improvements include: +* Overhauled entire sound system to work reliably with mufflers; reduced size of sound files by 90% +* Deduplicated code across the GUI to allow for consistency and easier maintenance +* Made first pass at improving custom item model rendering +* Removed voice-server functionality; have 5% of your CPU back! +* Changed gases to use tints instead of textures; less memory, easier to change and differentiate visually +* Improved CraftTweaker support; reduced associated log spam +* Added a `removeAllRecipes()` CraftTweaker method to each type. This removes all the built in recipes of that type. +* Osmium Compressor, Chemical Injection Chamber, and the Purification Chamber, now accept any gas that they have recipes added for via CraftTweaker. +* Improved charging of custom IC2 items (such as armor w/ jetpack attachments) +* Block of Charcoal burn time is now the standard 16000 ticks +* Disabled factories/machines no longer show up in JEI and various other JEI rendering fixes. +* Bronze recipe is now the standard 3 copper/1 tin = 4 bronze +* Glowstone and Refined Obsidian nuggets are craftable, and can be crafted back into their ingot variant. +* Fix bug in chunk loaders which caused them not to restore state on server restart +* Made things more cross compatible with other mods by moving Entity and Recipe registration to their proper registry events. +* Fix bugs in Thermal Evap containers, rendering of certain item models on 1.12.2, and many other minor bugs + +# Frequently Asked Questions (FAQ) # + +* If I replace Mekanism with Mekanica, will my world still work? + +Yes. This mod aims to maintain full backward compatibility. Our focus right now is on improving performance, quality and maintability, not introducing new content. The one notable change that might break compatibility at this point is the removal of the voice server functionality. We might add/remove content in the future, but when that happens there will be ample and LOUD notice. + +* Is there a Discord? + +Yes. You can join us here: https://discord.gg/nmSjMGc + +# License # + +Mekanica, being a fork, is under the same MIT license as Mekanism. You may use it in modpacks, reviews or any other form as long as you abide by the terms below. + +Copyright 2017 Aidan C. Brady + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Credits # + +## Mekanica ## + * pupnewfster + * dizzyd + +## Mekanism ## + * aidancbrady + * thommy101 + * thiakil + * unpairedbracket + * CyanideX (artwork) + * Cheapshot (artwork) + * Archadia (artwork) + * micdoodle + * Bluexin + * JaSpr diff --git a/build.gradle b/build.gradle index f16afcaf4..2e5c13e75 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ buildscript { } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.9" } } @@ -31,7 +30,6 @@ idea { } apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.matthewprenger.cursegradle' repositories { maven { @@ -86,10 +84,6 @@ repositories { name 'thiakil' url 'http://maven.thiakil.com' } - ivy { - name "ae2" - artifactPattern "http://ae-mod.info/builds/[module]-[revision](-[classifier])(.[ext])" - } } // Define properties file @@ -102,9 +96,9 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } -group = "mekanism-dz" +group = "mekanica" version = "${config.minecraft_version}-${version}" -archivesBaseName = "MekanismDzAll" +archivesBaseName = "mekanica-all" sourceCompatibility = '1.8' targetCompatibility = '1.8' @@ -170,13 +164,13 @@ jar { } task coreJar(type: Jar) { - archiveName = "MekanismDz-${project.version}.jar" + archiveName = "mekanica-${project.version}.jar" dependsOn 'reobfJar' classifier "core" from('etc/core') { include '*.info' - expand 'version':project.version,'mc_version':config.minecraft_version,'mcmp_version':config.mcmp_version + expand 'version':project.version, 'mc_version':config.minecraft_version, 'mcmp_version':config.mcmp_version } from zipTree(jar.outputs.getFiles().getSingleFile()).matching { @@ -189,13 +183,13 @@ task coreJar(type: Jar) { } task toolsJar(type: Jar) { - archiveName = "MekanismDzTools-${project.version}.jar" + archiveName = "mekanica-tools-${project.version}.jar" dependsOn 'reobfJar' classifier "tools" from('etc/tools') { include '*.info' - expand 'version':project.version,'mc_version':config.minecraft_version,'mcmp_version':config.mcmp_version + expand 'version':project.version, 'mc_version':config.minecraft_version, 'mcmp_version':config.mcmp_version } from zipTree(jar.outputs.getFiles().getSingleFile()).matching { @@ -204,7 +198,7 @@ task toolsJar(type: Jar) { } task generatorsJar(type: Jar) { - archiveName = "MekanismDzGenerators-${project.version}.jar" + archiveName = "mekanica-generators-${project.version}.jar" dependsOn 'reobfJar' classifier "generators" @@ -220,7 +214,7 @@ task generatorsJar(type: Jar) { task apiJar(type: Jar) { classifier "api" - baseName "MekanismDz" + baseName "mekanica" dependsOn "sourceMainJava" include 'mekanism/api/**' from sourceSets.main.java.srcDirs @@ -242,41 +236,3 @@ task fullBuild(type: Delete) { apply plugin: 'maven' apply plugin: 'maven-publish' -uploadArchives { - if(System.getenv("LOCAL_MAVEN") != null) { - repositories { - mavenDeployer { - repository(url: "file://"+System.getenv("LOCAL_MAVEN")) - pom { - groupId = project.group - version = project.version - if (System.getenv("MAVEN_ARTIFACT") != null) { - artifactId = System.getenv("MAVEN_ARTIFACT") - } else { - artifactId = "Mekanism" - } - project { - name "Mekanism" - packaging 'jar' - description 'Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools, armor, and weapons.' - url 'http://aidancbrady.com/mekanism/' - scm { - url 'https://github.com/aidancbrady/Mekanism.git' - } - issueManagement { - system 'github' - url 'https://github.com/aidancbrady/Mekanism/issues' - } - licenses { - license { - name 'MIT' - distribution 'repo' - } - } - } - } - } - } - } -} - diff --git a/etc/core/mcmod.info b/etc/core/mcmod.info index f8f2566ff..3484c7df9 100755 --- a/etc/core/mcmod.info +++ b/etc/core/mcmod.info @@ -1,17 +1,31 @@ -[ -{ - "modid": "mekanism", - "name": "Mekanism", - "description": "Energy, Armor, Tools, Weapons, Machines, Magic.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authors": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ] -} -] +[ + { + "modid": "mekanism", + "name": "Mekanica", + "description": "Tools and Machines; an active fork of Mekanism", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "forge", + "redstoneflux", + "mcmultipart", + "jei", + "buildcraft", + "buildcraftapi", + "ic2", + "computercraft", + "galaticraft api", + "metallurgy", + "crafttweaker" + ], + "requiredMods": [ + "forge@[14.21.0.2373,)" + ] + } +] \ No newline at end of file diff --git a/etc/generators/mcmod.info b/etc/generators/mcmod.info index 0cc2729f7..6ea2711cb 100755 --- a/etc/generators/mcmod.info +++ b/etc/generators/mcmod.info @@ -1,24 +1,21 @@ -[ -{ - "modid": "mekanismgenerators", - "name": "MekanismGenerators", - "description": "Generators module of Mekanism.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authors": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ], - "useDependencyInformation": true, - "dependencies":[ - "mekanism@[${version}]" - ], - "requiredMods":[ - "mekanism@[${version}]" - ] -} -] +[ + { + "modid": "mekanismgenerators", + "name": "Mekanica: Generators", + "description": "Generators module for Mekanica", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "mekanism@[${version}]" + ], + "requiredMods": [ + "mekanism@[${version}]" + ] + } +] diff --git a/etc/tools/mcmod.info b/etc/tools/mcmod.info index 32b001f59..e8786376a 100755 --- a/etc/tools/mcmod.info +++ b/etc/tools/mcmod.info @@ -1,24 +1,21 @@ -[ -{ - "modid": "mekanismtools", - "name": "MekanismTools", - "description": "Tools module for Mekanism.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authors": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ], - "useDependencyInformation": true, - "dependencies":[ - "mekanism@[${version}]" - ], - "requiredMods":[ - "mekanism@[${version}]" - ] -} -] +[ + { + "modid": "mekanismtools", + "name": "Mekanica: Tools", + "description": "Tools module for Mekanica", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "mekanism@[${version}]" + ], + "requiredMods": [ + "mekanism@[${version}]" + ] + } +] diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 63b5b7971..0776d1f72 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -130,7 +130,8 @@ public final class HolidayManager { @Override public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[]{EnumColor.DARK_GREEN, EnumColor.DARK_RED}, 13); - player.sendMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.sendMessage( + new TextComponentString(themedLines + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + themedLines)); player.sendMessage(new TextComponentString( EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); player.sendMessage(new TextComponentString(EnumColor.RED + "May you have plenty of Christmas cheer")); @@ -170,7 +171,8 @@ public final class HolidayManager { @Override public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[]{EnumColor.WHITE, EnumColor.YELLOW}, 13); - player.sendMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.sendMessage( + new TextComponentString(themedLines + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + themedLines)); player.sendMessage(new TextComponentString( EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); player.sendMessage(new TextComponentString(EnumColor.AQUA + "Best wishes to you as we enter this")); diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index abc3726ac..fe18b3614 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -43,7 +43,7 @@ import org.lwjgl.input.Keyboard; @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { - public static final String keybindCategory = "Mekanism"; + public static final String keybindCategory = Mekanism.MOD_NAME; public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.armorMode"), @@ -89,7 +89,7 @@ public class MekanismKeyHandler extends MekKeyHandler { Mekanism.packetHandler .sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(toSet))); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils .localize("tooltip.configureState") + ": " + configurator .getColor(configurator.getState(toolStack)) + configurator .getStateDisplay(configurator.getState(toolStack)))); @@ -100,7 +100,8 @@ public class MekanismKeyHandler extends MekKeyHandler { Mekanism.packetHandler.sendToServer( new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(bow.getFireState(toolStack)))); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(bow.getFireState(toolStack)))); } else if (player.isSneaking() && item instanceof ItemBlockMachine) { @@ -111,7 +112,7 @@ public class MekanismKeyHandler extends MekKeyHandler { Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(machine.getBucketMode(toolStack)))); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils .localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils .transOnOff(machine.getBucketMode(toolStack)))); @@ -133,7 +134,7 @@ public class MekanismKeyHandler extends MekKeyHandler { new PacketFlamethrowerData.FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.MODE, EnumHand.MAIN_HAND, null, false)); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils .localize("tooltip.flamethrower.modeBump") + ": " + flamethrower.getMode(toolStack) .getName())); } diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java index 981608be7..913fbb2dd 100644 --- a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.jei.gas.GasStackRenderer; +import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -80,7 +81,7 @@ public abstract class BaseRecipeCategory implements IRecipeCategory getAliases() { - return Arrays.asList("mekanism", "mek"); + return Arrays.asList("mekanism", "mek", "mekanica"); } @Override @@ -76,25 +73,25 @@ public class CommandMekanism extends CommandBase { } else if (params[0].equalsIgnoreCase("debug")) { MekanismAPI.debug = !MekanismAPI.debug; sender.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Debug mode set to " + EnumColor.DARK_GREY - + MekanismAPI.debug)); + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " Debug mode set to " + + EnumColor.DARK_GREY + MekanismAPI.debug)); } else if (params[0].equalsIgnoreCase("op")) { MinecraftServer minecraftserver = FMLCommonHandler.instance().getMinecraftServerInstance(); if (Mekanism.gameProfile != null) { minecraftserver.getPlayerList().addOp(Mekanism.gameProfile); - notifyCommandListener(sender, this, "commands.op.success", "[Mekanism]"); + notifyCommandListener(sender, this, "commands.op.success", Mekanism.LOG_TAG); } } else if (params[0].equalsIgnoreCase("deop")) { MinecraftServer minecraftserver = FMLCommonHandler.instance().getMinecraftServerInstance(); if (Mekanism.gameProfile != null) { minecraftserver.getPlayerList().removeOp(Mekanism.gameProfile); - notifyCommandListener(sender, this, "commands.deop.success", "[Mekanism]"); + notifyCommandListener(sender, this, "commands.deop.success", Mekanism.LOG_TAG); } } else { sender.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Unknown command. Type '" + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " Unknown command. Type '" + EnumColor.INDIGO + "/mk help" + EnumColor.GREY + "' for help.")); } } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index ab1a214bf..bed613439 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -44,11 +44,6 @@ import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.inventory.container.ContainerQuantumEntangloporter; import mekanism.common.inventory.container.ContainerResistiveHeater; -import mekanism.common.inventory.container.robit.ContainerRobitCrafting; -import mekanism.common.inventory.container.robit.ContainerRobitInventory; -import mekanism.common.inventory.container.robit.ContainerRobitMain; -import mekanism.common.inventory.container.robit.ContainerRobitRepair; -import mekanism.common.inventory.container.robit.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.inventory.container.ContainerSeismicVibrator; @@ -56,6 +51,11 @@ import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerUpgradeManagement; +import mekanism.common.inventory.container.robit.ContainerRobitCrafting; +import mekanism.common.inventory.container.robit.ContainerRobitInventory; +import mekanism.common.inventory.container.robit.ContainerRobitMain; +import mekanism.common.inventory.container.robit.ContainerRobitRepair; +import mekanism.common.inventory.container.robit.ContainerRobitSmelting; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.tile.TileEntityAdvancedFactory; diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 54d4f65ed..b64202267 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -91,7 +91,7 @@ public class CommonWorldTickHandler { Mekanism.genHandler.generate(fmlRandom, nextChunk.x, nextChunk.z, world, ((ChunkProviderServer) world.getChunkProvider()).chunkGenerator, world.getChunkProvider()); - Mekanism.logger.info("[Mekanism] Regenerating ores at chunk " + nextChunk); + Mekanism.logger.info("Regenerating ores at chunk " + nextChunk); } if (chunksToGen.isEmpty()) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 803d19d20..3834df9f9 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -145,29 +145,14 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** - * Mekanism - a Minecraft mod - * - * @author AidanBrady - */ -@Mod(modid = Mekanism.MODID, name = "Mekanism", version = "${version}", guiFactory = "mekanism.client.gui.ConfigGuiFactory", - useMetadata = true, acceptedMinecraftVersions = "[1.12,1.13)", - dependencies = "required-after:forge@[14.21.0.2373,);" + - "after:redstoneflux;" + - "after:mcmultipart;" + - "after:jei;" + - "after:buildcraft;" + - "after:buildcraftapi;" + - "after:ic2;" + - "after:computercraft;" + - "after:galacticraft api;" + - "after:metallurgy;" + - "after:crafttweaker" -) +@Mod(modid = Mekanism.MODID, useMetadata = true, guiFactory = "mekanism.client.gui.ConfigGuiFactory", + acceptedMinecraftVersions = "[1.12,1.13)") @Mod.EventBusSubscriber() public class Mekanism { public static final String MODID = "mekanism"; + public static final String MOD_NAME = "Mekanica"; + public static final String LOG_TAG = '[' + MOD_NAME + ']'; public static final PlayerState playerState = new PlayerState(); public static final Set freeRunnerOn = new HashSet<>(); /** @@ -177,7 +162,7 @@ public class Mekanism { /** * Mekanism logger instance */ - public static Logger logger = LogManager.getLogger("Mekanism"); + public static Logger logger = LogManager.getLogger(MOD_NAME); /** * Mekanism proxy instance */ @@ -186,7 +171,7 @@ public class Mekanism { /** * Mekanism mod instance */ - @Instance("mekanism") + @Instance(MODID) public static Mekanism instance; /** * Mekanism hooks instance @@ -242,7 +227,7 @@ public class Mekanism { * The GameProfile used by the dummy Mekanism player */ public static GameProfile gameProfile = new GameProfile(UUID.nameUUIDFromBytes("mekanism.common".getBytes()), - "[Mekanism]"); + Mekanism.LOG_TAG); public static KeySync keyMap = new KeySync(); public static Set activeVibrators = new HashSet<>(); @@ -267,15 +252,15 @@ public class Mekanism { @SubscribeEvent public static void registerEntities(RegistryEvent.Register event) { - EntityRegistry.registerModEntity(new ResourceLocation("mekanism", "ObsidianTNT"), EntityObsidianTNT.class, + EntityRegistry.registerModEntity(new ResourceLocation(MODID, "ObsidianTNT"), EntityObsidianTNT.class, "ObsidianTNT", 0, Mekanism.instance, 64, 5, true); - EntityRegistry.registerModEntity(new ResourceLocation("mekanism", "Robit"), EntityRobit.class, "Robit", 1, + EntityRegistry.registerModEntity(new ResourceLocation(MODID, "Robit"), EntityRobit.class, "Robit", 1, Mekanism.instance, 64, 2, true); - EntityRegistry.registerModEntity(new ResourceLocation("mekanism", "Balloon"), EntityBalloon.class, "Balloon", 2, + EntityRegistry.registerModEntity(new ResourceLocation(MODID, "Balloon"), EntityBalloon.class, "Balloon", 2, Mekanism.instance, 64, 1, true); - EntityRegistry.registerModEntity(new ResourceLocation("mekanism", "BabySkeleton"), EntityBabySkeleton.class, + EntityRegistry.registerModEntity(new ResourceLocation(MODID, "BabySkeleton"), EntityBabySkeleton.class, "BabySkeleton", 3, Mekanism.instance, 64, 5, true, 0xFFFFFF, 0x800080); - EntityRegistry.registerModEntity(new ResourceLocation("mekanism", "Flame"), EntityFlame.class, "Flame", 4, + EntityRegistry.registerModEntity(new ResourceLocation(MODID, "Flame"), EntityFlame.class, "Flame", 4, Mekanism.instance, 64, 5, true); } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 7687f306b..984a6279a 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -32,10 +32,11 @@ import mekanism.common.item.ItemBlockTransmitter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.registries.IForgeRegistry; -@ObjectHolder("mekanism") +@ObjectHolder(Mekanism.MODID) public class MekanismBlocks { public static Block BasicBlock = BlockBasic.getBlockBasic(BASIC_BLOCK_1); @@ -116,6 +117,6 @@ public class MekanismBlocks { } public static Block init(Block block, String name) { - return block.setTranslationKey(name).setRegistryName("mekanism:" + name); + return block.setTranslationKey(name).setRegistryName(new ResourceLocation(Mekanism.MODID, name)); } } diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 3b14e7661..b7e04d5d4 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -35,10 +35,11 @@ import mekanism.common.item.ItemTierInstaller; import mekanism.common.item.ItemUpgrade; import mekanism.common.item.ItemWalkieTalkie; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.registries.IForgeRegistry; -@ObjectHolder("mekanism") +@ObjectHolder(Mekanism.MODID) public class MekanismItems { public static final Item EnrichedAlloy = new ItemAlloy(); @@ -157,6 +158,6 @@ public class MekanismItems { } public static Item init(Item item, String name) { - return item.setTranslationKey(name).setRegistryName("mekanism:" + name); + return item.setTranslationKey(name).setRegistryName(new ResourceLocation(Mekanism.MODID, name)); } } diff --git a/src/main/java/mekanism/common/MekanismSounds.java b/src/main/java/mekanism/common/MekanismSounds.java index eb4a894d6..91498c163 100644 --- a/src/main/java/mekanism/common/MekanismSounds.java +++ b/src/main/java/mekanism/common/MekanismSounds.java @@ -29,7 +29,7 @@ public final class MekanismSounds { } public static SoundEvent registerSound(IForgeRegistry registry, String soundName) { - ResourceLocation soundID = new ResourceLocation("mekanism", soundName); + ResourceLocation soundID = new ResourceLocation(Mekanism.MODID, soundName); SoundEvent event = new SoundEvent(soundID).setRegistryName(soundID); registry.register(event); return event; diff --git a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java index 97b61ffb2..4dcc2b94c 100644 --- a/src/main/java/mekanism/common/entity/EntityBabySkeleton.java +++ b/src/main/java/mekanism/common/entity/EntityBabySkeleton.java @@ -65,8 +65,7 @@ public class EntityBabySkeleton extends EntitySkeleton { } //copied from base entity, as abstractskeleton overrides it - public float getEyeHeight() - { + public float getEyeHeight() { return this.height * 0.85F; } } diff --git a/src/main/java/mekanism/common/integration/IMCHandler.java b/src/main/java/mekanism/common/integration/IMCHandler.java index 3c471d83f..e26dac451 100644 --- a/src/main/java/mekanism/common/integration/IMCHandler.java +++ b/src/main/java/mekanism/common/integration/IMCHandler.java @@ -22,7 +22,7 @@ public class IMCHandler { message.equals("ShapelessMekanismRecipe") || message.equals("DeleteMekanismRecipes") || message.equals("RemoveMekanismRecipes")) { - Mekanism.logger.warn("[Mekanism] " + msg.getSender() + " tried to send IMC " + message + Mekanism.logger.warn(msg.getSender() + " tried to send IMC " + message + " which has been deleted. Please notify the mod developer to use JSON recipes."); found = true; } @@ -43,23 +43,22 @@ public class IMCHandler { if (delete) { RecipeHandler.removeRecipe(type, recipe); Mekanism.logger - .info("[Mekanism] " + msg.getSender() + " removed recipe of type " + type - .getRecipeName() + " from the recipe list."); + .info(msg.getSender() + " removed recipe of type " + type.getRecipeName() + + " from the recipe list."); } else { RecipeHandler.addRecipe(type, recipe); Mekanism.logger - .info("[Mekanism] " + msg.getSender() + " added recipe of type " + type - .getRecipeName() + " to the recipe list."); + .info(msg.getSender() + " added recipe of type " + type.getRecipeName() + + " to the recipe list."); } } else { - Mekanism.logger.error( - "[Mekanism] " + msg.getSender() + " attempted to " + (delete ? "remove" : "add") - + " recipe of type " + type.getRecipeName() + " with an invalid output."); + Mekanism.logger.error(msg.getSender() + " attempted to " + (delete ? "remove" : "add") + + " recipe of type " + type.getRecipeName() + " with an invalid output."); } } else { Mekanism.logger.error( - "[Mekanism] " + msg.getSender() + " attempted to " + (delete ? "remove" : "add") - + " recipe of type " + type.getRecipeName() + " with an invalid input."); + msg.getSender() + " attempted to " + (delete ? "remove" : "add") + " recipe of type " + + type.getRecipeName() + " with an invalid input."); } found = true; @@ -68,8 +67,7 @@ public class IMCHandler { } if (!found) { - Mekanism.logger.error( - "[Mekanism] " + msg.getSender() + " sent unknown IMC message with key '" + msg.key + ".'"); + Mekanism.logger.error(msg.getSender() + " sent unknown IMC message with key '" + msg.key + ".'"); } } } diff --git a/src/main/java/mekanism/common/integration/TOPProvider.java b/src/main/java/mekanism/common/integration/TOPProvider.java index 711be7149..57b92623c 100644 --- a/src/main/java/mekanism/common/integration/TOPProvider.java +++ b/src/main/java/mekanism/common/integration/TOPProvider.java @@ -10,6 +10,7 @@ import mcjty.theoneprobe.api.ProbeMode; import mcjty.theoneprobe.api.TextStyleClass; import mekanism.api.gas.GasTankInfo; import mekanism.api.gas.IGasHandler; +import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +28,7 @@ public class TOPProvider implements Function, IProbeInfoProv @Override public String getID() { - return "mekanism"; + return Mekanism.MODID; } @Override diff --git a/src/main/java/mekanism/common/integration/crafttweaker/CrafttweakerIntegration.java b/src/main/java/mekanism/common/integration/crafttweaker/CrafttweakerIntegration.java index a9ad5b99c..0952d5aa4 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/CrafttweakerIntegration.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/CrafttweakerIntegration.java @@ -30,7 +30,7 @@ public class CrafttweakerIntegration { CraftTweakerAPI.apply(action); } catch (Exception e) { Mekanism.logger.error("CT action failed", e); - CraftTweakerAPI.logError("Mekanism CT action failed", e); + CraftTweakerAPI.logError(Mekanism.MOD_NAME + " CT action failed", e); } }); } diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalCrystallizer.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalCrystallizer.java index e9b24fce4..81c3f54fb 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalCrystallizer.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalCrystallizer { - public static final String NAME = "Mekanism Chemical Crystallizer"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Crystallizer"; @ZenMethod public static void addRecipe(IGasStack gasInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalDissolution.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalDissolution.java index eb055d476..5bff0eb97 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalDissolution.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalDissolution.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalDissolution { - public static final String NAME = "Mekanism Chemical Dissolution Chamber"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Dissolution Chamber"; @ZenMethod public static void addRecipe(IItemStack itemInput, IGasStack gasOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInfuser.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInfuser.java index a004d990b..4abd567eb 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInfuser.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInfuser.java @@ -3,6 +3,7 @@ package mekanism.common.integration.crafttweaker.handlers; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalInfuser { - public static final String NAME = "Mekanism Chemical Infuser"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Infuser"; @ZenMethod public static void addRecipe(IGasStack leftGasInput, IGasStack rightGasInput, IGasStack gasOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInjection.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInjection.java index 92668856b..92b903819 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInjection.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalInjection.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalInjection { - public static final String NAME = "Mekanism Chemical Injection Chamber"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Injection Chamber"; @ZenMethod public static void addRecipe(IItemStack itemInput, IGasStack gasInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalOxidizer.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalOxidizer.java index 9b802b7cc..e5043d855 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalOxidizer.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalOxidizer.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalOxidizer { - public static final String NAME = "Mekanism Chemical Oxidizer"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Oxidizer"; @ZenMethod public static void addRecipe(IItemStack itemInput, IGasStack gasOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalWasher.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalWasher.java index 625a78a13..e1513a86b 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalWasher.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ChemicalWasher.java @@ -3,6 +3,7 @@ package mekanism.common.integration.crafttweaker.handlers; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ChemicalWasher { - public static final String NAME = "Mekanism Chemical Washer"; + public static final String NAME = Mekanism.MOD_NAME + " Chemical Washer"; @ZenMethod public static void addRecipe(IGasStack gasInput, IGasStack gasOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Combiner.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Combiner.java index 33f32866b..4ef29d7fb 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Combiner.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Combiner.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Combiner { - public static final String NAME = "Mekanism Combiner"; + public static final String NAME = Mekanism.MOD_NAME + " Combiner"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack extraInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Compressor.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Compressor.java index 5aee72597..5b5e06259 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Compressor.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Compressor.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Compressor { - public static final String NAME = "Mekanism Compressor"; + public static final String NAME = Mekanism.MOD_NAME + " Compressor"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Crusher.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Crusher.java index fb121816d..1086c0fa8 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Crusher.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Crusher.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Crusher { - public static final String NAME = "Mekanism Crusher"; + public static final String NAME = Mekanism.MOD_NAME + " Crusher"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/EnergizedSmelter.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/EnergizedSmelter.java index 548329ab8..dd5ea7669 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/EnergizedSmelter.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/EnergizedSmelter.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class EnergizedSmelter { - public static final String NAME = "Mekanism Smelter"; + public static final String NAME = Mekanism.MOD_NAME + " Smelter"; private static boolean removedRecipe = false; private static boolean addedRecipe = false; diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Enrichment.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Enrichment.java index ba650508c..5dbb61c54 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Enrichment.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Enrichment.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Enrichment { - public static final String NAME = "Mekanism Enrichment Chamber"; + public static final String NAME = Mekanism.MOD_NAME + " Enrichment Chamber"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Infuser.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Infuser.java index e027039a2..b7bb0cff5 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Infuser.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Infuser.java @@ -7,6 +7,7 @@ import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; import mekanism.api.infuse.InfuseRegistry; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Infuser { - public static final String NAME = "Mekanism Metallurgic Infuser"; + public static final String NAME = Mekanism.MOD_NAME + " Metallurgic Infuser"; @ZenMethod public static void addRecipe(String infuseType, int infuseAmount, IItemStack itemInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Purification.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Purification.java index 300cdbc1d..a1d28b32e 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Purification.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Purification.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Purification { - public static final String NAME = "Mekanism Purification"; + public static final String NAME = Mekanism.MOD_NAME + " Purification"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack itemOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Reaction.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Reaction.java index bd372078e..c5cc1a608 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Reaction.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Reaction.java @@ -6,6 +6,7 @@ import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; import crafttweaker.api.liquid.ILiquidStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -27,7 +28,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Reaction { - public static final String NAME = "Mekanism Reaction"; + public static final String NAME = Mekanism.MOD_NAME + " Reaction"; @ZenMethod public static void addRecipe(IItemStack itemInput, ILiquidStack liquidInput, IGasStack gasInput, diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Sawmill.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Sawmill.java index 7659acf7c..4f5247a66 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Sawmill.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Sawmill.java @@ -6,6 +6,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -25,7 +26,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Sawmill { - public static final String NAME = "Mekanism Sawmill"; + public static final String NAME = Mekanism.MOD_NAME + " Sawmill"; @ZenMethod public static void addRecipe(IItemStack itemInput, IItemStack itemOutput, @Optional IItemStack optionalItemOutput, diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Separator.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Separator.java index 80538cf89..a77f3abb9 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/Separator.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/Separator.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.liquid.ILiquidStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -26,7 +27,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class Separator { - public static final String NAME = "Mekanism Separator"; + public static final String NAME = Mekanism.MOD_NAME + " Separator"; @ZenMethod public static void addRecipe(ILiquidStack liquidInput, double energy, IGasStack leftGasOutput, diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/SolarNeutronActivator.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/SolarNeutronActivator.java index a0f3e146b..2528472d4 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/SolarNeutronActivator.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/SolarNeutronActivator.java @@ -3,6 +3,7 @@ package mekanism.common.integration.crafttweaker.handlers; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.gas.IGasStack; import mekanism.common.integration.crafttweaker.helpers.GasHelper; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class SolarNeutronActivator { - public static final String NAME = "Mekanism Solar Neutron Activator"; + public static final String NAME = Mekanism.MOD_NAME + " Solar Neutron Activator"; @ZenMethod public static void addRecipe(IGasStack gasInput, IGasStack gasOutput) { diff --git a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ThermalEvaporation.java b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ThermalEvaporation.java index c17f42db8..f3046ee26 100644 --- a/src/main/java/mekanism/common/integration/crafttweaker/handlers/ThermalEvaporation.java +++ b/src/main/java/mekanism/common/integration/crafttweaker/handlers/ThermalEvaporation.java @@ -5,6 +5,7 @@ import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.liquid.ILiquidStack; +import mekanism.common.Mekanism; import mekanism.common.integration.crafttweaker.CrafttweakerIntegration; import mekanism.common.integration.crafttweaker.helpers.IngredientHelper; import mekanism.common.integration.crafttweaker.util.AddMekanismRecipe; @@ -24,7 +25,7 @@ import stanhebben.zenscript.annotations.ZenMethod; @ZenRegister public class ThermalEvaporation { - public static final String NAME = "Mekanism Solar Evaporation"; + public static final String NAME = Mekanism.MOD_NAME + " Solar Evaporation"; @ZenMethod public static void addRecipe(ILiquidStack liquidInput, ILiquidStack liquidOutput) { diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 7273e4a7a..f13002806 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -9,6 +9,7 @@ import java.util.Set; import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.common.Mekanism; import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; @@ -180,7 +181,8 @@ public class ItemAtomicDisassembler extends ItemEnergized { if (!world.isRemote) { toggleMode(itemstack); entityplayer.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency( itemstack) + ")")); } diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index f7d1c5e76..79feba546 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Nonnull; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -69,7 +70,7 @@ public class ItemConfigurationCard extends ItemMekanism { data.setString("dataType", getNameFromTile(tileEntity, side)); setData(stack, data); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils .localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); @@ -88,14 +89,14 @@ public class ItemConfigurationCard extends ItemMekanism { } player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.DARK_GREEN + LangUtils .localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); setData(stack, null); } else { player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.RED + LangUtils .localize("tooltip.configurationCard.unequal") + ".")); } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 61aa70bf2..1e46cbeb8 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -99,7 +99,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if (initial != TileComponentConfig.EMPTY) { if (!player.isSneaking()) { player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText( + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " " + getViewModeText( getState(stack).getTransmission()) + ": " + initial.color + initial.localize() + " (" + initial.color.getColoredName() + ")")); } else { @@ -111,9 +111,10 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool SideData data = config.getConfig() .getOutput(getState(stack).getTransmission(), side, config.getOrientation()); player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText( - getState(stack).getTransmission()) + ": " + data.color + data.localize() - + " (" + data.color.getColoredName() + ")")); + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " " + + getToggleModeText(getState(stack).getTransmission()) + ": " + + data.color + data.localize() + " (" + data.color.getColoredName() + + ")")); if (config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock) config; diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 5a2269a27..bd67bb170 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -41,7 +41,7 @@ public class ItemDictionary extends ItemMekanism { if (!names.isEmpty()) { player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " " + LangUtils .localize("tooltip.keysFound") + ":")); for (String name : names) { @@ -49,7 +49,7 @@ public class ItemDictionary extends ItemMekanism { } } else { player.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " " + LangUtils .localize("tooltip.noKey") + ".")); } } diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index ea78555f6..93f08a5d0 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -10,6 +10,7 @@ import mekanism.api.MekanismAPI; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; @@ -51,7 +52,7 @@ public class ItemNetworkReader extends ItemEnergized { .getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); player.sendMessage(new TextComponentString( - EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " -------------")); player.sendMessage(new TextComponentString( EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter @@ -95,7 +96,7 @@ public class ItemNetworkReader extends ItemEnergized { IHeatTransfer transfer = CapabilityUtils .getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); player.sendMessage(new TextComponentString( - EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + EnumColor.GREY + " -------------")); player.sendMessage(new TextComponentString( EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() @@ -150,7 +151,7 @@ public class ItemNetworkReader extends ItemEnergized { if (player.isSneaking() && MekanismAPI.debug) { String[] strings = TransmitterNetworkRegistry.getInstance().toStrings(); player.sendMessage(new TextComponentString( - EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanica Debug]" + EnumColor.GREY + " ----------")); for (String s : strings) { diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 1788968dd..5c0db7598 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -79,7 +79,8 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem Mekanism.packetHandler .sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, entityplayer.getUniqueID(), null)); entityplayer.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("gui.nowOwn"))); } else { if (SecurityUtils.canAccess(entityplayer, itemstack)) { entityplayer.openGui(Mekanism.instance, 14, world, hand.ordinal(), 0, 0); diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 3a1dc5b8a..a3aecf781 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -59,7 +59,7 @@ public class ItemSeismicReader extends ItemEnergized { if (getEnergy(itemstack) < ENERGY_USAGE && !entityplayer.capabilities.isCreativeMode) { if (!world.isRemote) { entityplayer.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.RED + LangUtils .localize("tooltip.seismicReader.needsEnergy"))); } @@ -67,7 +67,7 @@ public class ItemSeismicReader extends ItemEnergized { } else if (!MekanismUtils.isChunkVibrated(chunk)) { if (!world.isRemote) { entityplayer.sendMessage(new TextComponentString( - EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils + EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.RED + LangUtils .localize("tooltip.seismicReader.noVibrations"))); } diff --git a/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java b/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java index d1db2eb53..c473c4f1a 100644 --- a/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java @@ -49,7 +49,8 @@ public class ShapedMekanismRecipe extends ShapedOreRecipe { public static ShapedMekanismRecipe create(NBTTagCompound nbtTags) { if (!nbtTags.hasKey("result") || !nbtTags.hasKey("input")) { - Mekanism.logger.error("[Mekanism] Shaped recipe parse error: missing input or result compound tag."); + Mekanism.logger + .error(Mekanism.LOG_TAG + " Shaped recipe parse error: missing input or result compound tag."); return null; } @@ -57,7 +58,8 @@ public class ShapedMekanismRecipe extends ShapedOreRecipe { NBTTagList list = nbtTags.getTagList("input", Constants.NBT.TAG_COMPOUND); if (result.isEmpty() || list.tagCount() == 0) { - Mekanism.logger.error("[Mekanism] Shaped recipe parse error: invalid result stack or input data list."); + Mekanism.logger + .error(Mekanism.LOG_TAG + " Shaped recipe parse error: invalid result stack or input data list."); return null; } @@ -74,7 +76,8 @@ public class ShapedMekanismRecipe extends ShapedOreRecipe { String s = compound.getString("character"); if (s.length() > 1) { - Mekanism.logger.error("[Mekanism] Shaped recipe parse error: invalid pattern character data."); + Mekanism.logger + .error(Mekanism.LOG_TAG + " Shaped recipe parse error: invalid pattern character data."); return null; } @@ -82,7 +85,7 @@ public class ShapedMekanismRecipe extends ShapedOreRecipe { } else if (compound.hasKey("itemstack")) { ret[i] = InventoryUtils.loadFromNBT(compound.getCompoundTag("itemstack")); } else { - Mekanism.logger.error("[Mekanism] Shaped recipe parse error: invalid input tag data key."); + Mekanism.logger.error(Mekanism.LOG_TAG + " Shaped recipe parse error: invalid input tag data key."); return null; } } diff --git a/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java b/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java index 0f5a9f909..b1e46dc71 100644 --- a/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/ShapelessMekanismRecipe.java @@ -45,7 +45,8 @@ public class ShapelessMekanismRecipe extends ShapelessOreRecipe { public static ShapelessMekanismRecipe create(NBTTagCompound nbtTags) { if (!nbtTags.hasKey("result") || !nbtTags.hasKey("input")) { - Mekanism.logger.error("[Mekanism] Shapeless recipe parse error: missing input or result compound tag."); + Mekanism.logger + .error(Mekanism.LOG_TAG + " Shapeless recipe parse error: missing input or result compound tag."); return null; } @@ -53,7 +54,8 @@ public class ShapelessMekanismRecipe extends ShapelessOreRecipe { NBTTagList list = nbtTags.getTagList("input", Constants.NBT.TAG_COMPOUND); if (result.isEmpty() || list.tagCount() == 0) { - Mekanism.logger.error("[Mekanism] Shapeless recipe parse error: invalid result stack or input data list."); + Mekanism.logger + .error(Mekanism.LOG_TAG + " Shapeless recipe parse error: invalid result stack or input data list."); return null; } @@ -67,7 +69,7 @@ public class ShapelessMekanismRecipe extends ShapelessOreRecipe { } else if (compound.hasKey("itemstack")) { ret[i] = InventoryUtils.loadFromNBT(compound.getCompoundTag("itemstack")); } else { - Mekanism.logger.error("[Mekanism] Shapeless recipe parse error: invalid input tag data key."); + Mekanism.logger.error(Mekanism.LOG_TAG + " Shapeless recipe parse error: invalid input tag data key."); return null; } } diff --git a/src/main/java/mekanism/common/recipe/generation/MekanismGeneratorRecipes.java b/src/main/java/mekanism/common/recipe/generation/MekanismGeneratorRecipes.java deleted file mode 100644 index 5ace40856..000000000 --- a/src/main/java/mekanism/common/recipe/generation/MekanismGeneratorRecipes.java +++ /dev/null @@ -1,83 +0,0 @@ -package mekanism.common.recipe.generation; - -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import mekanism.common.Tier.BaseTier; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.GeneratorsBlocks; -import mekanism.generators.common.GeneratorsItems; -import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; -import mekanism.generators.common.block.states.BlockStateReactor.ReactorBlockType; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -public class MekanismGeneratorRecipes { - - public static void generate() { - RecipeGenerator recipeGenerator = new RecipeGenerator("mekanismgenerators"); - - recipeGenerator - .addShapedRecipe(GeneratorType.HEAT_GENERATOR.getStack(), "III", "WOW", "CFC", 'I', "ingotIron", 'C', - "ingotCopper", 'O', "ingotOsmium", 'F', Blocks.FURNACE, 'W', "plankWood"); - recipeGenerator.addShapedRecipe(GeneratorType.SOLAR_GENERATOR.getStack(), "SSS", "AIA", "PEP", 'S', - GeneratorsItems.SolarPanel, 'A', MekanismItems.EnrichedAlloy, 'I', "ingotIron", 'P', "dustOsmium", 'E', - MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator.addShapedRecipe(GeneratorType.ADVANCED_SOLAR_GENERATOR.getStack(), "SES", "SES", "III", 'S', - GeneratorType.SOLAR_GENERATOR.getStack(), 'E', MekanismItems.EnrichedAlloy, 'I', "ingotIron"); - recipeGenerator - .addShapedRecipe(GeneratorType.BIO_GENERATOR.getStack(), "RER", "BCB", "NEN", 'R', "dustRedstone", 'E', - MekanismItems.EnrichedAlloy, 'B', MekanismItems.BioFuel, 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'N', "ingotIron"); - recipeGenerator - .addShapedRecipe(GeneratorType.GAS_GENERATOR.getStack(), "PEP", "ICI", "PEP", 'P', "ingotOsmium", 'E', - MekanismItems.EnrichedAlloy, 'I', new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'C', - MekanismItems.ElectrolyticCore); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsItems.SolarPanel), "GGG", "RAR", "PPP", 'G', "paneGlass", 'R', - "dustRedstone", 'A', MekanismItems.EnrichedAlloy, 'P', "ingotOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 6), " O ", "OAO", "ECE", 'O', "ingotOsmium", - 'A', MekanismItems.EnrichedAlloy, 'E', MekanismItems.EnergyTablet.getUnchargedItem(), 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsItems.TurbineBlade), " S ", "SAS", " S ", 'S', "ingotSteel", 'A', - MekanismItems.EnrichedAlloy); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 7), "SAS", "SAS", "SAS", 'S', "ingotSteel", - 'A', MekanismItems.EnrichedAlloy); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 8), "SAS", "CAC", "SAS", 'S', "ingotSteel", - 'A', MekanismItems.EnrichedAlloy, 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 9), "SGS", "GEG", "SGS", 'S', "ingotSteel", - 'G', "ingotGold", 'E', MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 4, 10), " S ", "SOS", " S ", 'S', "ingotSteel", - 'O', "ingotOsmium"); - recipeGenerator.addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 2, 11), " I ", "ICI", " I ", 'I', - new ItemStack(GeneratorsBlocks.Generator, 1, 10), 'C', - MekanismUtils.getControlCircuit(BaseTier.ADVANCED)); - recipeGenerator.addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 2, 12), " I ", "IFI", " I ", 'I', - new ItemStack(GeneratorsBlocks.Generator, 1, 10), 'F', Blocks.IRON_BARS); - recipeGenerator - .addShapedRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 13), "STS", "TBT", "STS", 'S', "ingotSteel", - 'T', "ingotTin", 'B', Items.BUCKET); - - //Reactor Recipes - recipeGenerator.addShapedRecipe(ReactorBlockType.REACTOR_FRAME.getStack(4), " C ", "CAC", " C ", 'C', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'A', "alloyUltimate"); - recipeGenerator.addShapedRecipe(ReactorBlockType.REACTOR_PORT.getStack(2), " I ", "ICI", " I ", 'I', - ReactorBlockType.REACTOR_FRAME.getStack(1), 'C', MekanismUtils.getControlCircuit(BaseTier.ULTIMATE)); - recipeGenerator.addShapedRecipe(ReactorBlockType.REACTOR_GLASS.getStack(4), " I ", "IGI", " I ", 'I', - ReactorBlockType.REACTOR_FRAME.getStack(1), 'G', "blockGlass"); - recipeGenerator.addShapedRecipe(ReactorBlockType.REACTOR_CONTROLLER.getStack(1), "CGC", "ITI", "III", 'C', - MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), 'G', "paneGlass", 'I', - ReactorBlockType.REACTOR_FRAME.getStack(1), 'T', MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)); - recipeGenerator.addShapedRecipe(ReactorBlockType.LASER_FOCUS_MATRIX.getStack(2), " I ", "ILI", " I ", 'I', - ReactorBlockType.REACTOR_GLASS.getStack(1), 'L', "blockRedstone"); - recipeGenerator.addShapedRecipe(ReactorBlockType.REACTOR_LOGIC_ADAPTER.getStack(1), " R ", "RFR", " R ", 'R', - "dustRedstone", 'F', ReactorBlockType.REACTOR_FRAME.getStack(1)); - } -} diff --git a/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java b/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java deleted file mode 100644 index 71ef16b94..000000000 --- a/src/main/java/mekanism/common/recipe/generation/MekanismRecipes.java +++ /dev/null @@ -1,634 +0,0 @@ -package mekanism.common.recipe.generation; - -import mekanism.api.EnumColor; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import mekanism.common.Tier.BaseTier; -import mekanism.common.Tier.BinTier; -import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.Tier.FactoryTier; -import mekanism.common.Tier.FluidTankTier; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.Tier.InductionCellTier; -import mekanism.common.Tier.InductionProviderTier; -import mekanism.common.base.IFactory.RecipeType; -import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class MekanismRecipes { - - public static void generate() { - RecipeGenerator recipeGenerator = new RecipeGenerator("mekanism"); - - //Storage Recipes - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 3), "***", "***", "***", '*', - new ItemStack(Items.COAL, 1, 1)); - recipeGenerator.addShapedRecipe(new ItemStack(Items.COAL, 9, 1), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 3)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), "***", "***", "***", '*', - "ingotRefinedObsidian"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 4), "***", "***", "***", '*', - "ingotRefinedGlowstone"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 3), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 4)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), "XXX", "XXX", "XXX", 'X', "ingotOsmium"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 1), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), "***", "***", "***", '*', "ingotBronze"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 2), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 5), "***", "***", "***", '*', "ingotSteel"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 4), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 5)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 12), "***", "***", "***", '*', - "ingotCopper"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 5), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 12)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 13), "***", "***", "***", '*', "ingotTin"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Ingot, 9, 6), "*", '*', - new ItemStack(MekanismBlocks.BasicBlock, 1, 13)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.SaltBlock), "**", "**", '*', MekanismItems.Salt); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 0), "***", "***", "***", '*', "nuggetObsidian"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 0), "*", '*', "ingotObsidian"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 1), "***", "***", "***", '*', "nuggetOsmium"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 1), "*", '*', "ingotOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 2), "***", "***", "***", '*', "nuggetBronze"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 2), "*", '*', "ingotBronze"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 3), "***", "***", "***", '*', "nuggetGlowstone"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 3), "*", '*', "ingotGlowstone"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 4), "***", "***", "***", '*', "nuggetSteel"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 4), "*", '*', "ingotSteel"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 5), "***", "***", "***", '*', "nuggetCopper"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 5), "*", '*', "ingotCopper"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.Ingot, 1, 6), "***", "***", "***", '*', "nuggetTin"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Nugget, 9, 6), "*", '*', "ingotTin"); - - //Base Recipes - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1), "***", "XXX", "***", '*', Blocks.OBSIDIAN, - 'X', Blocks.TNT); - recipeGenerator.addShapedRecipe(MekanismItems.ElectricBow.getUnchargedItem(), " AB", "E B", " AB", 'A', - MekanismItems.EnrichedAlloy, 'B', Items.STRING, 'E', MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator - .addShapedRecipe(MekanismItems.EnergyTablet.getUnchargedItem(), "RCR", "ECE", "RCR", 'C', "ingotGold", - 'R', "dustRedstone", 'E', MekanismItems.EnrichedAlloy); - recipeGenerator - .addShapedRecipe(MachineType.ENRICHMENT_CHAMBER.getStack(), "RCR", "iIi", "RCR", 'i', "ingotIron", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'R', "alloyBasic", 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator - .addShapedRecipe(MachineType.OSMIUM_COMPRESSOR.getStack(), "ECE", "BIB", "ECE", 'E', "alloyAdvanced", 'C', - MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'B', Items.BUCKET, 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MachineType.COMBINER.getStack(), "RCR", "SIS", "RCR", 'S', "cobblestone", 'C', - MekanismUtils.getControlCircuit(BaseTier.ELITE), 'R', "alloyElite", 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MachineType.CRUSHER.getStack(), "RCR", "LIL", "RCR", 'R', "dustRedstone", 'L', - Items.LAVA_BUCKET, 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.SpeedUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", 'A', - MekanismItems.EnrichedAlloy, 'D', "dustOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.EnergyUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", 'A', - MekanismItems.EnrichedAlloy, 'D', "dustGold"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.GasUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", 'A', - MekanismItems.EnrichedAlloy, 'D', "dustIron"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.FilterUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", 'A', - MekanismItems.EnrichedAlloy, 'D', "dustTin"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.MufflingUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", - 'A', MekanismItems.EnrichedAlloy, 'D', "dustSteel"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.AnchorUpgrade), " G ", "ADA", " G ", 'G', "blockGlass", 'A', - MekanismItems.EnrichedAlloy, 'D', "dustDiamond"); - recipeGenerator.addShapedRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), "AEA", "ACA", " O ", 'A', - MekanismItems.EnrichedAlloy, 'E', MekanismItems.EnergyTablet.getUnchargedItem(), 'C', - MekanismItems.AtomicAlloy, 'O', "ingotRefinedObsidian"); - recipeGenerator - .addShapedRecipe(MachineType.METALLURGIC_INFUSER.getStack(), "IFI", "ROR", "IFI", 'I', "ingotIron", 'F', - Blocks.FURNACE, 'R', "dustRedstone", 'O', "ingotOsmium"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.TeleportationCore), "LAL", "GDG", "LAL", 'L', - new ItemStack(Items.DYE, 1, 4), 'A', MekanismItems.AtomicAlloy, 'G', "ingotGold", 'D', Items.DIAMOND); - recipeGenerator.addShapedRecipe(MekanismItems.PortableTeleporter.getUnchargedItem(), " E ", "CTC", " E ", 'E', - MekanismItems.EnergyTablet.getUnchargedItem(), 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'T', - MekanismItems.TeleportationCore); - recipeGenerator.addShapedRecipe(MachineType.TELEPORTER.getStack(), "COC", "OTO", "COC", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'O', new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'T', - MekanismItems.TeleportationCore); - recipeGenerator.addShapedRecipe(MachineType.PURIFICATION_CHAMBER.getStack(), "ECE", "ORO", "ECE", 'C', - MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'E', "alloyAdvanced", 'O', "ingotOsmium", 'R', - MachineType.ENRICHMENT_CHAMBER.getStack()); - recipeGenerator.addShapedRecipe(MekanismItems.Configurator.getUnchargedItem(), " L ", "AEA", " S ", 'L', - new ItemStack(Items.DYE, 1, 4), 'A', MekanismItems.EnrichedAlloy, 'E', - MekanismItems.EnergyTablet.getUnchargedItem(), 'S', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7), "OOO", "OGO", "OOO", 'O', - "ingotRefinedObsidian", 'G', "ingotRefinedGlowstone"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), "SGS", "GPG", "SGS", 'S', "ingotSteel", - 'P', "ingotOsmium", 'G', "blockGlass"); - recipeGenerator.addShapedRecipe(MachineType.ENERGIZED_SMELTER.getStack(), "RCR", "GIG", "RCR", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'R', "alloyBasic", 'G', "blockGlass", 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator - .addShapedRecipe(MachineType.ELECTRIC_PUMP.getStack(), " B ", "ECE", "OOO", 'B', Items.BUCKET, 'E', - MekanismItems.EnrichedAlloy, 'C', new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'O', - "ingotOsmium"); - recipeGenerator - .addShapedRecipe(MachineType.PERSONAL_CHEST.getStack(), "SGS", "CcC", "SSS", 'S', "ingotSteel", 'G', - "blockGlass", 'C', "chestWood", 'c', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9), " I ", "IBI", " I ", 'I', "ingotSteel", - 'B', Items.BUCKET); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 10), " I ", "IGI", " I ", 'I', "ingotSteel", - 'G', "blockGlass"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 2, 11), " I ", "ICI", " I ", 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 9), 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(MachineType.CHARGEPAD.getStack(), "PPP", "SES", 'P', Blocks.STONE_PRESSURE_PLATE, 'S', - "ingotSteel", 'E', MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator - .addShapedRecipe(MekanismItems.Robit.getUnchargedItem(), " S ", "ECE", "OIO", 'S', "ingotSteel", 'E', - MekanismItems.EnergyTablet.getUnchargedItem(), 'C', MekanismItems.AtomicAlloy, 'O', - "ingotRefinedObsidian", 'I', MachineType.PERSONAL_CHEST.getStack()); - recipeGenerator - .addShapedRecipe(MekanismItems.NetworkReader.getUnchargedItem(), " G ", "AEA", " I ", 'G', "blockGlass", - 'A', MekanismItems.EnrichedAlloy, 'E', MekanismItems.EnergyTablet.getUnchargedItem(), 'I', - "ingotSteel"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.WalkieTalkie), " O", "SCS", " S ", 'O', "ingotOsmium", 'S', - "ingotSteel", 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(MachineType.LOGISTICAL_SORTER.getStack(), "IPI", "ICI", "III", 'I', "ingotIron", 'P', - Blocks.PISTON, 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator.addShapedRecipe(MachineType.DIGITAL_MINER.getStack(), "ACA", "SES", "TIT", 'A', - MekanismItems.AtomicAlloy, 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'S', - MachineType.LOGISTICAL_SORTER.getStack(), 'E', MekanismItems.Robit.getUnchargedItem(), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'T', MekanismItems.TeleportationCore); - recipeGenerator - .addShapedRecipe(MachineType.ROTARY_CONDENSENTRATOR.getStack(), "GCG", "tEI", "GCG", 'G', "blockGlass", - 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 't', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'E', - MekanismItems.EnergyTablet.getUnchargedItem(), 'I', - MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC)); - recipeGenerator - .addShapedRecipe(MekanismItems.Jetpack.getEmptyItem(), "SCS", "TGT", " T ", 'S', "ingotSteel", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'T', "ingotTin", 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Dictionary), "C", "B", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'B', Items.BOOK); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.GasMask), " S ", "GCG", "S S", 'S', "ingotSteel", 'G', - "blockGlass", 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator.addShapedRecipe(MekanismItems.ScubaTank.getEmptyItem(), " C ", "AGA", "SSS", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'A', MekanismItems.EnrichedAlloy, 'S', "ingotSteel", 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)); - recipeGenerator.addShapedRecipe(MachineType.CHEMICAL_OXIDIZER.getStack(), "ACA", "ERG", "ACA", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'R', new ItemStack(MekanismBlocks.BasicBlock, 1, 9), 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'E', MachineType.PERSONAL_CHEST.getStack(), 'A', - MekanismItems.EnrichedAlloy); - recipeGenerator.addShapedRecipe(MachineType.CHEMICAL_INFUSER.getStack(), "ACA", "GRG", "ACA", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'R', new ItemStack(MekanismBlocks.BasicBlock, 1, 9), 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'A', MekanismItems.EnrichedAlloy); - recipeGenerator.addShapedRecipe(MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), "RCR", "GPG", "RCR", 'C', - MekanismUtils.getControlCircuit(BaseTier.ELITE), 'R', "alloyElite", 'G', "ingotGold", 'P', - MachineType.PURIFICATION_CHAMBER.getStack()); - recipeGenerator - .addShapedRecipe(MachineType.ELECTROLYTIC_SEPARATOR.getStack(), "IRI", "ECE", "IRI", 'I', "ingotIron", - 'R', "dustRedstone", 'E', MekanismItems.EnrichedAlloy, 'C', MekanismItems.ElectrolyticCore); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.ElectrolyticCore), "EPE", "IEG", "EPE", 'E', - MekanismItems.EnrichedAlloy, 'P', "dustOsmium", 'I', "dustIron", 'G', "dustGold"); - //NB: custom json - //recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.CardboardBox), "SS", "SS", 'S', "pulpWood"); - //recipeGenerator.addShapedRecipe(new ItemStack(Items.PAPER, 6), "SSS", 'S', MekanismItems.Sawdust); - recipeGenerator - .addShapedRecipe(MachineType.PRECISION_SAWMILL.getStack(), "ICI", "ASA", "ICI", 'I', "ingotIron", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'A', MekanismItems.EnrichedAlloy, 'S', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 14), "CGC", "IBI", "III", 'C', - MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'G', "paneGlass", 'I', - new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), 'B', Items.BUCKET); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 15), " I ", "ICI", " I ", 'I', - new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 0), " S ", "SCS", " S ", 'C', "ingotCopper", - 'S', "ingotSteel"); - recipeGenerator.addShapedRecipe(MachineType.CHEMICAL_DISSOLUTION_CHAMBER.getStack(), "CGC", "EAE", "CGC", 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), - 'A', MekanismItems.AtomicAlloy, 'E', MekanismItems.EnrichedAlloy); - recipeGenerator - .addShapedRecipe(MachineType.CHEMICAL_WASHER.getStack(), "CWC", "EIE", "CGC", 'W', Items.BUCKET, 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'E', MekanismItems.EnrichedAlloy, 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MachineType.CHEMICAL_CRYSTALLIZER.getStack(), "CGC", "ASA", "CGC", 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), - 'A', MekanismItems.AtomicAlloy, 'S', new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MekanismItems.FreeRunners.getUnchargedItem(), "C C", "A A", "T T", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'A', MekanismItems.EnrichedAlloy, 'T', - MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator - .addShapedRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), "D D", "BSB", " J ", 'D', "dustDiamond", - 'B', "ingotBronze", 'S', "blockSteel", 'J', MekanismItems.Jetpack.getEmptyItem()); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.ConfigurationCard), " A ", "ACA", " A ", 'A', - MekanismItems.EnrichedAlloy, 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(MekanismItems.SeismicReader.getUnchargedItem(), "SLS", "STS", "SSS", 'S', "ingotSteel", - 'L', new ItemStack(Items.DYE, 1, 4), 'T', MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator - .addShapedRecipe(MachineType.SEISMIC_VIBRATOR.getStack(), "TLT", "CIC", "TTT", 'T', "ingotTin", 'L', - new ItemStack(Items.DYE, 1, 4), 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MachineType.PRESSURIZED_REACTION_CHAMBER.getStack(), "SES", "CIC", "GFG", 'S', - "ingotSteel", 'E', MekanismItems.EnrichedAlloy, 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'I', MachineType.ENRICHMENT_CHAMBER.getStack(), 'F', - new ItemStack(MekanismBlocks.BasicBlock, 1, 9)); - recipeGenerator.addShapedRecipe(MachineType.FLUIDIC_PLENISHER.getStack(), "TTT", "CPC", "TTT", 'P', - MachineType.ELECTRIC_PUMP.getStack(), 'T', "ingotTin", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator.addShapedRecipe(new ItemStack(Blocks.RAIL, 24), "O O", "OSO", "O O", 'O', "ingotOsmium", 'S', - "stickWood"); - recipeGenerator - .addShapedRecipe(MekanismItems.Flamethrower.getEmptyItem(), "TTT", "TGS", "BCB", 'T', "ingotTin", 'G', - MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), 'S', Items.FLINT_AND_STEEL, 'B', "ingotBronze", - 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED));/**/ - recipeGenerator - .addShapedRecipe(MekanismItems.GaugeDropper.getEmptyItem(), " O ", "G G", "GGG", 'O', "ingotOsmium", 'G', - "paneGlass"); - recipeGenerator - .addShapedRecipe(MachineType.SOLAR_NEUTRON_ACTIVATOR.getStack(), "APA", "CSC", "BBB", 'A', "alloyElite", - 'S', new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'P', - new ItemStack(MekanismItems.Polyethene, 1, 2), 'B', "ingotBronze", 'C', - MekanismUtils.getControlCircuit(BaseTier.ELITE)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 1), " S ", "SES", " S ", 'S', "ingotSteel", - 'E', MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 2), " I ", "ICI", " I ", 'I', - new ItemStack(MekanismBlocks.BasicBlock2, 1, 1), 'C', MekanismUtils.getControlCircuit(BaseTier.ELITE)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 0), "RCR", "iWi", "RCR", 'R', "alloyBasic", - 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'i', "ingotIron", 'W', "plankWood"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 1), "ECE", "oWo", "ECE", 'E', - "alloyAdvanced", 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'o', "ingotOsmium", 'W', - "plankWood"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 2), "RCR", "gWg", "RCR", 'R', "alloyElite", - 'C', MekanismUtils.getControlCircuit(BaseTier.ELITE), 'g', "ingotGold", 'W', "plankWood"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.TierInstaller, 1, 3), "RCR", "dWd", "RCR", 'R', - "alloyUltimate", 'C', MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), 'd', "gemDiamond", 'W', - "plankWood"); - recipeGenerator - .addShapedRecipe(MachineType.OREDICTIONIFICATOR.getStack(), "SGS", "CBC", "SWS", 'S', "ingotSteel", 'G', - "paneGlass", 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'B', MekanismItems.Dictionary, - 'W', "chestWood"); - recipeGenerator.addShapedRecipe(MachineType.LASER.getStack(), "RE ", "RCD", "RE ", 'R', "alloyElite", 'E', - MekanismItems.EnergyTablet.getUnchargedItem(), 'C', new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'D', - "gemDiamond"); - recipeGenerator - .addShapedRecipe(MachineType.LASER_AMPLIFIER.getStack(), "SSS", "SED", "SSS", 'S', "ingotSteel", 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), 'D', "gemDiamond"); - recipeGenerator.addShapedRecipe(MachineType.LASER_TRACTOR_BEAM.getStack(), "C", "F", 'C', - MachineType.PERSONAL_CHEST.getStack(), 'F', MachineType.LASER_AMPLIFIER.getStack()); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 6), "SFS", "FAF", "SFS", 'S', "ingotSteel", - 'A', MekanismItems.EnrichedAlloy, 'F', Blocks.IRON_BARS); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 7), " S ", "SIS", " S ", 'S', "ingotSteel", - 'I', "ingotIron"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 8), " I ", "ICI", " I ", 'I', - new ItemStack(MekanismBlocks.BasicBlock2, 1, 7), 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), "ACA", "CIC", "ACA", 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'C', "ingotCopper", 'A', "alloyBasic"); - recipeGenerator - .addShapedRecipe(MachineType.RESISTIVE_HEATER.getStack(), "CRC", "RHR", "CEC", 'C', "ingotTin", 'R', - "dustRedstone", 'H', new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), 'E', - MekanismItems.EnergyTablet.getUnchargedItem()); - recipeGenerator.addShapedRecipe(MachineType.QUANTUM_ENTANGLOPORTER.getStack(), "OCO", "ATA", "OCO", 'O', - "ingotRefinedObsidian", 'C', MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), 'A', "alloyUltimate", - 'T', MekanismItems.TeleportationCore); - recipeGenerator - .addShapedRecipe(MachineType.FORMULAIC_ASSEMBLICATOR.getStack(), "STS", "BIB", "SCS", 'S', "ingotSteel", - 'T', Blocks.CRAFTING_TABLE, 'B', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'C', "chestWood"); - recipeGenerator.addShapelessRecipe(new ItemStack(MekanismItems.CraftingFormula), Items.PAPER, - MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), "SGS", "CIC", "STS", 'S', "ingotSteel", - 'G', "blockGlass", 'C', MekanismUtils.getControlCircuit(BaseTier.ELITE), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8), 'T', MekanismItems.TeleportationCore); - recipeGenerator - .addShapedRecipe(MachineType.FUELWOOD_HEATER.getStack(), "SCS", "FHF", "SSS", 'S', "ingotSteel", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'F', Blocks.FURNACE, 'H', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - - //Energy Cube recipes - recipeGenerator.addShapedRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), "RTR", "iIi", "RTR", 'R', - "alloyBasic", 'i', "ingotIron", 'T', MekanismItems.EnergyTablet.getUnchargedItem(), 'I', - new ItemStack(MekanismBlocks.BasicBlock, 1, 8)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), "ETE", "oBo", "ETE", 'E', - "alloyAdvanced", 'o', "ingotOsmium", 'T', MekanismItems.EnergyTablet.getUnchargedItem(), 'B', - MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), "RTR", "gAg", "RTR", 'R', - "alloyElite", 'g', "ingotGold", 'T', MekanismItems.EnergyTablet.getUnchargedItem(), 'A', - MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), "ATA", "dEd", "ATA", 'A', - "alloyUltimate", 'd', "gemDiamond", 'T', MekanismItems.EnergyTablet.getUnchargedItem(), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE)); - - //Gas Tank Recipes - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), "APA", "P P", "APA", 'P', - "ingotOsmium", 'A', "alloyBasic"); - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED), "APA", "PTP", "APA", 'P', - "ingotOsmium", 'A', "alloyAdvanced", 'T', MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ELITE), "APA", "PTP", "APA", 'P', - "ingotOsmium", 'A', "alloyElite", 'T', MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ULTIMATE), "APA", "PTP", "APA", 'P', - "ingotOsmium", 'A', "alloyUltimate", 'T', MekanismUtils.getEmptyGasTank(GasTankTier.ELITE)); - - //Fluid Tank Recipes - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC), "AIA", "I I", "AIA", 'I', - "ingotIron", 'A', "alloyBasic"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED), "AIA", "ITI", "AIA", 'I', - "ingotIron", 'A', "alloyAdvanced", 'T', MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC)); - recipeGenerator.addShapedRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE), "AIA", "ITI", "AIA", 'I', - "ingotIron", 'A', "alloyElite", 'T', MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ULTIMATE), "AIA", "ITI", "AIA", 'I', - "ingotIron", 'A', "alloyUltimate", 'T', MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE)); - - //Bin recipes - recipeGenerator - .addShapedRecipe(MekanismUtils.getBin(BinTier.BASIC), "SCS", "A A", "SSS", 'S', "cobblestone", 'C', - MekanismUtils.getControlCircuit(BaseTier.BASIC), 'A', "alloyBasic"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getBin(BinTier.ADVANCED), "SCS", "ABA", "SSS", 'S', "cobblestone", 'C', - MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'A', "alloyAdvanced", 'B', - MekanismUtils.getBin(BinTier.BASIC)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getBin(BinTier.ELITE), "SCS", "ABA", "SSS", 'S', "cobblestone", 'C', - MekanismUtils.getControlCircuit(BaseTier.ELITE), 'A', "alloyElite", 'B', - MekanismUtils.getBin(BinTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getBin(BinTier.ULTIMATE), "SCS", "ABA", "SSS", 'S', "cobblestone", 'C', - MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), 'A', "alloyUltimate", 'B', - MekanismUtils.getBin(BinTier.ELITE)); - - //Induction Cell recipes - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), "LTL", "TET", "LTL", 'T', - MekanismItems.EnergyTablet.getUnchargedItem(), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), 'L', "dustLithium"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionCell(InductionCellTier.ADVANCED), "TCT", "CEC", "TCT", 'T', - MekanismItems.EnergyTablet.getUnchargedItem(), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), 'C', - MekanismUtils.getInductionCell(InductionCellTier.BASIC)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionCell(InductionCellTier.ELITE), "TCT", "CEC", "TCT", 'T', - MekanismItems.EnergyTablet.getUnchargedItem(), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), 'C', - MekanismUtils.getInductionCell(InductionCellTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionCell(InductionCellTier.ULTIMATE), "TCT", "CEC", "TCT", 'T', - MekanismItems.EnergyTablet.getUnchargedItem(), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), 'C', - MekanismUtils.getInductionCell(InductionCellTier.ELITE)); - - //Induction Provider recipes - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.BASIC), "LCL", "CEC", "LCL", - 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), 'L', "dustLithium"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ADVANCED), "CPC", "PEP", "CPC", - 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), 'P', - MekanismUtils.getInductionProvider(InductionProviderTier.BASIC)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ELITE), "CPC", "PEP", "CPC", - 'C', MekanismUtils.getControlCircuit(BaseTier.ELITE), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), 'P', - MekanismUtils.getInductionProvider(InductionProviderTier.ADVANCED)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getInductionProvider(InductionProviderTier.ULTIMATE), "CPC", "PEP", "CPC", - 'C', MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), 'E', - MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), 'P', - MekanismUtils.getInductionProvider(InductionProviderTier.ELITE)); - - //Circuit recipes - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 1), "ECE", 'C', - new ItemStack(MekanismItems.ControlCircuit, 1, 0), 'E', "alloyAdvanced"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 2), "RCR", 'C', - new ItemStack(MekanismItems.ControlCircuit, 1, 1), 'R', "alloyElite"); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 3), "ACA", 'C', - new ItemStack(MekanismItems.ControlCircuit, 1, 2), 'A', "alloyUltimate"); - - //Factory recipes - for (RecipeType type : RecipeType.values()) { - recipeGenerator.addShapedRecipe(MekanismUtils.getFactory(FactoryTier.BASIC, type), "RCR", "iOi", "RCR", 'R', - "alloyBasic", 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC), 'i', "ingotIron", 'O', - type.getStack()); - recipeGenerator - .addShapedRecipe(MekanismUtils.getFactory(FactoryTier.ADVANCED, type), "ECE", "oOo", "ECE", 'E', - "alloyAdvanced", 'C', MekanismUtils.getControlCircuit(BaseTier.ADVANCED), 'o', "ingotOsmium", - 'O', MekanismUtils.getFactory(FactoryTier.BASIC, type)); - recipeGenerator.addShapedRecipe(MekanismUtils.getFactory(FactoryTier.ELITE, type), "RCR", "gOg", "RCR", 'R', - "alloyElite", 'C', MekanismUtils.getControlCircuit(BaseTier.ELITE), 'g', "ingotGold", 'O', - MekanismUtils.getFactory(FactoryTier.ADVANCED, type)); - } - - //Add the bin recipe system to the CraftingManager - // CraftingManager.getInstance().getRecipeList().add(new BinRecipe(); - - //Transmitters - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.BASIC, 8), "SRS", - 'S', "ingotSteel", 'R', "dustRedstone"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ADVANCED, 8), - "TTT", "TET", "TTT", 'E', "alloyAdvanced", 'T', - MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.BASIC, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ELITE, 8), "TTT", - "TRT", "TTT", 'R', "alloyElite", 'T', - MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ADVANCED, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ULTIMATE, 8), - "TTT", "TAT", "TTT", 'A', "alloyUltimate", 'T', - MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ELITE, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.BASIC, 8), "SBS", - 'S', "ingotSteel", 'B', Items.BUCKET); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ADVANCED, 8), - "TTT", "TET", "TTT", 'E', "alloyAdvanced", 'T', - MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.BASIC, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ELITE, 8), "TTT", - "TRT", "TTT", 'R', "alloyElite", 'T', - MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ADVANCED, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ULTIMATE, 8), - "TTT", "TAT", "TTT", 'A', "alloyUltimate", 'T', - MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ELITE, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.BASIC, 8), "SGS", - 'S', "ingotSteel", 'G', "blockGlass"); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ADVANCED, 8), - "TTT", "TET", "TTT", 'E', "alloyAdvanced", 'T', - MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.BASIC, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ELITE, 8), "TTT", - "TRT", "TTT", 'R', "alloyElite", 'T', - MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ADVANCED, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ULTIMATE, 8), - "TTT", "TAT", "TTT", 'A', "alloyUltimate", 'T', - MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ELITE, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.BASIC, 8), - "SCS", 'S', "ingotSteel", 'C', MekanismUtils.getControlCircuit(BaseTier.BASIC)); - recipeGenerator.addShapedRecipe( - MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ADVANCED, 8), "TTT", "TET", - "TTT", 'E', "alloyAdvanced", 'T', - MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.BASIC, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ELITE, 8), - "TTT", "TRT", "TTT", 'R', "alloyElite", 'T', - MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ADVANCED, 1)); - recipeGenerator.addShapedRecipe( - MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ULTIMATE, 8), "TTT", "TAT", - "TTT", 'A', "alloyUltimate", 'T', - MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ELITE, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.RESTRICTIVE_TRANSPORTER, BaseTier.BASIC, 2), - "SBS", 'S', "ingotSteel", 'B', Blocks.IRON_BARS); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.DIVERSION_TRANSPORTER, BaseTier.BASIC, 2), - "RRR", "SBS", "RRR", 'R', "dustRedstone", 'S', "ingotSteel", 'B', Blocks.IRON_BARS); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.BASIC, 8), - "SCS", 'S', "ingotSteel", 'C', "ingotCopper"); - recipeGenerator.addShapedRecipe( - MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ADVANCED, 8), "TTT", "TET", - "TTT", 'E', "alloyAdvanced", 'T', - MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.BASIC, 1)); - recipeGenerator - .addShapedRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ELITE, 8), - "TTT", "TRT", "TTT", 'R', "alloyElite", 'T', - MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ADVANCED, 1)); - recipeGenerator.addShapedRecipe( - MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ULTIMATE, 8), "TTT", "TAT", - "TTT", 'A', "alloyUltimate", 'T', - MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ELITE, 1)); - - //Plastic stuff - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1), "PP", "PP", 'P', - new ItemStack(MekanismItems.Polyethene, 1, 0)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Polyethene, 1, 2), "PPP", "P P", "PPP", 'P', - new ItemStack(MekanismItems.Polyethene, 1, 0)); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismItems.Polyethene, 1, 3), "R", "R", 'R', - new ItemStack(MekanismItems.Polyethene, 1, 1)); - - //Creation of plastic block and glow panel with colors - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15), "SSS", "S S", "SSS", 'S', - new ItemStack(MekanismItems.Polyethene, 1, 2)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.GlowPanel, 2, 15), "PSP", "S S", "GSG", 'P', "paneGlass", - 'S', new ItemStack(MekanismItems.Polyethene, 1, 2), 'G', "dustGlowstone"); - for (int i = 0; i < EnumColor.DYES.length - 1; i++) { - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), "SSS", "SDS", "SSS", 'S', - new ItemStack(MekanismItems.Polyethene, 1, 2), 'D', "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.GlowPanel, 2, i), "PSP", "SDS", "GSG", 'P', "paneGlass", - 'S', new ItemStack(MekanismItems.Polyethene, 1, 2), 'D', "dye" + EnumColor.DYES[i].dyeName, 'G', - "dustGlowstone"); - } - - for (int i = 0; i < EnumColor.DYES.length; i++) { - /* - * Balloon - * Plastic block - * Slick - * Glow - * Reinforced - * Road - * Panel - * Fence - */ - - //Creation - recipeGenerator.addShapelessRecipe(new ItemStack(MekanismItems.Balloon, 2, i), Items.LEATHER, Items.STRING, - "dye" + EnumColor.DYES[i].dyeName); - //Plastic block creation is separate - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.SlickPlasticBlock, 4, i), " P ", "PSP", " P ", 'P', - new ItemStack(MekanismBlocks.PlasticBlock, 1, i), 'S', "slimeball"); - recipeGenerator.addShapelessRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), - new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), - new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.GLOWSTONE_DUST)); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "POP", " P ", 'P', - new ItemStack(MekanismBlocks.PlasticBlock, 1, i), 'O', "dustOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i), "SSS", "PPP", "SSS", 'S', - Blocks.SAND, 'P', new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i)); - //Panel creation is separate - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, i), "BSB", "BSB", 'B', - new ItemStack(MekanismBlocks.PlasticBlock, 1, i), 'S', new ItemStack(MekanismItems.Polyethene, 1, 3)); - - //Recolor - recipeGenerator.addShapelessRecipe(new ItemStack(MekanismItems.Balloon, 1, i), - new ItemStack(MekanismItems.Balloon, 1, OreDictionary.WILDCARD_VALUE), - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.PlasticBlock, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.SlickPlasticBlock, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.GlowPlasticBlock, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator - .addShapedRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.RoadPlasticBlock, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.GlowPanel, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.GlowPanel, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - recipeGenerator.addShapedRecipe(new ItemStack(MekanismBlocks.PlasticFence, 4, i), " P ", "PDP", " P ", 'P', - new ItemStack(MekanismBlocks.PlasticFence, 1, OreDictionary.WILDCARD_VALUE), 'D', - "dye" + EnumColor.DYES[i].dyeName); - } - } -} diff --git a/src/main/java/mekanism/common/recipe/generation/MekanismToolsRecipes.java b/src/main/java/mekanism/common/recipe/generation/MekanismToolsRecipes.java deleted file mode 100644 index 57cc2b83d..000000000 --- a/src/main/java/mekanism/common/recipe/generation/MekanismToolsRecipes.java +++ /dev/null @@ -1,185 +0,0 @@ -package mekanism.common.recipe.generation; - -import mekanism.tools.common.ToolsItems; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -/** - * Created by Tom Elfring on 24-6-2017. - */ -public class MekanismToolsRecipes { - - public static void generate() { - RecipeGenerator recipeGenerator = new RecipeGenerator("mekanismtools"); - - //Crafting Recipes - //Base - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.WoodPaxel, 1), "XYZ", " T ", " T ", 'X', Items.WOODEN_AXE, 'Y', - Items.WOODEN_PICKAXE, 'Z', Items.WOODEN_SHOVEL, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.StonePaxel, 1), "XYZ", " T ", " T ", 'X', Items.STONE_AXE, 'Y', - Items.STONE_PICKAXE, 'Z', Items.STONE_SHOVEL, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.IronPaxel, 1), "XYZ", " T ", " T ", 'X', Items.IRON_AXE, 'Y', - Items.IRON_PICKAXE, 'Z', Items.IRON_SHOVEL, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.DiamondPaxel, 1), "XYZ", " T ", " T ", 'X', Items.DIAMOND_AXE, - 'Y', Items.DIAMOND_PICKAXE, 'Z', Items.DIAMOND_SHOVEL, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.GoldPaxel, 1), "XYZ", " T ", " T ", 'X', Items.GOLDEN_AXE, 'Y', - Items.GOLDEN_PICKAXE, 'Z', Items.GOLDEN_SHOVEL, 'T', Items.STICK); - - //Obsidian - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianHelmet, 1), "***", "* *", '*', "ingotRefinedObsidian"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.ObsidianChestplate, 1), "* *", "***", "***", '*', - "ingotRefinedObsidian"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.ObsidianLeggings, 1), "***", "* *", "* *", '*', - "ingotRefinedObsidian"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianBoots, 1), "* *", "* *", '*', "ingotRefinedObsidian"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.ObsidianPaxel, 1), "XYZ", " T ", " T ", 'X', - ToolsItems.ObsidianAxe, 'Y', ToolsItems.ObsidianPickaxe, 'Z', ToolsItems.ObsidianShovel, 'T', - Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.ObsidianPickaxe, 1), "XXX", " T ", " T ", 'X', - "ingotRefinedObsidian", 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianAxe, 1), "XX", "XT", " T", 'X', "ingotRefinedObsidian", - 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianShovel, 1), "X", "T", "T", 'X', "ingotRefinedObsidian", - 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianHoe, 1), "XX", " T", " T", 'X', "ingotRefinedObsidian", - 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.ObsidianSword, 1), "X", "X", "T", 'X', "ingotRefinedObsidian", - 'T', Items.STICK); - - //Glowstone - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstonePaxel, 1), "XYZ", " T ", " T ", 'X', - ToolsItems.GlowstoneAxe, 'Y', ToolsItems.GlowstonePickaxe, 'Z', ToolsItems.GlowstoneShovel, 'T', - Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstonePickaxe, 1), "XXX", " T ", " T ", 'X', - "ingotRefinedGlowstone", 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneAxe, 1), "XX", "XT", " T", 'X', - "ingotRefinedGlowstone", 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneShovel, 1), "X", "T", "T", 'X', - "ingotRefinedGlowstone", 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneHoe, 1), "XX", " T", " T", 'X', - "ingotRefinedGlowstone", 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.GlowstoneSword, 1), "X", "X", "T", 'X', "ingotRefinedGlowstone", - 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneHelmet, 1), "***", "* *", '*', - "ingotRefinedGlowstone"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneChestplate, 1), "* *", "***", "***", '*', - "ingotRefinedGlowstone"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.GlowstoneLeggings, 1), "***", "* *", "* *", '*', - "ingotRefinedGlowstone"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.GlowstoneBoots, 1), "* *", "* *", '*', "ingotRefinedGlowstone"); - - //Lazuli - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliHelmet, 1), "***", "* *", '*', - new ItemStack(Items.DYE, 1, 4)); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliChestplate, 1), "* *", "***", "***", '*', - new ItemStack(Items.DYE, 1, 4)); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliLeggings, 1), "***", "* *", "* *", '*', - new ItemStack(Items.DYE, 1, 4)); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliBoots, 1), "* *", "* *", '*', - new ItemStack(Items.DYE, 1, 4)); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.LazuliPaxel, 1), "XYZ", " T ", " T ", 'X', ToolsItems.LazuliAxe, - 'Y', ToolsItems.LazuliPickaxe, 'Z', ToolsItems.LazuliShovel, 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliPickaxe, 1), "XXX", " T ", " T ", 'X', - new ItemStack(Items.DYE, 1, 4), 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliAxe, 1), "XX", "XT", " T", 'X', - new ItemStack(Items.DYE, 1, 4), 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliShovel, 1), "X", "T", "T", 'X', - new ItemStack(Items.DYE, 1, 4), 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliHoe, 1), "XX", " T", " T", 'X', - new ItemStack(Items.DYE, 1, 4), 'T', Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.LazuliSword, 1), "X", "X", "T", 'X', - new ItemStack(Items.DYE, 1, 4), 'T', Items.STICK); - - //Osmium - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumPaxel, 1), "XYZ", " T ", " T ", 'X', ToolsItems.OsmiumAxe, - 'Y', ToolsItems.OsmiumPickaxe, 'Z', ToolsItems.OsmiumShovel, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumPickaxe, 1), "XXX", " T ", " T ", 'X', "ingotOsmium", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumAxe, 1), "XX", "XT", " T", 'X', "ingotOsmium", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumShovel, 1), "X", "T", "T", 'X', "ingotOsmium", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumHoe, 1), "XX", " T", " T", 'X', "ingotOsmium", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumSword, 1), "X", "X", "T", 'X', "ingotOsmium", 'T', - Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.OsmiumHelmet, 1), "***", "* *", '*', "ingotOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumChestplate, 1), "* *", "***", "***", '*', "ingotOsmium"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.OsmiumLeggings, 1), "***", "* *", "* *", '*', "ingotOsmium"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.OsmiumBoots, 1), "* *", "* *", '*', "ingotOsmium"); - - //Bronze - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzePaxel, 1), "XYZ", " T ", " T ", 'X', ToolsItems.BronzeAxe, - 'Y', ToolsItems.BronzePickaxe, 'Z', ToolsItems.BronzeShovel, 'T', Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzePickaxe, 1), "XXX", " T ", " T ", 'X', "ingotBronze", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeAxe, 1), "XX", "XT", " T", 'X', "ingotBronze", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeShovel, 1), "X", "T", "T", 'X', "ingotBronze", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeHoe, 1), "XX", " T", " T", 'X', "ingotBronze", 'T', - Items.STICK); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeSword, 1), "X", "X", "T", 'X', "ingotBronze", 'T', - Items.STICK); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.BronzeHelmet, 1), "***", "* *", '*', "ingotBronze"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeChestplate, 1), "* *", "***", "***", '*', "ingotBronze"); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.BronzeLeggings, 1), "***", "* *", "* *", '*', "ingotBronze"); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.BronzeBoots, 1), "* *", "* *", '*', "ingotBronze"); - - //Steel - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.SteelPaxel, 1), "XYZ", " I ", " I ", 'X', ToolsItems.SteelAxe, - 'Y', ToolsItems.SteelPickaxe, 'Z', ToolsItems.SteelShovel, 'I', Items.IRON_INGOT); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.SteelPickaxe, 1), "XXX", " I ", " I ", 'X', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelAxe, 1), "XX", "XI", " I", 'X', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelShovel, 1), "X", "I", "I", 'X', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelHoe, 1), "XX", " I", " I", 'X', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelSword, 1), "X", "X", "I", 'X', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelHelmet, 1), "***", "I I", '*', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.SteelChestplate, 1), "I I", "*I*", "***", '*', "ingotSteel", - 'I', Items.IRON_INGOT); - recipeGenerator - .addShapedRecipe(new ItemStack(ToolsItems.SteelLeggings, 1), "I*I", "* *", "* *", '*', "ingotSteel", 'I', - Items.IRON_INGOT); - recipeGenerator.addShapedRecipe(new ItemStack(ToolsItems.SteelBoots, 1), "I *", "* I", '*', "ingotSteel", 'I', - Items.IRON_INGOT); - } -} diff --git a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java deleted file mode 100644 index 9968eff45..000000000 --- a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java +++ /dev/null @@ -1,252 +0,0 @@ -package mekanism.common.recipe.generation; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import mekanism.api.energy.IEnergizedItem; -import mekanism.api.gas.IGasItem; -import mekanism.common.Mekanism; -import mekanism.common.block.states.BlockStateBasic; -import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.security.ISecurityItem; -import mekanism.common.util.FluidContainerUtils; -import mekanism.generators.common.block.states.BlockStateGenerator; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public class RecipeGenerator { - - // Replace calls to GameRegistry.addShapeless/ShapedRecipe with these methods, which will dump it to a json in your dir of choice - // Also works with OD, replace GameRegistry.addRecipe(new ShapedOreRecipe/ShapelessOreRecipe with the same calls - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final File RECIPE_DIR; - - public RecipeGenerator(String modid) { - RECIPE_DIR = new File("recipeoutput" + File.separator + modid); - if (!RECIPE_DIR.exists()) { - boolean success = RECIPE_DIR.mkdirs(); - if (!success) { - throw new IllegalStateException("Cannot create recipe output dir!"); - } - } - } - - public static Map serializeItem(Object thing) { - if (thing instanceof Item) { - return serializeItem(new ItemStack((Item) thing)); - } - if (thing instanceof Block) { - return serializeItem(new ItemStack((Block) thing)); - } - if (thing instanceof ItemStack) { - ItemStack stack = (ItemStack) thing; - Map ret = new HashMap<>(); - ret.put("item", stack.getItem().getRegistryName().toString()); - if (stack.getItem().getHasSubtypes() || stack.getItemDamage() != 0) { - ret.put("data", stack.getItemDamage()); - } - if (stack.getCount() > 1) { - ret.put("count", stack.getCount()); - } - - if (stack.hasTagCompound()) { - Map tag = new HashMap<>(); - - NBTTagCompound compound = stack.getTagCompound(); - Set keySet = compound.getKeySet(); - - for (String key : keySet) { - - if (key.equals("tier") || key.equals("recipeType")) { - tag.put(key, compound.getInteger(key)); - } else if (key.equals("mekData")) { - //TODO - } else { - throw new IllegalArgumentException("Missing NBT mapping for Key: " + key); - } - } - ret.put("type", "mekanism:item_nbt"); - ret.put("nbt", tag); - } - - return ret; - } - if (thing instanceof String) { - String oredict = (String) thing; - Map ret = new HashMap<>(); - - //Filter circuits as they could be disabled -> Redirect the actual value to _constants.json with #OREDICTNAME - if (oredict.equals("circuitBasic") || oredict.equals("circuitAdvanced") || oredict.equals("circuitElite") - || oredict.equals("circuitUltimate")) { - ret.put("item", "#" + oredict.toUpperCase()); - } else { - ret.put("type", "forge:ore_dict"); - ret.put("ore", oredict); - } - - return ret; - } - - throw new IllegalArgumentException("Not a block, item, stack, or od name"); - } - - public void addShapedRecipe(ItemStack result, Object... components) { - Map json = new HashMap<>(); - - List pattern = new ArrayList<>(); - int i = 0; - while (i < components.length && components[i] instanceof String) { - pattern.add((String) components[i]); - i++; - } - json.put("pattern", pattern); - - boolean isOreDict = false; - Map> key = new HashMap<>(); - Character curKey = null; - for (; i < components.length; i++) { - Object o = components[i]; - if (o instanceof Character) { - if (curKey != null) { - Mekanism.logger.fatal("Failed to convert recipe. Provided two chars keys in a row", - new IllegalArgumentException()); - return; - } - curKey = (Character) o; - } else { - if (curKey == null) { - Mekanism.logger.fatal("Failed to convert recipe. Providing object without a char key", - new IllegalArgumentException()); - return; - } - if (o instanceof String) { - isOreDict = true; - } - try { - key.put(Character.toString(curKey), serializeItem(o)); - } catch (IllegalArgumentException e) { - Mekanism.logger.fatal("Failed to convert recipe", e); - return; - } - curKey = null; - } - } - json.put("key", key); - json.put("type", getRecipeType(result, isOreDict, true)); - try { - json.put("result", serializeItem(result)); - } catch (IllegalArgumentException e) { - Mekanism.logger.fatal("Failed to convert recipe", e); - return; - } - - // Add recipe_enabled condition to all available machine types. - BlockStateMachine.MachineType machineType = BlockStateMachine.MachineType.get(result); - if (machineType != null) { - Map condition = new HashMap<>(); - condition.put("type", "mekanism:recipe_enabled"); - condition.put("machineType", machineType.blockName); - json.put("conditions", new Object[]{condition}); - } - - // Add recipe_enabled condition to generator types which can be disabled. - BlockStateGenerator.GeneratorType generatorType = BlockStateGenerator.GeneratorType.get(result); - if (generatorType != null && result.getItemDamage() <= BlockStateGenerator.GeneratorType.WIND_GENERATOR.meta) { - Map condition = new HashMap<>(); - condition.put("type", "mekanism:recipe_enabled"); - condition.put("generatorType", generatorType.blockName); - json.put("conditions", new Object[]{condition}); - } - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getPath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getPath() + suffix + ".json"); - } - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - Mekanism.logger.fatal("Failed to write JSON", e); - } - } - - public void addShapelessRecipe(ItemStack result, Object... components) { - Map json = new HashMap<>(); - - boolean isOreDict = false; - List> ingredients = new ArrayList<>(); - for (Object o : components) { - if (o instanceof String) { - isOreDict = true; - } - try { - ingredients.add(serializeItem(o)); - } catch (IllegalArgumentException e) { - Mekanism.logger.fatal("Failed to convert recipe", e); - return; - } - } - json.put("ingredients", ingredients); - json.put("type", getRecipeType(result, isOreDict, false)); - - try { - json.put("result", serializeItem(result)); - } catch (IllegalArgumentException e) { - Mekanism.logger.fatal("Failed to convert recipe", e); - return; - } - - // names the json the same name as the output's registry name - // repeatedly adds _alt if a file already exists - // janky I know but it works - String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : ""; - File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getPath() + suffix + ".json"); - - while (f.exists()) { - suffix += "_alt"; - f = new File(RECIPE_DIR, result.getItem().getRegistryName().getPath() + suffix + ".json"); - } - - try (FileWriter w = new FileWriter(f)) { - GSON.toJson(json, w); - } catch (IOException e) { - Mekanism.logger.fatal("Failed to write JSON", e); - } - } - - private String getRecipeType(ItemStack result, boolean isOreDict, boolean shaped) { - String type = shaped ? "minecraft:crafting_shaped" : "minecraft:crafting_shapeless"; - if (isOreDict) { - Item resultItem = result.getItem(); - if (resultItem instanceof IEnergizedItem || - resultItem instanceof IGasItem || - resultItem instanceof ISecurityItem || - FluidContainerUtils.isFluidContainer(result) || - BlockStateBasic.BasicBlockType.get(result) == BlockStateBasic.BasicBlockType.BIN || - BlockStateMachine.MachineType.get(result) != null && BlockStateMachine.MachineType - .get(result).supportsUpgrades) { - type = shaped ? "mekanism:ore_shaped" : "mekanism:ore_shapeless"; - } else { - type = shaped ? "forge:ore_shaped" : "forge:ore_shapeless"; - } - } - - return type; - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 8c9eda1a4..2c2572981 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.base.TileNetworkList; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.boiler.BoilerCache; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 82e2558b4..824f2b150 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -118,8 +118,9 @@ public abstract class TileEntityChanceMachine implements diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 46f835dc8..991eef44c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -10,6 +10,7 @@ import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; +import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; import mekanism.common.base.FluidHandlerWrapper; @@ -54,7 +55,6 @@ import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandlerWrapper, ISustainedTank, IConfigurable, IRedstoneControl, IUpgradeTile, ITankManager, IComputerIntegration, ISecurityTile { @@ -348,8 +348,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if (slotID == 2) { return ChargeUtils.canBeOutputted(itemstack, false); - } else + } else { return slotID == 1; + } } @@ -442,8 +443,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side) { reset(); - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils - .localize("tooltip.configurator.pumpReset"))); + player.sendMessage( + new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.configurator.pumpReset"))); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 6327c5104..e216156a1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -476,8 +476,9 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt return true; } else if (tier == FactoryTier.ADVANCED && slotID >= 10 && slotID <= 14) { return true; - } else + } else { return tier == FactoryTier.ELITE && slotID >= 12 && slotID <= 18; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 9b1033399..b4699b219 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -9,6 +9,7 @@ import javax.annotation.Nonnull; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; +import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; @@ -43,14 +44,12 @@ import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandlerWrapper, ISustainedTank, IUpgradeTile, IRedstoneControl, ISecurityTile { @@ -307,8 +306,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if (slotID == 2) { return ChargeUtils.canBeOutputted(itemstack, false); - } else + } else { return slotID == 1; + } } @@ -403,8 +403,9 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen usedNodes.clear(); finishedCalc = false; - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils - .localize("tooltip.configurator.plenisherReset"))); + player.sendMessage( + new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.configurator.plenisherReset"))); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 82b955c38..84aaf2d82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -469,8 +469,9 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if (slotID == 1) { return ChargeUtils.canBeOutputted(itemstack, false); - } else + } else { return slotID >= 21 && slotID <= 26; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index c523de378..65be56fa3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -69,6 +69,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; + public TileEntityGasTank() { super("GasTank"); diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 7f7c182ae..a8fce211d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -402,8 +402,9 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement mode = !mode; String modeText = " " + (mode ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(mode) + "."; - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils - .localize("tooltip.configurator.inductionPortMode") + modeText)); + player.sendMessage( + new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.configurator.inductionPortMode") + modeText)); Mekanism.packetHandler .sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 3c4125f34..c9dca0244 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -198,8 +198,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if (slotID == 4) { return ChargeUtils.canBeOutputted(itemstack, false); - } else + } else { return slotID == 3; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 66539268f..188885f8f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -185,8 +185,9 @@ public class TileEntityPRC extends public boolean canExtractItem(int slotID, @Nonnull ItemStack itemstack, @Nonnull EnumFacing side) { if (slotID == 1) { return ChargeUtils.canBeOutputted(itemstack, false); - } else + } else { return slotID == 2 || slotID == 4; + } } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java index 907eb39c4..d72416080 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicBlock.java @@ -70,8 +70,8 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe if (type != null && !type.isEnabled()) { Mekanism.logger - .info("[Mekanism] Destroying machine of type '" + type.blockName + "' at coords " + Coord4D - .get(this) + " as according to config."); + .info("Destroying machine of type '" + type.blockName + "' at coords " + Coord4D.get(this) + + " as according to config."); world.setBlockToAir(getPos()); return; } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java index 7f49a025e..b2cfcec7a 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityDoubleElectricMachine.java @@ -163,8 +163,9 @@ public abstract class TileEntityDoubleElectricMachine 0; } - } else + } else { return InventoryUtils.isItemHandler(tile, side.getOpposite()); + } return false; } diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index d7e080914..25fd8a74f 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -2,7 +2,6 @@ package mekanism.generators.client.render.item; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.annotation.Nonnull; @@ -31,7 +30,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformT import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index cbd2c72ab..48f96e6a3 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -10,10 +10,11 @@ import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.registries.IForgeRegistry; -@ObjectHolder("mekanismgenerators") +@ObjectHolder(MekanismGenerators.MODID) public class GeneratorsBlocks { public static final Block Generator = BlockGenerator.getGeneratorBlock(GENERATOR_BLOCK_1); @@ -33,6 +34,6 @@ public class GeneratorsBlocks { } public static Block init(Block block, String name) { - return block.setTranslationKey(name).setRegistryName("mekanismgenerators:" + name); + return block.setTranslationKey(name).setRegistryName(new ResourceLocation(MekanismGenerators.MODID, name)); } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index 14cb1f68a..fbb349f91 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -7,12 +7,13 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.registries.IForgeRegistry; -@ObjectHolder("mekanismgenerators") +@ObjectHolder(MekanismGenerators.MODID) public class GeneratorsItems { public static final Item SolarPanel = new ItemMekanism(); @@ -31,6 +32,6 @@ public class GeneratorsItems { } public static Item init(Item item, String name) { - return item.setTranslationKey(name).setRegistryName("mekanismgenerators:" + name); + return item.setTranslationKey(name).setRegistryName(new ResourceLocation(MekanismGenerators.MODID, name)); } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 1da06f6c0..82d06d655 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -41,16 +41,16 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.oredict.OreDictionary; -@Mod(modid = "mekanismgenerators", name = "MekanismGenerators", version = "${version}", useMetadata = true, - dependencies = "required-after:mekanism", - guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory", acceptedMinecraftVersions = "[1.12,1.13)") +@Mod(modid = MekanismGenerators.MODID, useMetadata = true, guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") @Mod.EventBusSubscriber() public class MekanismGenerators implements IModule { + public static final String MODID = "mekanismgenerators"; + @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") public static GeneratorsCommonProxy proxy; - @Instance("mekanismgenerators") + @Instance(MekanismGenerators.MODID) public static MekanismGenerators instance; /** diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 26abdd091..aff0280ae 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import javax.annotation.Nonnull; import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTankInfo; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 8b7c2137a..a74dd10a0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -100,8 +100,8 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement if (type != null && !type.isEnabled()) { Mekanism.logger - .info("[Mekanism] Destroying generator of type '" + type.blockName + "' at coords " + Coord4D - .get(this) + " as according to config."); + .info("Destroying generator of type '" + type.blockName + "' at coords " + Coord4D.get(this) + + " as according to config."); world.setBlockToAir(getPos()); return; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index d2557c245..db71a1e6d 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -23,8 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 4ac3212f3..3545aad2d 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -414,8 +414,9 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl fluidEject = !fluidEject; String modeText = " " + (fluidEject ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils .transOutputInput(fluidEject) + "."; - player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils - .localize("tooltip.configurator.reactorPortEject") + modeText)); + player.sendMessage( + new TextComponentString(EnumColor.DARK_BLUE + Mekanism.LOG_TAG + " " + EnumColor.GREY + LangUtils + .localize("tooltip.configurator.reactorPortEject") + modeText)); Mekanism.packetHandler .sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new TileNetworkList())), new Range4D(Coord4D.get(this))); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index c62ae61ab..4a6bdacac 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -6,7 +6,6 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.base.TileNetworkList; import mekanism.common.config.MekanismConfig.general; import mekanism.common.config.MekanismConfig.generators; @@ -26,8 +25,6 @@ import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityTurbineCasing extends TileEntityMultiblock implements diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 16446d852..25e2c1570 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -30,7 +30,6 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 28155b44e..bc79b8d70 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -33,16 +33,16 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = "mekanismtools", name = "MekanismTools", version = "${version}", useMetadata = true, - dependencies = "required-after:mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory", - acceptedMinecraftVersions = "[1.12,1.13)") +@Mod(modid = MekanismTools.MODID, useMetadata = true, guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") @Mod.EventBusSubscriber() public class MekanismTools implements IModule { + public static final String MODID = "mekanismtools"; + @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") public static ToolsCommonProxy proxy; - @Instance("mekanismtools") + @Instance(MekanismTools.MODID) public static MekanismTools instance; /** @@ -104,7 +104,7 @@ public class MekanismTools implements IModule { proxy.loadConfiguration(); //Finalization - Mekanism.logger.info("Loaded MekanismTools module."); + Mekanism.logger.info("Loaded 'Mekanica: Tools' module."); } public void addItems() { diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index e8b06c636..7bfb99f56 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -10,10 +10,11 @@ import mekanism.tools.item.ItemMekanismSword; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.registries.IForgeRegistry; -@ObjectHolder("mekanismtools") +@ObjectHolder(MekanismTools.MODID) public class ToolsItems { //Vanilla Material Paxels @@ -311,6 +312,6 @@ public class ToolsItems { } public static Item init(Item item, String name) { - return item.setTranslationKey(name).setRegistryName("mekanismtools:" + name); + return item.setTranslationKey(name).setRegistryName(new ResourceLocation(MekanismTools.MODID, name)); } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 1e3a56864..b81a829cc 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,61 +1,69 @@ -[ -{ - "modid": "mekanism", - "name": "Mekanism", - "description": "Energy, Armor, Tools, Weapons, Machines, Magic.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authorList": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ] -}, -{ - "modid": "mekanismgenerators", - "name": "MekanismGenerators", - "description": "Generators module of Mekanism.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authorList": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ], - "useDependencyInformation": true, - "dependencies":[ - "mekanism@[${version}]" - ], - "requiredMods":[ - "mekanism@[${version}]" - ] -}, -{ - "modid": "mekanismtools", - "name": "MekanismTools", - "description": "Tools module for Mekanism.", - "version": "${version}", - "mcversion": "${mc_version}", - "updateUrl": "", - "authorList": [ - "aidancbrady" - ], - "credits": "Thanks to everyone who has contributed to this ongoing project.", - "logoFile": "logo.png", - "screenshots": [ - ], - "useDependencyInformation": true, - "dependencies":[ - "mekanism@[${version}]" - ], - "requiredMods":[ - "mekanism@[${version}]" - ] -} -] +[ + { + "modid": "mekanism", + "name": "Mekanica", + "description": "Tools and Machines; an active fork of Mekanism", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "forge", + "redstoneflux", + "mcmultipart", + "jei", + "buildcraft", + "buildcraftapi", + "ic2", + "computercraft", + "galaticraft api", + "metallurgy", + "crafttweaker" + ], + "requiredMods": [ + "forge@[14.21.0.2373,)" + ] + }, + { + "modid": "mekanismgenerators", + "name": "Mekanica: Generators", + "description": "Generators module for Mekanica", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "mekanism@[${version}]" + ], + "requiredMods": [ + "mekanism@[${version}]" + ] + }, + { + "modid": "mekanismtools", + "name": "Mekanica: Tools", + "description": "Tools module for Mekanica", + "version": "${version}", + "mcversion": "${mc_version}", + "authorList": [ + "pupnewfster", + "dizzyd" + ], + "credits": "aidancbrady, thommy101, thiakil, unpairedbracket, CyanideX and many others", + "useDependencyInformation": true, + "dependencies": [ + "mekanism@[${version}]" + ], + "requiredMods": [ + "mekanism@[${version}]" + ] + } +]