diff options
Diffstat (limited to 'src/Java')
7 files changed, 14 insertions, 35 deletions
diff --git a/src/Java/mcmod.info b/src/Java/mcmod.info deleted file mode 100644 index dfd4b6efda..0000000000 --- a/src/Java/mcmod.info +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @version 0.1 - * @author Alkalus - * In-game info for project: Hello World. - */ -[ { "modid" : "miscutil" - , "name" : "miscutils" - , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks." - , "version" : "1.2.0" - , "mcversion" : "1.7.10" - , "url" : "" - , "updateUrl" : "" - , "authorList" : ["Alkalus"] - , "credits" : "" - , "logoFile" : "" - , "screenshots" : [] - , "dependencies" : ["Forge10.13.0.1180"] - } -] diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 2fe53c94d3..131dd60293 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -282,7 +282,6 @@ Gold Tool: 22*/ GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob"); itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); - GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); //Try some New Tools from GT //GT_Tool_Item x = null; //x = GregTech_API.constructHardHammerItem("rockBelter", "Sandstone Hammer", 5000 /**Max Damage**/,50 /**Entity Damage**/); diff --git a/src/Java/miscutil/core/item/base/CoreItem.java b/src/Java/miscutil/core/item/base/CoreItem.java index a9929998a8..7d481e3515 100644 --- a/src/Java/miscutil/core/item/base/CoreItem.java +++ b/src/Java/miscutil/core/item/base/CoreItem.java @@ -60,7 +60,7 @@ public class CoreItem extends Item //5 public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, EnumRarity regRarity, String description, EnumChatFormatting colour, boolean Effect) { - setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); + setUnlocalizedName(unlocalizedName); setTextureName(CORE.MODID + ":" + unlocalizedName); setCreativeTab(creativeTab); setMaxStackSize(stackSize); diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 570059b00c..9a97918b1a 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -15,7 +15,7 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.2.5"; + public static final String VERSION = "1.3.1"; public static final boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java index 3bfe26fe11..d2e5d3f120 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java @@ -5,7 +5,6 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -138,28 +137,28 @@ public class GregtechTextures { public void run() { mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID+":" + "iconsets/" + this); if (mIcon != null){ - Utils.LOG_INFO("Found Texture at "+CORE.MODID+":" + "iconsets/" + this); + //Utils.LOG_INFO("Found Texture at "+CORE.MODID+":" + "iconsets/" + this); } else if (mIcon == null){ mIcon = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this); if (mIcon != null){ - Utils.LOG_INFO("Found Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this); + //Utils.LOG_INFO("Found Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this); } else { - Utils.LOG_INFO("Did not find Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this); + //Utils.LOG_INFO("Did not find Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this); } } mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID+":" + "iconsets/" + this + "_OVERLAY"); if (mOverlay != null){ - Utils.LOG_INFO("Found Texture at "+CORE.MODID+":" + "iconsets/" + this+ "_OVERLAY"); + //Utils.LOG_INFO("Found Texture at "+CORE.MODID+":" + "iconsets/" + this+ "_OVERLAY"); } else if (mOverlay == null){ mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.RES_PATH_ITEM + "iconsets/" + this+ "_OVERLAY"); if (mOverlay != null){ - Utils.LOG_INFO("Found Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this+ "_OVERLAY"); + //Utils.LOG_INFO("Found Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this+ "_OVERLAY"); } else { - Utils.LOG_INFO("Did not find Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this+ "_OVERLAY"); + //Utils.LOG_INFO("Did not find Texture at "+CORE.RES_PATH_ITEM + "iconsets/" + this+ "_OVERLAY"); } } } diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java index 39c795b409..1f1e587e66 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java @@ -318,7 +318,7 @@ extends GregtechMeta_MultiBlockBase { if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) { if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) { - Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE"); + //Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE"); this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity()); ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex(); } else { @@ -326,7 +326,7 @@ extends GregtechMeta_MultiBlockBase { } } else { - Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE"); + //Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE"); } } diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info index dfd4b6efda..1887008ebc 100644 --- a/src/Java/miscutil/mcmod.info +++ b/src/Java/miscutil/mcmod.info @@ -1,12 +1,12 @@ /** - * @version 0.1 + * @version 1.3.1 * @author Alkalus - * In-game info for project: Hello World. + * In-game info for project: MiscUtils. */ [ { "modid" : "miscutil" , "name" : "miscutils" , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks." - , "version" : "1.2.0" + , "version" : "1.3.1" , "mcversion" : "1.7.10" , "url" : "" , "updateUrl" : "" @@ -14,6 +14,6 @@ , "credits" : "" , "logoFile" : "" , "screenshots" : [] - , "dependencies" : ["Forge10.13.0.1180"] + , "dependencies" : ["Forge10.13.0.1448"] } ] |