diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2c770e0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run diff --git a/build.gradle b/build.gradle index da69782..73fbb83 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,17 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.3.4" -group= "pers.towdium.justEnoughCalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "je_calculation" +version = "${mc_version}-${proj_version}" +group = "me.towdium.jecalculation" +archivesBaseName = "jecalculation" + +sourceCompatibility = targetCompatibility = '1.8' +compileJava { + sourceCompatibility = targetCompatibility = '1.8' +} minecraft { - version = "1.7.10-10.13.4.1558-1.7.10" + version = '1.7.10-10.13.4.1614-1.7.10' runDir = "eclipse" } @@ -37,21 +42,18 @@ repositories { name 'CB Repo' url "http://chickenbones.net/maven/" } + flatDir { + dirs 'libs' + } } -sourceCompatibility = 1.7 -targetCompatibility = 1.7 - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. //compile "some.group:artifact:version:classifier" //compile "some.group:artifact:version" - + // real examples //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env @@ -59,15 +61,12 @@ dependencies { // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html - compile "codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev" - compile "codechicken:CodeChickenLib:1.7.10-1.1.1.99:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev" - - + compile "codechicken:NotEnoughItems:${mc_version}-${nei_version}:dev" + compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev' + compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev' } -processResources -{ +processResources { // this will ensure that this task is redone when the versions change. inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version @@ -75,13 +74,17 @@ processResources // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - + // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version + expand 'version': project.version, 'mcversion': project.minecraft.version } - + // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' } } + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..b6d1b5c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,7 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +# suppress inspection "UnusedProperty" for whole file +mc_version=1.7.10 +nei_version=2.0.11-GTNH +proj_version=0.4.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..a4e35a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-dev.jar b/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-dev.jar new file mode 100644 index 0000000..a3b426d Binary files /dev/null and b/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-dev.jar differ diff --git a/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-src.jar b/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-src.jar new file mode 100644 index 0000000..0380c84 Binary files /dev/null and b/libs/NotEnoughItems-1.7.10-2.0.11-GTNH-src.jar differ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/me/towdium/jecalculation/JustEnoughCalculation.java similarity index 62% rename from src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java rename to src/main/java/me/towdium/jecalculation/JustEnoughCalculation.java index 7672205..9d31332 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/me/towdium/jecalculation/JustEnoughCalculation.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation; +package me.towdium.jecalculation; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -8,19 +8,18 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; +import me.towdium.jecalculation.item.ItemCalculator; +import me.towdium.jecalculation.network.IProxy; +import me.towdium.jecalculation.network.packets.PacketCalculatorUpdate; +import me.towdium.jecalculation.network.packets.PacketRecipeUpdate; +import me.towdium.jecalculation.network.packets.PacketSyncRecord; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.oredict.ShapedOreRecipe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pers.towdium.justEnoughCalculation.item.ItemCalculator; -import pers.towdium.justEnoughCalculation.network.IProxy; -import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; -import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; -import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.io.File; import java.lang.reflect.Field; @@ -30,57 +29,65 @@ import java.util.ArrayList; * @author Towdium */ -@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION, - dependencies = "after:NotEnoughItems") -public class JustEnoughCalculation{ - public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator").setTextureName(Reference.MODID + ":" + "itemCalculator"); +@Mod(modid = JustEnoughCalculation.Reference.MODID, + name = JustEnoughCalculation.Reference.MODNAME, + version = JustEnoughCalculation.Reference.VERSION, + dependencies = "after:NotEnoughItems") +public class JustEnoughCalculation { + public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator") + .setTextureName(Reference.MODID + ":" + + "itemCalculator"); public static SimpleNetworkWrapper networkWrapper; public static Logger log = LogManager.getLogger(Reference.MODID); - @SidedProxy(clientSide = "pers.towdium.justEnoughCalculation.network.ProxyClient", serverSide = "pers.towdium.justEnoughCalculation.network.ProxyServer") + @SidedProxy(clientSide = "me.towdium.jecalculation.network.ProxyClient", + serverSide = "me.towdium.jecalculation.network.ProxyServer") public static IProxy proxy; @Mod.Instance(JustEnoughCalculation.Reference.MODID) public static JustEnoughCalculation instance; - public static class Reference { - public static final String MODID = "je_calculation"; - public static final String MODNAME = "Just Enough Calculation"; - public static final String VERSION = "0.3.4"; - } @Mod.EventHandler - public static void preInit(FMLPreInitializationEvent event){ + public static void preInit(FMLPreInitializationEvent event) { JECConfig.preInit(event); - GameRegistry.registerItem(itemCalculator,itemCalculator.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemCalculator, itemCalculator.getUnlocalizedName().substring(5)); networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Reference.MODID); - networkWrapper.registerMessage(PacketCalculatorUpdate.class, PacketCalculatorUpdate.class, 1, Side.SERVER); - networkWrapper.registerMessage(PacketRecipeUpdate.class, PacketRecipeUpdate.class, 2, Side.SERVER); - networkWrapper.registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 3, Side.CLIENT); - networkWrapper.registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 4, Side.SERVER); + networkWrapper + .registerMessage(PacketCalculatorUpdate.class, PacketCalculatorUpdate.class, 1, + Side.SERVER); + networkWrapper.registerMessage(PacketRecipeUpdate.class, PacketRecipeUpdate.class, 2, + Side.SERVER); + networkWrapper + .registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 3, Side.CLIENT); + networkWrapper + .registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 4, Side.SERVER); } @Mod.EventHandler - public static void init(FMLInitializationEvent event){ + public static void iniFt(FMLInitializationEvent event) { /*if(event.getSide().isClient()){ Minecraft.getMinecraft().getRenderItem().getItemModelMesher(). register(itemCalculator, 0, new ModelResourceLocation(Reference.MODID + ":" + itemCalculator.getUnlocalizedName().substring(5), "inventory")); }*/ - ShapedOreRecipe recipe = new ShapedOreRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SOS", 'S', "stone", 'I', "dyeBlack", 'R', "dustRedstone", 'O', "ingotIron"){ + ShapedOreRecipe recipe = new ShapedOreRecipe(new ItemStack(itemCalculator), "SIS", "SRS", + "SOS", 'S', "stone", 'I', "dyeBlack", 'R', + "dustRedstone", 'O', "ingotIron") { { try { Field f = ShapedOreRecipe.class.getDeclaredField("input"); f.setAccessible(true); Object[] o = (Object[]) f.get(this); - if(o[1] instanceof ArrayList){ + if (o[1] instanceof ArrayList) { ArrayList buffer = (ArrayList) o[1]; ArrayList a = new ArrayList(buffer); Item i = GameRegistry.findItem("Botania", "dye"); if (i != null) - a.add(new ItemStack(i,1,15)); + a.add(new ItemStack(i, 1, 15)); o[1] = a; } - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } }; GameRegistry.addRecipe(recipe); @@ -89,29 +96,28 @@ public class JustEnoughCalculation{ //DefaultOverlayHandler } - public static class JECConfig{ + public static class JECConfig { public static boolean initialized = false; public static Configuration config; - public enum EnumItems { - EnableInventoryCheck, - ListRecipeBlackList, - ListRecipeCategory; - public String getComment(){ - switch (this){ + public enum EnumItems { + EnableInventoryCheck, ListRecipeBlackList, ListRecipeCategory; + + public String getComment() { + switch (this) { case EnableInventoryCheck: return "Set to false to disable auto inventory check"; case ListRecipeBlackList: return "Add string identifier here to disable quick transfer of this type recipe\n" + - "Names can be found in ListRecipeCategory"; + "Names can be found in ListRecipeCategory"; case ListRecipeCategory: return "List of categories, this is maintained by the mod automatically"; } return ""; } - public String getName(){ - switch (this){ + public String getName() { + switch (this) { case EnableInventoryCheck: return "EnableInventoryCheck"; case ListRecipeBlackList: @@ -122,8 +128,8 @@ public class JustEnoughCalculation{ return ""; } - public String getCategory(){ - switch (this){ + public String getCategory() { + switch (this) { case EnableInventoryCheck: return EnumCategory.General.toString(); case ListRecipeBlackList: @@ -134,8 +140,8 @@ public class JustEnoughCalculation{ return ""; } - public EnumType getType(){ - switch (this){ + public EnumType getType() { + switch (this) { case EnableInventoryCheck: return EnumType.Boolean; case ListRecipeBlackList: @@ -146,8 +152,8 @@ public class JustEnoughCalculation{ return EnumType.Error; } - public Object getDefault(){ - switch (this){ + public Object getDefault() { + switch (this) { case EnableInventoryCheck: return true; case ListRecipeBlackList: @@ -158,21 +164,23 @@ public class JustEnoughCalculation{ return JECConfig.empty; } - public Property init(){ + public Property init() { EnumType type = this.getType(); - if(type != null){ - switch (this.getType()){ + if (type != null) { + switch (this.getType()) { case Boolean: - return config.get(this.getCategory(), this.getName(), (Boolean) this.getDefault(), this.getComment()); + return config.get(this.getCategory(), this.getName(), + (Boolean) this.getDefault(), this.getComment()); case ListString: - return config.get(this.getCategory(), this.getName(), (String[]) this.getDefault(), this.getComment()); + return config.get(this.getCategory(), this.getName(), + (String[]) this.getDefault(), this.getComment()); } config.getCategory(EnumCategory.General.toString()).get(this.getName()); } return config.get(this.getCategory(), this.getName(), false, this.getComment()); } - public Property getProperty(){ + public Property getProperty() { return config.getCategory(EnumCategory.General.toString()).get(this.getName()); } } @@ -182,7 +190,7 @@ public class JustEnoughCalculation{ @Override public String toString() { - switch (this){ + switch (this) { case General: return "general"; default: @@ -191,30 +199,38 @@ public class JustEnoughCalculation{ } } - public enum EnumType { Boolean, ListString, Error } + public enum EnumType {Boolean, ListString, Error} public static Object empty; - public static void preInit(FMLPreInitializationEvent event){ - config = new Configuration(new File(event.getModConfigurationDirectory(), "JustEnoughCalculation" +".cfg"), Reference.VERSION); + public static void preInit(FMLPreInitializationEvent event) { + config = new Configuration(new File(event.getModConfigurationDirectory(), + "JustEnoughCalculation" + ".cfg"), + Reference.VERSION); config.load(); handleFormerVersion(); handleInit(); config.save(); } - public static void handleFormerVersion(){ + public static void handleFormerVersion() { config.getCategory("general").remove("RecipeTypeSupport"); } - public static void handleInit(){ - for(EnumItems item : EnumItems.values()){ + public static void handleInit() { + for (EnumItems item : EnumItems.values()) { item.init(); } } - public static void save(){ + public static void save() { config.save(); } } + + public static class Reference { + public static final String MODID = "jecalculation"; + public static final String MODNAME = "Just Enough Calculation"; + public static final String VERSION = "@VERSION@"; + } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java b/src/main/java/me/towdium/jecalculation/core/Calculator.java similarity index 95% rename from src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java rename to src/main/java/me/towdium/jecalculation/core/Calculator.java index 31420a4..9e0e009 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java +++ b/src/main/java/me/towdium/jecalculation/core/Calculator.java @@ -1,7 +1,7 @@ -package pers.towdium.justEnoughCalculation.core; +package me.towdium.jecalculation.core; +import me.towdium.jecalculation.JustEnoughCalculation; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java b/src/main/java/me/towdium/jecalculation/core/CostRecord.java similarity index 99% rename from src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java rename to src/main/java/me/towdium/jecalculation/core/CostRecord.java index ff28376..d9d722c 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java +++ b/src/main/java/me/towdium/jecalculation/core/CostRecord.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.core; +package me.towdium.jecalculation.core; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java b/src/main/java/me/towdium/jecalculation/core/ItemRecord.java similarity index 98% rename from src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java rename to src/main/java/me/towdium/jecalculation/core/ItemRecord.java index 2995906..df6ad66 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java +++ b/src/main/java/me/towdium/jecalculation/core/ItemRecord.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.core; +package me.towdium.jecalculation.core; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java b/src/main/java/me/towdium/jecalculation/core/ItemStackWrapper.java similarity index 99% rename from src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java rename to src/main/java/me/towdium/jecalculation/core/ItemStackWrapper.java index d207ac8..3490797 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java +++ b/src/main/java/me/towdium/jecalculation/core/ItemStackWrapper.java @@ -1,8 +1,8 @@ -package pers.towdium.justEnoughCalculation.core; +package me.towdium.jecalculation.core; +import me.towdium.jecalculation.JustEnoughCalculation; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java b/src/main/java/me/towdium/jecalculation/core/Recipe.java similarity index 99% rename from src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java rename to src/main/java/me/towdium/jecalculation/core/Recipe.java index b856ad6..2384ddc 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java +++ b/src/main/java/me/towdium/jecalculation/core/Recipe.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.core; +package me.towdium.jecalculation.core; import com.google.common.collect.ImmutableList; import cpw.mods.fml.common.network.ByteBufUtils; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java b/src/main/java/me/towdium/jecalculation/event/GuiEventHandler.java similarity index 97% rename from src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java rename to src/main/java/me/towdium/jecalculation/event/GuiEventHandler.java index 0f24c29..0e08ced 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java +++ b/src/main/java/me/towdium/jecalculation/event/GuiEventHandler.java @@ -1,11 +1,11 @@ -package pers.towdium.justEnoughCalculation.event; +package me.towdium.jecalculation.event; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; +import me.towdium.jecalculation.gui.guis.calculator.GuiCalculator; import net.minecraftforge.client.event.GuiOpenEvent; -import pers.towdium.justEnoughCalculation.gui.guis.calculator.GuiCalculator; import java.util.Date; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java b/src/main/java/me/towdium/jecalculation/event/PlayerEventHandler.java similarity index 56% rename from src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java rename to src/main/java/me/towdium/jecalculation/event/PlayerEventHandler.java index 0222922..f573e72 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java +++ b/src/main/java/me/towdium/jecalculation/event/PlayerEventHandler.java @@ -1,21 +1,10 @@ -package pers.towdium.justEnoughCalculation.event; +package me.towdium.jecalculation.event; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.ICraftingHandler; -import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.guis.calculator.ContainerCalculator; import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import net.minecraftforge.event.entity.player.PlayerEvent.*; -import pers.towdium.justEnoughCalculation.gui.guis.calculator.ContainerCalculator; - -import java.util.ArrayList; -import java.util.List; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java b/src/main/java/me/towdium/jecalculation/gui/GuiHandler.java similarity index 62% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java rename to src/main/java/me/towdium/jecalculation/gui/GuiHandler.java index 07f7cea..1434a0a 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java +++ b/src/main/java/me/towdium/jecalculation/gui/GuiHandler.java @@ -1,17 +1,17 @@ -package pers.towdium.justEnoughCalculation.gui; +package me.towdium.jecalculation.gui; import cpw.mods.fml.common.network.IGuiHandler; +import me.towdium.jecalculation.JustEnoughCalculation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.guis.calculator.ContainerCalculator; -import pers.towdium.justEnoughCalculation.gui.guis.calculator.GuiCalculator; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipePicker.GuiRecipePicker; -import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.ContainerRecipeViewer; -import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.GuiRecipeViewer; +import me.towdium.jecalculation.gui.guis.calculator.ContainerCalculator; +import me.towdium.jecalculation.gui.guis.calculator.GuiCalculator; +import me.towdium.jecalculation.gui.commom.recipe.ContainerRecipe; +import me.towdium.jecalculation.gui.guis.recipeEditor.ContainerRecipeEditor; +import me.towdium.jecalculation.gui.guis.recipeEditor.GuiRecipeEditor; +import me.towdium.jecalculation.gui.guis.recipePicker.GuiRecipePicker; +import me.towdium.jecalculation.gui.guis.recipeViewer.ContainerRecipeViewer; +import me.towdium.jecalculation.gui.guis.recipeViewer.GuiRecipeViewer; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java b/src/main/java/me/towdium/jecalculation/gui/commom/GuiJustEnoughCalculation.java similarity index 93% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java rename to src/main/java/me/towdium/jecalculation/gui/commom/GuiJustEnoughCalculation.java index 9e4f7dd..edde4c0 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java +++ b/src/main/java/me/towdium/jecalculation/gui/commom/GuiJustEnoughCalculation.java @@ -1,7 +1,6 @@ -package pers.towdium.justEnoughCalculation.gui.commom; +package me.towdium.jecalculation.gui.commom; import codechicken.nei.guihook.GuiContainerManager; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -11,8 +10,7 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; +import me.towdium.jecalculation.core.ItemStackWrapper; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -27,7 +25,7 @@ public abstract class GuiJustEnoughCalculation extends GuiContainer { protected RenderItem renderItem = new RenderItem(){ @Override public void renderItemOverlayIntoGUI(FontRenderer p_77021_1_, TextureManager p_77021_2_, ItemStack p_77021_3_, int p_77021_4_, int p_77021_5_, String text) { - if(p_77021_3_!=null && p_77021_3_.hasTagCompound() && p_77021_3_.getTagCompound().getBoolean("je_calculation")){ + if(p_77021_3_!=null && p_77021_3_.hasTagCompound() && p_77021_3_.getTagCompound().getBoolean("jecalculation")){ boolean b = p_77021_1_.getUnicodeFlag(); p_77021_1_.setUnicodeFlag(true); super.renderItemOverlayIntoGUI(p_77021_1_, p_77021_2_, p_77021_3_, p_77021_4_, p_77021_5_, ItemStackWrapper.getDisplayAmount(p_77021_3_)); diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java b/src/main/java/me/towdium/jecalculation/gui/commom/GuiTooltipScreen.java similarity index 96% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java rename to src/main/java/me/towdium/jecalculation/gui/commom/GuiTooltipScreen.java index 4254585..6941e62 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java +++ b/src/main/java/me/towdium/jecalculation/gui/commom/GuiTooltipScreen.java @@ -1,30 +1,21 @@ -package pers.towdium.justEnoughCalculation.gui.commom; +package me.towdium.jecalculation.gui.commom; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; -import codechicken.nei.guihook.GuiContainerManager; import com.google.common.collect.ImmutableList; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryBasic; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.InventoryRecipe; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; /** * CODE IS DONE BY Zyin055 diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/ContainerRecipe.java similarity index 92% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java rename to src/main/java/me/towdium/jecalculation/gui/commom/recipe/ContainerRecipe.java index 9d76148..1cc4480 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/ContainerRecipe.java @@ -1,13 +1,12 @@ -package pers.towdium.justEnoughCalculation.gui.commom.recipe; +package me.towdium.jecalculation.gui.commom.recipe; +import me.towdium.jecalculation.JustEnoughCalculation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemRecord; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.core.Recipe; +import me.towdium.jecalculation.core.ItemStackWrapper; +import me.towdium.jecalculation.core.Recipe; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/GuiRecipe.java similarity index 91% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java rename to src/main/java/me/towdium/jecalculation/gui/commom/recipe/GuiRecipe.java index c36dc38..8a51597 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/GuiRecipe.java @@ -1,8 +1,8 @@ -package pers.towdium.justEnoughCalculation.gui.commom.recipe; +package me.towdium.jecalculation.gui.commom.recipe; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.core.Recipe; +import me.towdium.jecalculation.gui.commom.GuiTooltipScreen; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; @@ -11,15 +11,10 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.gui.commom.GuiTooltipScreen; +import me.towdium.jecalculation.core.ItemStackWrapper; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.io.IOException; -import java.lang.reflect.Field; import java.util.List; /** @@ -168,7 +163,7 @@ public class GuiRecipe extends GuiTooltipScreen { public boolean handleDragNDrop(GuiContainer guiContainer, int i, int i1, ItemStack itemStack, int i2) { //JustEnoughCalculation.log.info(itemStack.toString()); ItemStack buffer = itemStack.copy(); - ItemStackWrapper.NBT.setBool(buffer, "je_calculation", true); + ItemStackWrapper.NBT.setBool(buffer, "jecalculation", true); buffer.stackSize=1; Slot slot = getSlotUnderMouse(i, i1); if(slot!=null){ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/InventoryRecipe.java b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/InventoryRecipe.java similarity index 76% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/InventoryRecipe.java rename to src/main/java/me/towdium/jecalculation/gui/commom/recipe/InventoryRecipe.java index 7ca614f..d38c83b 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/InventoryRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/commom/recipe/InventoryRecipe.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.gui.commom.recipe; +package me.towdium.jecalculation.gui.commom.recipe; import net.minecraft.inventory.InventoryBasic; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/ContainerCalculator.java similarity index 90% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java rename to src/main/java/me/towdium/jecalculation/gui/guis/calculator/ContainerCalculator.java index aebc251..7b23ab7 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/ContainerCalculator.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/ContainerCalculator.java @@ -1,11 +1,9 @@ -package pers.towdium.justEnoughCalculation.gui.guis.calculator; +package me.towdium.jecalculation.gui.guis.calculator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/GuiCalculator.java similarity index 94% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java rename to src/main/java/me/towdium/jecalculation/gui/guis/calculator/GuiCalculator.java index 214f821..6436ed5 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/GuiCalculator.java @@ -1,10 +1,12 @@ -package pers.towdium.justEnoughCalculation.gui.guis.calculator; +package me.towdium.jecalculation.gui.guis.calculator; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.guis.recipeEditor.ContainerRecipeEditor; +import me.towdium.jecalculation.gui.guis.recipeEditor.GuiRecipeEditor; +import me.towdium.jecalculation.network.packets.PacketSyncRecord; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; @@ -12,19 +14,14 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.Calculator; -import pers.towdium.justEnoughCalculation.core.CostRecord; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.gui.commom.GuiTooltipScreen; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipePicker.GuiRecipePicker; -import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.ContainerRecipeViewer; -import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.GuiRecipeViewer; -import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; -import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; +import me.towdium.jecalculation.core.Calculator; +import me.towdium.jecalculation.core.CostRecord; +import me.towdium.jecalculation.core.ItemStackWrapper; +import me.towdium.jecalculation.gui.commom.GuiTooltipScreen; +import me.towdium.jecalculation.gui.commom.recipe.ContainerRecipe; +import me.towdium.jecalculation.gui.guis.recipePicker.GuiRecipePicker; +import me.towdium.jecalculation.gui.guis.recipeViewer.ContainerRecipeViewer; +import me.towdium.jecalculation.gui.guis.recipeViewer.GuiRecipeViewer; import java.util.*; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/InventoryCalculator.java b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/InventoryCalculator.java similarity index 81% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/InventoryCalculator.java rename to src/main/java/me/towdium/jecalculation/gui/guis/calculator/InventoryCalculator.java index 54f0edc..6d499d4 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/InventoryCalculator.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/calculator/InventoryCalculator.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.gui.guis.calculator; +package me.towdium.jecalculation.gui.guis.calculator; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java b/src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java new file mode 100644 index 0000000..3d45655 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java @@ -0,0 +1,10 @@ +package me.towdium.jecalculation.gui.guis.recipeEditor; + +import me.towdium.jecalculation.gui.commom.recipe.ContainerRecipe; + + +/** + * @author Towdium + */ +public class ContainerRecipeEditor extends ContainerRecipe { +} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java b/src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/GuiRecipeEditor.java similarity index 84% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java rename to src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/GuiRecipeEditor.java index e75f238..8a2d96e 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/recipeEditor/GuiRecipeEditor.java @@ -1,16 +1,14 @@ -package pers.towdium.justEnoughCalculation.gui.guis.recipeEditor; +package me.towdium.jecalculation.gui.guis.recipeEditor; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.network.packets.PacketRecipeUpdate; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.inventory.Slot; import net.minecraft.util.StatCollector; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.GuiRecipe; -import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; - -import java.io.IOException; +import me.towdium.jecalculation.core.Recipe; +import me.towdium.jecalculation.gui.commom.recipe.ContainerRecipe; +import me.towdium.jecalculation.gui.commom.recipe.GuiRecipe; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java b/src/main/java/me/towdium/jecalculation/gui/guis/recipePicker/GuiRecipePicker.java similarity index 83% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java rename to src/main/java/me/towdium/jecalculation/gui/guis/recipePicker/GuiRecipePicker.java index a6a8667..fc44975 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/recipePicker/GuiRecipePicker.java @@ -1,17 +1,15 @@ -package pers.towdium.justEnoughCalculation.gui.guis.recipePicker; +package me.towdium.jecalculation.gui.guis.recipePicker; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.guis.recipeEditor.ContainerRecipeEditor; +import me.towdium.jecalculation.gui.guis.recipeEditor.GuiRecipeEditor; +import me.towdium.jecalculation.network.packets.PacketRecipeUpdate; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.inventory.Slot; import net.minecraft.util.StatCollector; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.GuiRecipe; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; -import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; +import me.towdium.jecalculation.gui.commom.recipe.ContainerRecipe; +import me.towdium.jecalculation.gui.commom.recipe.GuiRecipe; -import java.io.IOException; import java.util.List; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java b/src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java similarity index 91% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java rename to src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java index d51e6af..e50b1f6 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/ContainerRecipeViewer.java @@ -1,11 +1,10 @@ -package pers.towdium.justEnoughCalculation.gui.guis.recipeViewer; +package me.towdium.jecalculation.gui.guis.recipeViewer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryBasic; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.core.Recipe; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java b/src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/GuiRecipeViewer.java similarity index 88% rename from src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java rename to src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/GuiRecipeViewer.java index 08b81fa..1ae2782 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/recipeViewer/GuiRecipeViewer.java @@ -1,23 +1,21 @@ -package pers.towdium.justEnoughCalculation.gui.guis.recipeViewer; +package me.towdium.jecalculation.gui.guis.recipeViewer; import cpw.mods.fml.client.config.GuiButtonExt; -import net.minecraft.client.gui.Gui; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.guis.recipeEditor.ContainerRecipeEditor; +import me.towdium.jecalculation.gui.guis.recipeEditor.GuiRecipeEditor; +import me.towdium.jecalculation.network.packets.PacketRecipeUpdate; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.gui.commom.GuiJustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; -import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; +import me.towdium.jecalculation.core.ItemStackWrapper; +import me.towdium.jecalculation.core.Recipe; +import me.towdium.jecalculation.gui.commom.GuiJustEnoughCalculation; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.io.IOException; import java.util.List; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java b/src/main/java/me/towdium/jecalculation/item/ItemCalculator.java similarity index 81% rename from src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java rename to src/main/java/me/towdium/jecalculation/item/ItemCalculator.java index 2ccd4ea..692a36c 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java +++ b/src/main/java/me/towdium/jecalculation/item/ItemCalculator.java @@ -1,11 +1,11 @@ -package pers.towdium.justEnoughCalculation.item; +package me.towdium.jecalculation.item; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.GuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.GuiHandler; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java b/src/main/java/me/towdium/jecalculation/network/IPlayerHandler.java similarity index 91% rename from src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java rename to src/main/java/me/towdium/jecalculation/network/IPlayerHandler.java index 01aa74c..5429776 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java +++ b/src/main/java/me/towdium/jecalculation/network/IPlayerHandler.java @@ -1,8 +1,8 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; import com.google.common.collect.ImmutableList; +import me.towdium.jecalculation.core.Recipe; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.core.Recipe; import java.util.UUID; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java b/src/main/java/me/towdium/jecalculation/network/IProxy.java similarity index 69% rename from src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java rename to src/main/java/me/towdium/jecalculation/network/IProxy.java index 8c8f966..3d85d23 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java +++ b/src/main/java/me/towdium/jecalculation/network/IProxy.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java b/src/main/java/me/towdium/jecalculation/network/PlayerHandlerClient.java similarity index 95% rename from src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java rename to src/main/java/me/towdium/jecalculation/network/PlayerHandlerClient.java index 77d8c7c..0a3b4cb 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java +++ b/src/main/java/me/towdium/jecalculation/network/PlayerHandlerClient.java @@ -1,15 +1,15 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; import com.google.common.collect.ImmutableList; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.core.ItemStackWrapper; +import me.towdium.jecalculation.core.Recipe; +import me.towdium.jecalculation.network.packets.PacketCalculatorUpdate; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.entity.player.PlayerEvent; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java b/src/main/java/me/towdium/jecalculation/network/PlayerHandlerServer.java similarity index 96% rename from src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java rename to src/main/java/me/towdium/jecalculation/network/PlayerHandlerServer.java index ce58ab6..4e0fd8a 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java +++ b/src/main/java/me/towdium/jecalculation/network/PlayerHandlerServer.java @@ -1,9 +1,9 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.player.PlayerEvent; -import pers.towdium.justEnoughCalculation.core.Recipe; +import me.towdium.jecalculation.core.Recipe; import java.util.HashMap; import java.util.UUID; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java b/src/main/java/me/towdium/jecalculation/network/ProxyClient.java similarity index 70% rename from src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java rename to src/main/java/me/towdium/jecalculation/network/ProxyClient.java index a1eb619..8cdb6b7 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java +++ b/src/main/java/me/towdium/jecalculation/network/ProxyClient.java @@ -1,11 +1,11 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; import cpw.mods.fml.common.network.NetworkRegistry; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.event.GuiEventHandler; +import me.towdium.jecalculation.event.PlayerEventHandler; +import me.towdium.jecalculation.gui.GuiHandler; import net.minecraftforge.common.MinecraftForge; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.event.GuiEventHandler; -import pers.towdium.justEnoughCalculation.event.PlayerEventHandler; -import pers.towdium.justEnoughCalculation.gui.GuiHandler; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java b/src/main/java/me/towdium/jecalculation/network/ProxyServer.java similarity index 69% rename from src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java rename to src/main/java/me/towdium/jecalculation/network/ProxyServer.java index 86fd6e0..8699cb8 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java +++ b/src/main/java/me/towdium/jecalculation/network/ProxyServer.java @@ -1,12 +1,12 @@ -package pers.towdium.justEnoughCalculation.network; +package me.towdium.jecalculation.network; import net.minecraftforge.common.MinecraftForge; -import pers.towdium.justEnoughCalculation.event.PlayerEventHandler; +import me.towdium.jecalculation.event.PlayerEventHandler; /** * @author Towdium */ -public class ProxyServer implements IProxy{ +public class ProxyServer implements IProxy { public static PlayerHandlerServer playerHandler = new PlayerHandlerServer(); @Override diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java b/src/main/java/me/towdium/jecalculation/network/packets/PacketCalculatorUpdate.java similarity index 91% rename from src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java rename to src/main/java/me/towdium/jecalculation/network/packets/PacketCalculatorUpdate.java index 8454216..a73276b 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java +++ b/src/main/java/me/towdium/jecalculation/network/packets/PacketCalculatorUpdate.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.network.packets; +package me.towdium.jecalculation.network.packets; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -7,7 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.item.ItemCalculator; +import me.towdium.jecalculation.item.ItemCalculator; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java b/src/main/java/me/towdium/jecalculation/network/packets/PacketRecipeUpdate.java similarity index 82% rename from src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java rename to src/main/java/me/towdium/jecalculation/network/packets/PacketRecipeUpdate.java index 3dabd8c..17075c1 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java +++ b/src/main/java/me/towdium/jecalculation/network/packets/PacketRecipeUpdate.java @@ -1,13 +1,13 @@ -package pers.towdium.justEnoughCalculation.network.packets; +package me.towdium.jecalculation.network.packets; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.network.IPlayerHandler; -import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.core.Recipe; +import me.towdium.jecalculation.network.IPlayerHandler; +import me.towdium.jecalculation.network.PlayerHandlerServer; import java.util.UUID; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java b/src/main/java/me/towdium/jecalculation/network/packets/PacketSyncRecord.java similarity index 84% rename from src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java rename to src/main/java/me/towdium/jecalculation/network/packets/PacketSyncRecord.java index dee6683..ed2a5fd 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java +++ b/src/main/java/me/towdium/jecalculation/network/packets/PacketSyncRecord.java @@ -1,4 +1,4 @@ -package pers.towdium.justEnoughCalculation.network.packets; +package me.towdium.jecalculation.network.packets; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -6,11 +6,11 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.network.PlayerHandlerClient; -import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer; -import pers.towdium.justEnoughCalculation.network.ProxyClient; -import pers.towdium.justEnoughCalculation.network.ProxyServer; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.network.PlayerHandlerClient; +import me.towdium.jecalculation.network.PlayerHandlerServer; +import me.towdium.jecalculation.network.ProxyClient; +import me.towdium.jecalculation.network.ProxyServer; import java.util.UUID; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java b/src/main/java/me/towdium/jecalculation/plugin/MyOverlayHandler.java similarity index 86% rename from src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java rename to src/main/java/me/towdium/jecalculation/plugin/MyOverlayHandler.java index fb98f9e..e7004c3 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java +++ b/src/main/java/me/towdium/jecalculation/plugin/MyOverlayHandler.java @@ -1,13 +1,12 @@ -package pers.towdium.justEnoughCalculation.plugin; +package me.towdium.jecalculation.plugin; import codechicken.nei.PositionedStack; import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.IRecipeHandler; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.core.ItemStackWrapper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java b/src/main/java/me/towdium/jecalculation/plugin/NEICalculatorConfig.java similarity index 81% rename from src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java rename to src/main/java/me/towdium/jecalculation/plugin/NEICalculatorConfig.java index fe8c2a0..4992f9e 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java +++ b/src/main/java/me/towdium/jecalculation/plugin/NEICalculatorConfig.java @@ -1,10 +1,9 @@ -package pers.towdium.justEnoughCalculation.plugin; +package me.towdium.jecalculation.plugin; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.recipe.DefaultOverlayHandler; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.guis.recipeEditor.GuiRecipeEditor; public class NEICalculatorConfig implements IConfigureNEI { diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java deleted file mode 100644 index 63bac3f..0000000 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/ContainerRecipeEditor.java +++ /dev/null @@ -1,10 +0,0 @@ -package pers.towdium.justEnoughCalculation.gui.guis.recipeEditor; - -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; - - -/** - * @author Towdium - */ -public class ContainerRecipeEditor extends ContainerRecipe { -} diff --git a/src/main/resources/assets/je_calculation/lang/en_US.lang b/src/main/resources/assets/jecalculation/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/je_calculation/lang/en_US.lang rename to src/main/resources/assets/jecalculation/lang/en_US.lang diff --git a/src/main/resources/assets/je_calculation/lang/zh_CN.lang b/src/main/resources/assets/jecalculation/lang/zh_CN.lang similarity index 100% rename from src/main/resources/assets/je_calculation/lang/zh_CN.lang rename to src/main/resources/assets/jecalculation/lang/zh_CN.lang diff --git a/src/main/resources/assets/je_calculation/models/item/itemCalculator.json b/src/main/resources/assets/jecalculation/models/item/itemCalculator.json similarity index 87% rename from src/main/resources/assets/je_calculation/models/item/itemCalculator.json rename to src/main/resources/assets/jecalculation/models/item/itemCalculator.json index 7101f8c..57c1a7d 100644 --- a/src/main/resources/assets/je_calculation/models/item/itemCalculator.json +++ b/src/main/resources/assets/jecalculation/models/item/itemCalculator.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "je_calculation:items/itemCalculator" + "layer0": "jecalculation:items/itemCalculator" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/je_calculation/textures/gui/guiCalculator.png b/src/main/resources/assets/jecalculation/textures/gui/guiCalculator.png similarity index 100% rename from src/main/resources/assets/je_calculation/textures/gui/guiCalculator.png rename to src/main/resources/assets/jecalculation/textures/gui/guiCalculator.png diff --git a/src/main/resources/assets/je_calculation/textures/gui/guiRecipe.png b/src/main/resources/assets/jecalculation/textures/gui/guiRecipe.png similarity index 100% rename from src/main/resources/assets/je_calculation/textures/gui/guiRecipe.png rename to src/main/resources/assets/jecalculation/textures/gui/guiRecipe.png diff --git a/src/main/resources/assets/jecalculation/textures/gui/guiRecipeViewer.png b/src/main/resources/assets/jecalculation/textures/gui/guiRecipeViewer.png new file mode 100644 index 0000000..8eb2b6a Binary files /dev/null and b/src/main/resources/assets/jecalculation/textures/gui/guiRecipeViewer.png differ diff --git a/src/main/resources/assets/je_calculation/textures/items/itemCalculator.png b/src/main/resources/assets/jecalculation/textures/items/itemCalculator.png similarity index 100% rename from src/main/resources/assets/je_calculation/textures/items/itemCalculator.png rename to src/main/resources/assets/jecalculation/textures/items/itemCalculator.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7be12d3..989b599 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,16 +1,16 @@ [ { - "modid": "je_calculation", + "modid": "jecalculation", "name": "Just Enough Calculation", "description": "A simple mod to help you with recipe calculation.", - "version": "0.3.4", - "mcversion": "1.7.10", + "version": "${version}", + "mcversion": "${mcversion}", "url": "https://github.com/Towdium/JustEnoughCalculation", "updateUrl": "http://minecratft.curseforge.com/projects/just-enough-calculation", "authorList": ["Towdium"], "logoFile": "", "screenshots": [], "dependencies": [NotEnoughItems], - "credits": "Thanks to the MCP, Forge and FML guys; along with sesess, Pahimar, MrCrayfish and BedrockMiner" + "credits": "Thanks to the MCP, Forge and FML guys; along with sesess, Pahimar, MrCrayfish and BedrockMiner for their tutorial." } ] \ No newline at end of file