From bca395edc27296c9721b0d6634893644b122784a Mon Sep 17 00:00:00 2001 From: Benjamin Culkin Date: Mon, 12 Aug 2024 16:59:01 -0400 Subject: Bulk commit of changes --- .classpath | 1 - .gitignore | 2 + .project | 0 NotEnoughItems-1.7.10-1.0.5.120-dev.jar | Bin 506974 -> 0 bytes README.md | 0 build.gradle | 3 +- changelog.txt | 0 gradle/wrapper/gradle-wrapper.jar | Bin gradle/wrapper/gradle-wrapper.properties | 0 gradlew | 0 gradlew.bat | 0 minecraft/assets/config/CodeChickenCore.cfg | 18 + minecraft/assets/config/CodeChickenLib.cfg | 1 + minecraft/assets/logs/latest.log | 720 +++++++++++++++++++-- src/.classpath | 0 src/.gitignore | 0 src/.project | 0 src/.settings/org.eclipse.core.resources.prefs | 0 src/main/java/com/pau101/util/BezierUtils.java | 0 src/main/java/com/pau101/util/CubicBezier.java | 0 .../jewelrycraft/CreativeTabLiquids.java | 0 .../darkknight/jewelrycraft/JewelrycraftMod.java | 0 .../achievements/AchievementsList.java | 0 .../java/darkknight/jewelrycraft/api/Curse.java | 2 + .../darkknight/jewelrycraft/api/IJewelryItem.java | 0 .../jewelrycraft/api/ModifierEffects.java | 0 .../jewelrycraft/block/BlockCrystal.java | 0 .../jewelrycraft/block/BlockDisplayer.java | 0 .../jewelrycraft/block/BlockHandPedestal.java | 0 .../jewelrycraft/block/BlockItemCrystal.java | 0 .../darkknight/jewelrycraft/block/BlockJCOre.java | 0 .../block/BlockJewelersCraftingTable.java | 0 .../darkknight/jewelrycraft/block/BlockList.java | 0 .../jewelrycraft/block/BlockMidasTouch.java | 0 .../darkknight/jewelrycraft/block/BlockMolder.java | 0 .../jewelrycraft/block/BlockMoltenMetal.java | 0 .../darkknight/jewelrycraft/block/BlockShadow.java | 0 .../jewelrycraft/block/BlockShadowEye.java | 0 .../jewelrycraft/block/BlockShadowHand.java | 0 .../jewelrycraft/block/BlockSmelter.java | 0 .../block/render/BlockCrystalRenderer.java | 0 .../jewelrycraft/client/AbstractTab.java | 0 .../jewelrycraft/client/InventoryTabVanilla.java | 0 .../jewelrycraft/client/JewelryInventory.java | 0 .../java/darkknight/jewelrycraft/client/Page.java | 0 .../darkknight/jewelrycraft/client/TabCurses.java | 0 .../darkknight/jewelrycraft/client/TabJewelry.java | 0 .../jewelrycraft/client/TabRegistry.java | 0 .../jewelrycraft/client/gui/GuiCurseInfo.java | 0 .../jewelrycraft/client/gui/GuiGuide.java | 0 .../jewelrycraft/client/gui/GuiHandler.java | 0 .../jewelrycraft/client/gui/GuiJewelry.java | 0 .../client/gui/GuiJewelryModifier.java | 0 .../jewelrycraft/client/gui/GuiRectangle.java | 0 .../jewelrycraft/client/gui/GuiRingChest.java | 0 .../darkknight/jewelrycraft/client/gui/GuiTab.java | 0 .../jewelrycraft/client/gui/GuiTabBlocks.java | 0 .../jewelrycraft/client/gui/GuiTabCurses.java | 0 .../client/gui/GuiTabGemsAndIngots.java | 0 .../client/gui/GuiTabIntroduction.java | 0 .../jewelrycraft/client/gui/GuiTabItems.java | 0 .../jewelrycraft/client/gui/GuiTabModifiers.java | 0 .../client/gui/GuiTabOresToIngots.java | 0 .../jewelrycraft/client/gui/GuiTabRitual.java | 0 .../client/gui/container/ContainerCurseInfo.java | 0 .../client/gui/container/ContainerGuide.java | 0 .../gui/container/ContainerJewelryModifier.java | 0 .../client/gui/container/ContainerJewelryTab.java | 0 .../client/gui/container/ContainerRingChest.java | 0 .../client/gui/container/slots/SlotBracelet.java | 0 .../client/gui/container/slots/SlotEarrings.java | 0 .../client/gui/container/slots/SlotNecklace.java | 0 .../client/gui/container/slots/SlotRing.java | 0 .../client/gui/container/slots/SlotRingChest.java | 0 .../commands/JewelrycraftCommands.java | 0 .../darkknight/jewelrycraft/config/ConfigGui.java | 0 .../jewelrycraft/config/ConfigGuiFactory.java | 0 .../jewelrycraft/config/ConfigHandler.java | 0 .../darkknight/jewelrycraft/curses/CurseBlind.java | 0 .../jewelrycraft/curses/CurseDeathsTouch.java | 0 .../jewelrycraft/curses/CurseDoubleDown.java | 0 .../jewelrycraft/curses/CurseFlamingSoul.java | 0 .../darkknight/jewelrycraft/curses/CurseGreed.java | 0 .../jewelrycraft/curses/CurseHumbleBundle.java | 0 .../curses/CurseIncredibleDevotion.java | 0 .../jewelrycraft/curses/CurseInfamy.java | 0 .../darkknight/jewelrycraft/curses/CurseList.java | 0 .../jewelrycraft/curses/CurseMidasTouch.java | 0 .../jewelrycraft/curses/CurseMoneyEqualsPower.java | 0 .../jewelrycraft/curses/CursePentagram.java | 0 .../jewelrycraft/curses/CurseRabbitsPaw.java | 0 .../jewelrycraft/curses/CurseRottenHeart.java | 0 .../jewelrycraft/curses/CurseScionOfHell.java | 0 .../jewelrycraft/curses/CurseVampireHunger.java | 0 .../jewelrycraft/damage/DamageSourceList.java | 0 .../jewelrycraft/effects/EffectBlazePowder.java | 0 .../jewelrycraft/effects/EffectEnderEye.java | 0 .../jewelrycraft/effects/EffectEnderPearl.java | 0 .../jewelrycraft/effects/EffectFeather.java | 0 .../jewelrycraft/effects/EffectObsidian.java | 0 .../jewelrycraft/effects/EffectsList.java | 0 .../jewelrycraft/entities/EntityHalfHeart.java | 0 .../jewelrycraft/entities/EntityHeart.java | 0 .../jewelrycraft/entities/EntityList.java | 0 .../jewelrycraft/entities/renders/HeartRender.java | 0 .../entities/renders/RenderHelper.java | 0 .../jewelrycraft/events/BlockEventHandler.java | 0 .../jewelrycraft/events/BucketHandler.java | 0 .../jewelrycraft/events/EntityEventHandler.java | 0 .../jewelrycraft/events/EventCommonHandler.java | 0 .../darkknight/jewelrycraft/events/EventList.java | 0 .../jewelrycraft/events/KeyBindings.java | 0 .../jewelrycraft/events/PlayerRenderHandler.java | 0 .../jewelrycraft/events/ScreenHandler.java | 0 .../jewelrycraft/events/TextureEvent.java | 0 .../jewelrycraft/item/ItemBaseJewelry.java | 0 .../darkknight/jewelrycraft/item/ItemBracelet.java | 0 .../jewelrycraft/item/ItemClayMolds.java | 0 .../darkknight/jewelrycraft/item/ItemEarrings.java | 0 .../darkknight/jewelrycraft/item/ItemGoldObj.java | 0 .../darkknight/jewelrycraft/item/ItemGuide.java | 0 .../jewelrycraft/item/ItemJewelryModifier.java | 0 .../darkknight/jewelrycraft/item/ItemList.java | 0 .../darkknight/jewelrycraft/item/ItemMolds.java | 0 .../jewelrycraft/item/ItemMoltenMetal.java | 0 .../jewelrycraft/item/ItemMoltenMetalBucket.java | 0 .../darkknight/jewelrycraft/item/ItemNecklace.java | 0 .../darkknight/jewelrycraft/item/ItemRing.java | 0 .../darkknight/jewelrycraft/item/ItemSpawnEgg.java | 0 .../jewelrycraft/item/ItemStructureGen.java | 0 .../darkknight/jewelrycraft/item/ItemTest.java | 0 .../jewelrycraft/item/ItemThiefGloves.java | 0 .../jewelrycraft/item/render/BraceletRender.java | 0 .../jewelrycraft/item/render/EarringsRender.java | 0 .../jewelrycraft/item/render/ItemRender.java | 0 .../jewelrycraft/item/render/MaskRender.java | 0 .../jewelrycraft/item/render/NecklaceRender.java | 0 .../jewelrycraft/item/render/RingRender.java | 0 .../jewelrycraft/model/ItemStackModelRenderer.java | 0 .../jewelrycraft/model/ModelBracelet.java | 0 .../jewelrycraft/model/ModelDisplayer.java | 0 .../jewelrycraft/model/ModelEarrings.java | 0 .../jewelrycraft/model/ModelHalfHeart.java | 0 .../jewelrycraft/model/ModelHandPedestal.java | 0 .../darkknight/jewelrycraft/model/ModelHeart.java | 0 .../model/ModelJewlersCraftingBench.java | 0 .../darkknight/jewelrycraft/model/ModelMask.java | 0 .../darkknight/jewelrycraft/model/ModelMolder.java | 0 .../jewelrycraft/model/ModelNeckalce.java | 0 .../darkknight/jewelrycraft/model/ModelRing.java | 0 .../jewelrycraft/model/ModelShadowEye.java | 0 .../jewelrycraft/model/ModelShadowHand.java | 0 .../jewelrycraft/model/ModelSmelter.java | 0 .../jewelrycraft/network/PacketHandler.java | 0 .../jewelrycraft/network/PacketKeyPressEvent.java | 0 .../network/PacketRequestPlayerInfo.java | 0 .../jewelrycraft/network/PacketRequestSetSlot.java | 0 .../network/PacketSendClientPlayerInfo.java | 0 .../network/PacketSendServerPlayerInfo.java | 0 .../network/PacketSendServerPlayersInfo.java | 0 .../jewelrycraft/particles/EntityFlatShadowFX.java | 0 .../jewelrycraft/particles/EntityShadowsFX.java | 0 .../jewelrycraft/potions/PotionBase.java | 0 .../jewelrycraft/potions/PotionList.java | 0 .../jewelrycraft/potions/PotionStun.java | 0 .../darkknight/jewelrycraft/proxy/ClientProxy.java | 0 .../darkknight/jewelrycraft/proxy/CommonProxy.java | 0 .../jewelrycraft/random/WeightedRandomCurse.java | 0 .../jewelrycraft/random/WeightedRandomItem.java | 0 .../jewelrycraft/recipes/CraftingRecipes.java | 0 .../darkknight/jewelrycraft/thirdparty/EE3.java | 0 .../jewelrycraft/thirdparty/IRegistryListener.java | 0 .../jewelrycraft/thirdparty/IThirdParty.java | 0 .../darkknight/jewelrycraft/thirdparty/ModIds.java | 0 .../darkknight/jewelrycraft/thirdparty/NEI.java | 0 .../jewelrycraft/thirdparty/ThirdPartyManager.java | 0 .../tileentity/TileEntityBlockShadow.java | 0 .../jewelrycraft/tileentity/TileEntityCrystal.java | 0 .../tileentity/TileEntityDisplayer.java | 0 .../tileentity/TileEntityHandPedestal.java | 0 .../tileentity/TileEntityJewelrsCraftingTable.java | 0 .../tileentity/TileEntityMidasTouch.java | 0 .../jewelrycraft/tileentity/TileEntityMolder.java | 0 .../tileentity/TileEntityMoltenMetal.java | 0 .../tileentity/TileEntityShadowEye.java | 0 .../tileentity/TileEntityShadowHand.java | 0 .../jewelrycraft/tileentity/TileEntitySmelter.java | 0 .../renders/TileEntityDisplayerRender.java | 0 .../renders/TileEntityHandPedestalRender.java | 0 .../TileEntityJewelrsCraftingTableRender.java | 0 .../renders/TileEntityMidasTouchRender.java | 0 .../tileentity/renders/TileEntityMolderRender.java | 0 .../renders/TileEntityShadowEyeRender.java | 0 .../renders/TileEntityShadowHandRender.java | 0 .../renders/TileEntitySmelterRender.java | 0 .../darkknight/jewelrycraft/util/BlockUtils.java | 0 .../jewelrycraft/util/EntitySelector.java | 0 .../darkknight/jewelrycraft/util/JewelryNBT.java | 0 .../jewelrycraft/util/JewelrycraftUtil.java | 121 +--- .../darkknight/jewelrycraft/util/PlayerUtils.java | 0 .../darkknight/jewelrycraft/util/Variables.java | 0 .../jewelrycraft/worldGen/ChestGeneration.java | 0 .../jewelrycraft/worldGen/Generation.java | 0 .../jewelrycraft/worldGen/WorldGenStructure.java | 0 .../jewelrycraft/worldGen/WorldGenStructure1.java | 0 .../jewelrycraft/worldGen/WorldGenStructure2.java | 0 .../jewelrycraft/worldGen/WorldGenStructure3.java | 0 .../jewelrycraft/worldGen/WorldGenStructure4.java | 0 .../jewelrycraft/worldGen/WorldGenStructure5.java | 0 .../jewelrycraft/worldGen/WorldGenStructure6.java | 0 .../worldGen/village/ComponentJewelry.java | 0 .../jewelrycraft/worldGen/village/JCTrades.java | 0 .../worldGen/village/VillageHandler.java | 0 .../worldGen/village/VillageJewelryHandler.java | 0 .../resources/assets/jewelrycraft2/lang/en_US.lang | 0 .../resources/assets/jewelrycraft2/lang/zh_CN.lang | 0 .../resources/assets/jewelrycraft2/pack.mcmeta | 0 .../resources/assets/jewelrycraft2/sounds.json | 0 .../assets/jewelrycraft2/sounds/Ritual.ogg | Bin .../jewelrycraft2/textures/blocks/blockCrystal.png | Bin .../jewelrycraft2/textures/blocks/blockShadow0.png | Bin .../jewelrycraft2/textures/blocks/blockShadow1.png | Bin .../textures/blocks/blockShadow10.png | Bin .../textures/blocks/blockShadow11.png | Bin .../textures/blocks/blockShadow12.png | Bin .../textures/blocks/blockShadow13.png | Bin .../textures/blocks/blockShadow14.png | Bin .../textures/blocks/blockShadow15.png | Bin .../jewelrycraft2/textures/blocks/blockShadow2.png | Bin .../jewelrycraft2/textures/blocks/blockShadow3.png | Bin .../jewelrycraft2/textures/blocks/blockShadow4.png | Bin .../jewelrycraft2/textures/blocks/blockShadow5.png | Bin .../jewelrycraft2/textures/blocks/blockShadow6.png | Bin .../jewelrycraft2/textures/blocks/blockShadow7.png | Bin .../jewelrycraft2/textures/blocks/blockShadow8.png | Bin .../jewelrycraft2/textures/blocks/blockShadow9.png | Bin .../jewelrycraft2/textures/blocks/molder.png | Bin .../textures/blocks/moltenMetalFlow.png | Bin .../textures/blocks/moltenMetalFlow.png.mcmeta | 0 .../textures/blocks/moltenMetalStill.png | Bin .../textures/blocks/moltenMetalStill.png.mcmeta | 0 .../jewelrycraft2/textures/blocks/oreShadow.png | Bin .../jewelrycraft2/textures/entities/BlackHeart.png | Bin .../jewelrycraft2/textures/entities/BlueHeart.png | Bin .../jewelrycraft2/textures/entities/Bracelet.png | Bin .../jewelrycraft2/textures/entities/Earrings.png | Bin .../jewelrycraft2/textures/entities/Mask.png | Bin .../jewelrycraft2/textures/entities/Necklace.png | Bin .../jewelrycraft2/textures/entities/RedHeart.png | Bin .../jewelrycraft2/textures/entities/Ring.png | Bin .../jewelrycraft2/textures/entities/WhiteHeart.png | Bin .../jewelrycraft2/textures/entities/jeweler.png | Bin .../jewelrycraft2/textures/gui/chest_ring.png | Bin .../jewelrycraft2/textures/gui/curses_tab.png | Bin .../jewelrycraft2/textures/gui/guidePage.png | Bin .../jewelrycraft2/textures/gui/guidePageFlip.png | Bin .../assets/jewelrycraft2/textures/gui/hearts.png | Bin .../textures/gui/jewelry_modifier.png | Bin .../jewelrycraft2/textures/gui/jewelry_tab.png | Bin .../textures/gui/jewelrycraft2_curses_0.png | Bin .../assets/jewelrycraft2/textures/gui/potions.png | Bin .../jewelrycraft2/textures/items/bracelet.png | Bin .../jewelrycraft2/textures/items/braceletMold.png | Bin .../jewelrycraft2/textures/items/bucketOverlay.png | Bin .../textures/items/clayBraceletMold.png | Bin .../textures/items/clayEarringsMold.png | Bin .../jewelrycraft2/textures/items/clayIngotMold.png | Bin .../textures/items/clayNecklaceMold.png | Bin .../jewelrycraft2/textures/items/clayRingMold.png | Bin .../jewelrycraft2/textures/items/crystal.png | Bin .../textures/items/crystalOverlay.png | Bin .../jewelrycraft2/textures/items/earrings.png | Bin .../jewelrycraft2/textures/items/earringsMold.png | Bin .../assets/jewelrycraft2/textures/items/guide.png | Bin .../jewelrycraft2/textures/items/ingotMold.png | Bin .../jewelrycraft2/textures/items/ingotShadow.png | Bin .../jewelrycraft2/textures/items/jewelBracelet.png | Bin .../jewelrycraft2/textures/items/jewelEarrings.png | Bin .../jewelrycraft2/textures/items/jewelNecklace.png | Bin .../jewelrycraft2/textures/items/jewelRing.png | Bin .../textures/items/jewelryModifier.png | Bin .../textures/items/moltenMetalStill.png | Bin .../textures/items/moltenMetalStill.png.mcmeta | 0 .../jewelrycraft2/textures/items/necklace.png | Bin .../jewelrycraft2/textures/items/necklaceMold.png | Bin .../assets/jewelrycraft2/textures/items/ring.png | Bin .../jewelrycraft2/textures/items/ringMold.png | Bin .../jewelrycraft2/textures/items/structureGen.png | Bin .../jewelrycraft2/textures/items/testItem_0.png | Bin .../jewelrycraft2/textures/items/testItem_1.png | Bin .../jewelrycraft2/textures/items/testItem_10.png | Bin .../jewelrycraft2/textures/items/testItem_11.png | Bin .../jewelrycraft2/textures/items/testItem_12.png | Bin .../jewelrycraft2/textures/items/testItem_2.png | Bin .../jewelrycraft2/textures/items/testItem_3.png | Bin .../jewelrycraft2/textures/items/testItem_4.png | Bin .../jewelrycraft2/textures/items/testItem_5.png | Bin .../jewelrycraft2/textures/items/testItem_6.png | Bin .../jewelrycraft2/textures/items/testItem_7.png | Bin .../jewelrycraft2/textures/items/testItem_8.png | Bin .../jewelrycraft2/textures/items/testItem_9.png | Bin .../jewelrycraft2/textures/items/thiefGloves.png | Bin .../textures/items/unused/blockMold.png | Bin .../textures/items/unused/clayBlockMold.png | Bin .../jewelrycraft2/textures/items/unused/ingot2.png | Bin .../jewelrycraft2/textures/items/unused/ingot3.png | Bin .../jewelrycraft2/textures/items/unused/ingot4.png | Bin .../jewelrycraft2/textures/items/unused/ingot5.png | Bin .../jewelrycraft2/textures/items/unused/ingot6.png | Bin .../jewelrycraft2/textures/items/unused/ingot7.png | Bin .../textures/items/unused/shadow_axe.png | Bin .../textures/items/unused/shadow_boots.png | Bin .../textures/items/unused/shadow_chestplate.png | Bin .../textures/items/unused/shadow_helmet.png | Bin .../textures/items/unused/shadow_hoe.png | Bin .../textures/items/unused/shadow_leggings.png | Bin .../textures/items/unused/shadow_pickaxe.png | Bin .../jewelrycraft2/textures/particle/shadows.png | Bin .../textures/tileentities/BricksPedestal.png | Bin .../textures/tileentities/Displayer.png | Bin .../textures/tileentities/JewelrsCraftingBench.png | Bin .../jewelrycraft2/textures/tileentities/Molder.png | Bin .../textures/tileentities/ShadowEye1.png | Bin .../textures/tileentities/ShadowEye2.png | Bin .../textures/tileentities/ShadowEye3.png | Bin .../textures/tileentities/ShadowEye4.png | Bin .../textures/tileentities/ShadowHand.png | Bin .../textures/tileentities/Smelter.png | Bin src/main/resources/logo.png | Bin src/main/resources/mcmod.info | 0 330 files changed, 717 insertions(+), 151 deletions(-) mode change 100755 => 100644 .classpath mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .project delete mode 100644 NotEnoughItems-1.7.10-1.0.5.120-dev.jar mode change 100755 => 100644 README.md mode change 100755 => 100644 build.gradle mode change 100755 => 100644 changelog.txt mode change 100755 => 100644 gradle/wrapper/gradle-wrapper.jar mode change 100755 => 100644 gradle/wrapper/gradle-wrapper.properties mode change 100755 => 100644 gradlew mode change 100755 => 100644 gradlew.bat mode change 100755 => 100644 minecraft/assets/config/CodeChickenCore.cfg mode change 100755 => 100644 minecraft/assets/config/CodeChickenLib.cfg mode change 100755 => 100644 minecraft/assets/logs/latest.log mode change 100755 => 100644 src/.classpath mode change 100755 => 100644 src/.gitignore mode change 100755 => 100644 src/.project mode change 100755 => 100644 src/.settings/org.eclipse.core.resources.prefs mode change 100755 => 100644 src/main/java/com/pau101/util/BezierUtils.java mode change 100755 => 100644 src/main/java/com/pau101/util/CubicBezier.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/api/Curse.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockMolder.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockShadow.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/AbstractTab.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/Page.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/TabCurses.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/TabJewelry.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/TabRegistry.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/config/ConfigGui.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/effects/EffectsList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/entities/EntityList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/BucketHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/EventList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/KeyBindings.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/events/TextureEvent.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemGuide.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemMolds.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemRing.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemTest.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/item/render/RingRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelHeart.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelMask.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelMolder.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelRing.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/potions/PotionBase.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/potions/PotionList.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/potions/PotionStun.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/BlockUtils.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/EntitySelector.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/util/Variables.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/Generation.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java mode change 100755 => 100644 src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/lang/en_US.lang mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/pack.mcmeta mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/sounds.json mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/gui/potions.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/crystal.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/earrings.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/guide.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/necklace.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/ring.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png mode change 100755 => 100644 src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png mode change 100755 => 100644 src/main/resources/logo.png mode change 100755 => 100644 src/main/resources/mcmod.info diff --git a/.classpath b/.classpath old mode 100755 new mode 100644 index d37a610..118b7ef --- a/.classpath +++ b/.classpath @@ -12,6 +12,5 @@ - diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 717f97b..3cbe78c --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ .gradle/* +.DS_Store .settings/* +minecraft/ misc/* ModelCreator/* bin/* diff --git a/.project b/.project old mode 100755 new mode 100644 diff --git a/NotEnoughItems-1.7.10-1.0.5.120-dev.jar b/NotEnoughItems-1.7.10-1.0.5.120-dev.jar deleted file mode 100644 index 0bb0483..0000000 Binary files a/NotEnoughItems-1.7.10-1.0.5.120-dev.jar and /dev/null differ diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/build.gradle b/build.gradle old mode 100755 new mode 100644 index 12682ac..3d031a3 --- a/build.gradle +++ b/build.gradle @@ -55,12 +55,13 @@ repositories { } dependencies { + compile fileTree(dir: 'lib', include: '*.jar') compile "com.pahimar.ee3:EquivalentExchange3:${project.mcVersion}-${project.ee3Version}:dev" // compile "fiskfille.alpaca:alpaca:${project.mcVersion}-${project.alpacaVersion}:dev" } minecraft { - version = "1.7.10-10.13.3.1428-1.7.10" + version = "1.7.10-10.13.4.1614-1.7.10" runDir = "minecraft/assets" // replacing stuff in the source diff --git a/changelog.txt b/changelog.txt old mode 100755 new mode 100644 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100755 new mode 100644 diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 diff --git a/minecraft/assets/config/CodeChickenCore.cfg b/minecraft/assets/config/CodeChickenCore.cfg old mode 100755 new mode 100644 index 98426c4..34fd4eb --- a/minecraft/assets/config/CodeChickenCore.cfg +++ b/minecraft/assets/config/CodeChickenCore.cfg @@ -1,3 +1,21 @@ #CodeChickenCore configuration file. #set to true to completely deobfuscate mcp names +dev.deobfuscate=true +#Enabling this setting will make all minecraft classes public at runtime in MCP just as they are in modloader. +#You should ONLY use this when you are testing with a mod that relies on runtime publicity and doesn't include access transformers. +#Such mods are doing the wrong thing and should be fixed. +dev.runtimePublic=false + +#Various tweaks that can be applied to game mechanics. +tweaks +{ + #If set to true and doFireTick is disabled in the game rules, fire will still dissipate if it's not over a fire source + doFireTickOut=true + #If set to true, creepers will not destroy landscape. (A version of mobGriefing setting just for creepers) + environmentallyFriendlyCreepers=false + #If set to true two adjacent water source blocks will not generate a third. + finiteWater=false + #If set to false, leaves will only replace air when growing + softLeafReplace=false +} diff --git a/minecraft/assets/config/CodeChickenLib.cfg b/minecraft/assets/config/CodeChickenLib.cfg old mode 100755 new mode 100644 index 2ae9b87..13ecbe4 --- a/minecraft/assets/config/CodeChickenLib.cfg +++ b/minecraft/assets/config/CodeChickenLib.cfg @@ -1,3 +1,4 @@ #CodeChickenLib development configuration file. #Path to directory holding packaged.srg, fields.csv and methods.csv for mcp remapping +mappingDir=/Users/bjculkin/Desktop/mcp908/conf diff --git a/minecraft/assets/logs/latest.log b/minecraft/assets/logs/latest.log old mode 100755 new mode 100644 index 878a427..4b4775b --- a/minecraft/assets/logs/latest.log +++ b/minecraft/assets/logs/latest.log @@ -1,45 +1,675 @@ -[22:26:05] [main/INFO]: Extra: [] -[22:26:05] [main/INFO]: Found and added coremod: codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/INFO]: Found and added coremod: codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/INFO]: Running with arguments: [--userProperties, {}, --assetsDir, /Users/ben/.gradle/caches/minecraft/assets, --assetIndex, 1.7.10, --accessToken, {REDACTED}, --version, 1.7.10, --tweakClass, cpw.mods.fml.common.launcher.FMLTweaker, --tweakClass, net.minecraftforge.gradle.tweakers.CoremodTweaker] -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker -[22:26:05] [main/INFO]: Forge Mod Loader version 7.99.9.1428 for Minecraft 1.7.10 loading -[22:26:05] [main/INFO]: Java is Java HotSpot(TM) 64-Bit Server VM, version 1.8.0_05, running on Mac OS X:x86_64:10.12, installed at /Library/Java/JavaVirtualMachines/jdk1.8.0_05.jdk/Contents/Home/jre -[22:26:05] [main/INFO]: Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation -[22:26:05] [main/INFO]: Found a command line coremod : codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/WARN]: The coremod codechicken.nei.asm.NEICorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft -[22:26:05] [main/INFO]: Found a command line coremod : codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/WARN]: The coremod codechicken.core.launch.CodeChickenCorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft -[22:26:05] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.CoremodTweaker -[22:26:05] [main/INFO]: Injecting location in coremod cpw.mods.fml.relauncher.FMLCorePlugin -[22:26:05] [main/INFO]: Injecting location in coremod net.minecraftforge.classloading.FMLForgePlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.core.asm.MCPDeobfuscationTransformer.LoadPlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.nei.asm.NEICorePlugin -[22:26:05] [main/INFO]: Injecting location in coremod codechicken.core.launch.CodeChickenCorePlugin -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLDeobfTweaker -[22:26:05] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.AccessTransformerTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[22:26:05] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:05] [main/ERROR]: The binary patch set is missing. Either you are in a development environment, or things are not going to work! -[22:26:06] [main/ERROR]: FML appears to be missing any signature data. This is not a good thing -[22:26:06] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:06] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: java.lang.ExceptionInInitializerError -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.core.asm.MCPDeobfuscationTransformer.load(MCPDeobfuscationTransformer.java:118) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.core.asm.MCPDeobfuscationTransformer$LoadPlugin.injectData(MCPDeobfuscationTransformer.java:57) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper.injectIntoClassLoader(CoreModManager.java:112) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.launch(Launch.java:115) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.main(Launch.java:28) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at GradleStart.main(Unknown Source) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: Caused by: java.lang.RuntimeException: Failed to select mappings directory, set it manually in the config -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping$MCPRemapper.getConfFiles(ObfMapping.java:107) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping$MCPRemapper.(ObfMapping.java:162) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping.loadMCPRemapper(ObfMapping.java:205) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at codechicken.lib.asm.ObfMapping.(ObfMapping.java:217) -[22:26:27] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: ... 7 more +[17:42:01] [main/INFO]: Extra: [] +[17:42:01] [main/INFO]: Found and added coremod: codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/INFO]: Found and added coremod: codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/INFO]: Running with arguments: [--userProperties, {}, --assetsDir, /Users/bjculkin/.gradle/caches/minecraft/assets, --assetIndex, 1.7.10, --accessToken, {REDACTED}, --version, 1.7.10, --tweakClass, cpw.mods.fml.common.launcher.FMLTweaker, --tweakClass, net.minecraftforge.gradle.tweakers.CoremodTweaker] +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.CoremodTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker +[17:42:01] [main/INFO]: Forge Mod Loader version 7.99.40.1614 for Minecraft 1.7.10 loading +[17:42:01] [main/INFO]: Java is Java HotSpot(TM) 64-Bit Server VM, version 1.8.0_121, running on Mac OS X:x86_64:10.12.6, installed at /Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre +[17:42:01] [main/INFO]: Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation +[17:42:01] [main/INFO]: Found a command line coremod : codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/WARN]: The coremod codechicken.nei.asm.NEICorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft +[17:42:01] [main/INFO]: Found a command line coremod : codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/WARN]: The coremod codechicken.core.launch.CodeChickenCorePlugin does not have a MCVersion annotation, it may cause issues with this version of Minecraft +[17:42:01] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.CoremodTweaker +[17:42:01] [main/INFO]: Injecting location in coremod cpw.mods.fml.relauncher.FMLCorePlugin +[17:42:01] [main/INFO]: Injecting location in coremod net.minecraftforge.classloading.FMLForgePlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.core.asm.MCPDeobfuscationTransformer.LoadPlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.nei.asm.NEICorePlugin +[17:42:01] [main/INFO]: Injecting location in coremod codechicken.core.launch.CodeChickenCorePlugin +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLDeobfTweaker +[17:42:01] [main/INFO]: Loading tweak class name net.minecraftforge.gradle.tweakers.AccessTransformerTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker +[17:42:01] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:01] [main/ERROR]: The binary patch set is missing. Either you are in a development environment, or things are not going to work! +[17:42:02] [main/ERROR]: FML appears to be missing any signature data. This is not a good thing +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper +[17:42:02] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLDeobfTweaker +[17:42:03] [main/INFO]: Calling tweak class net.minecraftforge.gradle.tweakers.AccessTransformerTweaker +[17:42:03] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.TerminalTweaker +[17:42:03] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.TerminalTweaker +[17:42:03] [main/INFO]: Launching wrapped minecraft {net.minecraft.client.main.Main} +[17:42:03] [main/ERROR]: Unable to launch +java.lang.reflect.InvocationTargetException + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:1.8.0_121] + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:1.8.0_121] + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:1.8.0_121] + at java.lang.reflect.Method.invoke(Method.java:498) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) [launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.Launch.main(Launch.java:28) [launchwrapper-1.12.jar:?] + at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) [start/:?] + at GradleStart.main(Unknown Source) [start/:?] +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/gui/inventory/GuiInventory + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.gui.inventory.GuiInventory + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/renderer/InventoryEffectRenderer + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.renderer.InventoryEffectRenderer + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.NoClassDefFoundError: net/minecraft/client/gui/inventory/GuiContainer + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.ClassNotFoundException: net.minecraft.client.gui.inventory.GuiContainer + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:191) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: java.lang.RuntimeException: Error transforming method: [net/minecraft/client/gui/inventory/GuiContainer.drawScreen(IIF)V] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:238) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: Error transforming method: [net/minecraft/client/gui/inventory/GuiContainer.drawScreen(IIF)V] + at codechicken.lib.asm.ModularASMTransformer$MethodTransformer.transform(ModularASMTransformer.java:90) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$ClassNodeTransformerList.transform(ModularASMTransformer.java:36) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer.transform(ModularASMTransformer.java:283) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:236) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +Caused by: java.lang.RuntimeException: Needle not found in Haystack: + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager; + INVOKEVIRTUAL codechicken/nei/guihook/GuiContainerManager.preDraw ()V + L0 + LINENUMBER 75 L0 + ALOAD 0 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawDefaultBackground ()V + L1 + LINENUMBER 76 L1 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.guiLeft : I + ISTORE 4 + L2 + LINENUMBER 77 L2 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.guiTop : I + ISTORE 5 + L3 + LINENUMBER 78 L3 + ALOAD 0 + FLOAD 3 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGuiContainerBackgroundLayer (FII)V + L4 + LINENUMBER 79 L4 + LDC 32826 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L5 + LINENUMBER 80 L5 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.disableStandardItemLighting ()V + L6 + LINENUMBER 81 L6 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L7 + LINENUMBER 82 L7 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L8 + LINENUMBER 83 L8 + ALOAD 0 + ILOAD 1 + ILOAD 2 + FLOAD 3 + INVOKESPECIAL net/minecraft/client/gui/GuiScreen.drawScreen (IIF)V + L9 + LINENUMBER 84 L9 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.enableGUIStandardItemLighting ()V + L10 + LINENUMBER 85 L10 + INVOKESTATIC org/lwjgl/opengl/GL11.glPushMatrix ()V + L11 + LINENUMBER 86 L11 + ILOAD 4 + I2F + ILOAD 5 + I2F + FCONST_0 + INVOKESTATIC org/lwjgl/opengl/GL11.glTranslatef (FFF)V + L12 + LINENUMBER 87 L12 + FCONST_1 + FCONST_1 + FCONST_1 + FCONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColor4f (FFFF)V + L13 + LINENUMBER 88 L13 + LDC 32826 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L14 + LINENUMBER 89 L14 + ALOAD 0 + ACONST_NULL + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + L15 + LINENUMBER 90 L15 + SIPUSH 240 + ISTORE 6 + L16 + LINENUMBER 91 L16 + SIPUSH 240 + ISTORE 7 + L17 + LINENUMBER 92 L17 + GETSTATIC net/minecraft/client/renderer/OpenGlHelper.lightmapTexUnit : I + ILOAD 6 + I2F + FCONST_1 + FDIV + ILOAD 7 + I2F + FCONST_1 + FDIV + INVOKESTATIC net/minecraft/client/renderer/OpenGlHelper.setLightmapTextureCoords (IFF)V + L18 + LINENUMBER 93 L18 + FCONST_1 + FCONST_1 + FCONST_1 + FCONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColor4f (FFFF)V + L19 + LINENUMBER 96 L19 + ICONST_0 + ISTORE 8 + L20 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I I] [] + ILOAD 8 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.inventorySlots : Lnet/minecraft/inventory/Container; + GETFIELD net/minecraft/inventory/Container.inventorySlots : Ljava/util/List; + INVOKEINTERFACE java/util/List.size ()I + IF_ICMPGE L21 + L22 + LINENUMBER 98 L22 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.inventorySlots : Lnet/minecraft/inventory/Container; + GETFIELD net/minecraft/inventory/Container.inventorySlots : Ljava/util/List; + ILOAD 8 + INVOKEINTERFACE java/util/List.get (I)Ljava/lang/Object; + CHECKCAST net/minecraft/inventory/Slot + ASTORE 9 + L23 + LINENUMBER 99 L23 + ALOAD 0 + ALOAD 9 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.func_146977_a (Lnet/minecraft/inventory/Slot;)V + L24 + LINENUMBER 101 L24 + ALOAD 0 + ALOAD 9 + ILOAD 1 + ILOAD 2 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.isMouseOverSlot (Lnet/minecraft/inventory/Slot;II)Z + IFEQ L25 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/inventory/Slot.func_111238_b ()Z + IFEQ L25 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager; + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL codechicken/nei/guihook/GuiContainerManager.objectUnderMouse (II)Z + IFNE L25 + L26 + LINENUMBER 103 L26 + ALOAD 0 + ALOAD 9 + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + L27 + LINENUMBER 104 L27 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L28 + LINENUMBER 105 L28 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L29 + LINENUMBER 106 L29 + ALOAD 9 + GETFIELD net/minecraft/inventory/Slot.xDisplayPosition : I + ISTORE 10 + L30 + LINENUMBER 107 L30 + ALOAD 9 + GETFIELD net/minecraft/inventory/Slot.yDisplayPosition : I + ISTORE 11 + L31 + LINENUMBER 108 L31 + ICONST_1 + ICONST_1 + ICONST_1 + ICONST_0 + INVOKESTATIC org/lwjgl/opengl/GL11.glColorMask (ZZZZ)V + L32 + LINENUMBER 109 L32 + ALOAD 0 + ILOAD 10 + ILOAD 11 + ILOAD 10 + BIPUSH 16 + IADD + ILOAD 11 + BIPUSH 16 + IADD + LDC -2130706433 + LDC -2130706433 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGradientRect (IIIIII)V + L33 + LINENUMBER 110 L33 + ICONST_1 + ICONST_1 + ICONST_1 + ICONST_1 + INVOKESTATIC org/lwjgl/opengl/GL11.glColorMask (ZZZZ)V + L34 + LINENUMBER 111 L34 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L35 + LINENUMBER 112 L35 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L25 + LINENUMBER 96 L25 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I I] [] + IINC 8 1 + GOTO L20 + L21 + LINENUMBER 118 L21 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I] [] + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glDisable (I)V + L36 + LINENUMBER 119 L36 + ALOAD 0 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.drawGuiContainerForegroundLayer (II)V + L37 + LINENUMBER 120 L37 + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L38 + LINENUMBER 121 L38 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.mc : Lnet/minecraft/client/Minecraft; + GETFIELD net/minecraft/client/Minecraft.thePlayer : Lnet/minecraft/client/entity/EntityClientPlayerMP; + GETFIELD net/minecraft/client/entity/EntityClientPlayerMP.inventory : Lnet/minecraft/entity/player/InventoryPlayer; + ASTORE 8 + L39 + LINENUMBER 122 L39 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNONNULL L40 + ALOAD 8 + INVOKEVIRTUAL net/minecraft/entity/player/InventoryPlayer.getItemStack ()Lnet/minecraft/item/ItemStack; + GOTO L41 + L40 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + L41 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer] [net/minecraft/item/ItemStack] + ASTORE 9 + L42 + LINENUMBER 124 L42 + ALOAD 9 + IFNULL L43 + L44 + LINENUMBER 126 L44 + BIPUSH 8 + ISTORE 10 + L45 + LINENUMBER 127 L45 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNONNULL L46 + BIPUSH 8 + GOTO L47 + L46 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I] [] + BIPUSH 16 + L47 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I] [I] + ISTORE 11 + L48 + LINENUMBER 128 L48 + ACONST_NULL + ASTORE 12 + L49 + LINENUMBER 130 L49 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.draggedStack : Lnet/minecraft/item/ItemStack; + IFNULL L50 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.isRightMouseClick : Z + IFEQ L50 + L51 + LINENUMBER 132 L51 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/item/ItemStack.copy ()Lnet/minecraft/item/ItemStack; + ASTORE 9 + L52 + LINENUMBER 133 L52 + ALOAD 9 + ALOAD 9 + GETFIELD net/minecraft/item/ItemStack.stackSize : I + I2F + FCONST_2 + FDIV + INVOKESTATIC net/minecraft/util/MathHelper.ceiling_float_int (F)I + PUTFIELD net/minecraft/item/ItemStack.stackSize : I + GOTO L53 + L50 + LINENUMBER 135 L50 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I I java/lang/String] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147007_t : Z + IFEQ L53 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147008_s : Ljava/util/Set; + INVOKEINTERFACE java/util/Set.size ()I + ICONST_1 + IF_ICMPLE L53 + L54 + LINENUMBER 137 L54 + ALOAD 9 + INVOKEVIRTUAL net/minecraft/item/ItemStack.copy ()Lnet/minecraft/item/ItemStack; + ASTORE 9 + L55 + LINENUMBER 138 L55 + ALOAD 9 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_146996_I : I + PUTFIELD net/minecraft/item/ItemStack.stackSize : I + L56 + LINENUMBER 140 L56 + ALOAD 9 + GETFIELD net/minecraft/item/ItemStack.stackSize : I + IFNE L53 + L57 + LINENUMBER 142 L57 + NEW java/lang/StringBuilder + DUP + INVOKESPECIAL java/lang/StringBuilder. ()V + LDC "" + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; + GETSTATIC net/minecraft/util/EnumChatFormatting.YELLOW : Lnet/minecraft/util/EnumChatFormatting; + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder; + LDC "0" + INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder; + INVOKEVIRTUAL java/lang/StringBuilder.toString ()Ljava/lang/String; + ASTORE 12 + L53 + LINENUMBER 146 L53 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack I I java/lang/String] [] + ALOAD 0 + ALOAD 9 + ILOAD 1 + ILOAD 4 + ISUB + ILOAD 10 + ISUB + ILOAD 2 + ILOAD 5 + ISUB + ILOAD 11 + ISUB + ALOAD 12 + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.drawItemStack (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V + L43 + LINENUMBER 149 L43 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + IFNULL L58 + L59 + LINENUMBER 151 L59 + INVOKESTATIC net/minecraft/client/Minecraft.getSystemTime ()J + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackTime : J + LSUB + L2F + LDC 100.0 + FDIV + FSTORE 10 + L60 + LINENUMBER 153 L60 + FLOAD 10 + FCONST_1 + FCMPL + IFLT L61 + L62 + LINENUMBER 155 L62 + FCONST_1 + FSTORE 10 + L63 + LINENUMBER 156 L63 + ALOAD 0 + ACONST_NULL + PUTFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + L61 + LINENUMBER 159 L61 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack F] [] + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackDestSlot : Lnet/minecraft/inventory/Slot; + GETFIELD net/minecraft/inventory/Slot.xDisplayPosition : I + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147011_y : I + ISUB + ISTORE 11 + L64 + LINENUMBER 160 L64 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStackDestSlot : Lnet/minecraft/inventory/Slot; + GETFIELD net/minecraft/inventory/Slot.yDisplayPosition : I + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147010_z : I + ISUB + ISTORE 12 + L65 + LINENUMBER 161 L65 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147011_y : I + ILOAD 11 + I2F + FLOAD 10 + FMUL + F2I + IADD + ISTORE 13 + L66 + LINENUMBER 162 L66 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.field_147010_z : I + ILOAD 12 + I2F + FLOAD 10 + FMUL + F2I + IADD + ISTORE 14 + L67 + LINENUMBER 163 L67 + ALOAD 0 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.returningStack : Lnet/minecraft/item/ItemStack; + ILOAD 13 + ILOAD 14 + ACONST_NULL + CHECKCAST java/lang/String + INVOKESPECIAL net/minecraft/client/gui/inventory/GuiContainer.drawItemStack (Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V + L58 + LINENUMBER 166 L58 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + INVOKESTATIC org/lwjgl/opengl/GL11.glPopMatrix ()V + L68 + LINENUMBER 168 L68 + ALOAD 8 + INVOKEVIRTUAL net/minecraft/entity/player/InventoryPlayer.getItemStack ()Lnet/minecraft/item/ItemStack; + IFNONNULL L69 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + IFNULL L69 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + INVOKEVIRTUAL net/minecraft/inventory/Slot.getHasStack ()Z + IFEQ L69 + L70 + LINENUMBER 170 L70 + ALOAD 0 + GETFIELD net/minecraft/client/gui/inventory/GuiContainer.theSlot : Lnet/minecraft/inventory/Slot; + INVOKEVIRTUAL net/minecraft/inventory/Slot.getStack ()Lnet/minecraft/item/ItemStack; + ASTORE 10 + L71 + LINENUMBER 171 L71 + ALOAD 0 + ALOAD 10 + ILOAD 1 + ILOAD 2 + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.renderToolTip (Lnet/minecraft/item/ItemStack;II)V + L69 + LINENUMBER 174 L69 + FRAME FULL [net/minecraft/client/gui/inventory/GuiContainer I I F I I I I net/minecraft/entity/player/InventoryPlayer net/minecraft/item/ItemStack] [] + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L72 + LINENUMBER 175 L72 + SIPUSH 2929 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + L73 + LINENUMBER 176 L73 + INVOKESTATIC net/minecraft/client/renderer/RenderHelper.enableStandardItemLighting ()V + L74 + LINENUMBER 177 L74 + RETURN + L75 + + + INVOKEVIRTUAL net/minecraft/client/gui/inventory/GuiContainer.func_146979_b (II)V + SIPUSH 2896 + INVOKESTATIC org/lwjgl/opengl/GL11.glEnable (I)V + + at codechicken.lib.asm.InsnComparator.findN(InsnComparator.java:181) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.InsnComparator.findN(InsnComparator.java:187) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$MethodInjector.transform(ModularASMTransformer.java:199) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$MethodTransformer.transform(ModularASMTransformer.java:88) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer$ClassNodeTransformerList.transform(ModularASMTransformer.java:36) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.lib.asm.ModularASMTransformer.transform(ModularASMTransformer.java:283) ~[CodeChickenLib-1.7.10-1.1.1.104-dev.jar:?] + at codechicken.nei.asm.NEITransformer.transform(NEITransformer.java:236) ~[NotEnoughItems-1.7.10-1.0.3.56-dev.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.runTransformers(LaunchClassLoader.java:279) ~[launchwrapper-1.12.jar:?] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:176) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass1(Native Method) ~[?:1.8.0_121] + at java.lang.ClassLoader.defineClass(ClassLoader.java:763) ~[?:1.8.0_121] + at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142) ~[?:1.8.0_121] + at net.minecraft.launchwrapper.LaunchClassLoader.findClass(LaunchClassLoader.java:182) ~[launchwrapper-1.12.jar:?] + at java.lang.ClassLoader.loadClass(ClassLoader.java:424) ~[?:1.8.0_121] + at java.lang.ClassLoader.loadClass(ClassLoader.java:357) ~[?:1.8.0_121] + at net.minecraft.client.main.Main.main(SourceFile:72) ~[Main.class:?] + ... 8 more +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: cpw.mods.fml.relauncher.FMLSecurityManager$ExitTrappedException +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at cpw.mods.fml.relauncher.FMLSecurityManager.checkPermission(FMLSecurityManager.java:25) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.SecurityManager.checkExit(SecurityManager.java:761) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.Runtime.exit(Runtime.java:107) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at java.lang.System.exit(System.java:971) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.launch(Launch.java:138) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraft.launchwrapper.Launch.main(Launch.java:28) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at net.minecraftforge.gradle.GradleStartCommon.launch(Unknown Source) +[17:42:03] [main/INFO]: [java.lang.Throwable$WrappedPrintStream:println:748]: at GradleStart.main(Unknown Source) diff --git a/src/.classpath b/src/.classpath old mode 100755 new mode 100644 diff --git a/src/.gitignore b/src/.gitignore old mode 100755 new mode 100644 diff --git a/src/.project b/src/.project old mode 100755 new mode 100644 diff --git a/src/.settings/org.eclipse.core.resources.prefs b/src/.settings/org.eclipse.core.resources.prefs old mode 100755 new mode 100644 diff --git a/src/main/java/com/pau101/util/BezierUtils.java b/src/main/java/com/pau101/util/BezierUtils.java old mode 100755 new mode 100644 diff --git a/src/main/java/com/pau101/util/CubicBezier.java b/src/main/java/com/pau101/util/CubicBezier.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java b/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java b/src/main/java/darkknight/jewelrycraft/achievements/AchievementsList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java old mode 100755 new mode 100644 index c3af0f0..dd220f1 --- a/src/main/java/darkknight/jewelrycraft/api/Curse.java +++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java @@ -21,7 +21,9 @@ import net.minecraftforge.event.world.BlockEvent; public abstract class Curse { protected int textureID, ticksActive; protected String name, description, texturePackName; + protected Random rand = new Random(); + private static ArrayList curses = new ArrayList<>(); public static ArrayList availableCurses = new ArrayList<>(); diff --git a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java b/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java b/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java b/src/main/java/darkknight/jewelrycraft/block/BlockHandPedestal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java b/src/main/java/darkknight/jewelrycraft/block/BlockItemCrystal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java b/src/main/java/darkknight/jewelrycraft/block/BlockJCOre.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java b/src/main/java/darkknight/jewelrycraft/block/BlockJewelersCraftingTable.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java b/src/main/java/darkknight/jewelrycraft/block/BlockMidasTouch.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java b/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadow.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadowEye.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java b/src/main/java/darkknight/jewelrycraft/block/BlockShadowHand.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java b/src/main/java/darkknight/jewelrycraft/block/render/BlockCrystalRenderer.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java b/src/main/java/darkknight/jewelrycraft/client/AbstractTab.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java b/src/main/java/darkknight/jewelrycraft/client/InventoryTabVanilla.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java b/src/main/java/darkknight/jewelrycraft/client/JewelryInventory.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/Page.java b/src/main/java/darkknight/jewelrycraft/client/Page.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/TabCurses.java b/src/main/java/darkknight/jewelrycraft/client/TabCurses.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java b/src/main/java/darkknight/jewelrycraft/client/TabJewelry.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java b/src/main/java/darkknight/jewelrycraft/client/TabRegistry.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelry.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRectangle.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiRingChest.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabBlocks.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabGemsAndIngots.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabItems.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabModifiers.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabOresToIngots.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabRitual.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java b/src/main/java/darkknight/jewelrycraft/config/ConfigGui.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java b/src/main/java/darkknight/jewelrycraft/config/ConfigGuiFactory.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDoubleDown.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java b/src/main/java/darkknight/jewelrycraft/curses/CurseIncredibleDevotion.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMoneyEqualsPower.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java b/src/main/java/darkknight/jewelrycraft/curses/CurseScionOfHell.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java b/src/main/java/darkknight/jewelrycraft/damage/DamageSourceList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderPearl.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java b/src/main/java/darkknight/jewelrycraft/entities/renders/RenderHelper.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java b/src/main/java/darkknight/jewelrycraft/events/EventCommonHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java b/src/main/java/darkknight/jewelrycraft/item/ItemBracelet.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemClayMolds.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java b/src/main/java/darkknight/jewelrycraft/item/ItemEarrings.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java b/src/main/java/darkknight/jewelrycraft/item/ItemGuide.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/item/ItemJewelryModifier.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java b/src/main/java/darkknight/jewelrycraft/item/ItemMolds.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java b/src/main/java/darkknight/jewelrycraft/item/ItemSpawnEgg.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java b/src/main/java/darkknight/jewelrycraft/item/ItemThiefGloves.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java b/src/main/java/darkknight/jewelrycraft/item/render/EarringsRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java b/src/main/java/darkknight/jewelrycraft/model/ModelEarrings.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHalfHeart.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java b/src/main/java/darkknight/jewelrycraft/model/ModelHeart.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java b/src/main/java/darkknight/jewelrycraft/model/ModelJewlersCraftingBench.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMask.java b/src/main/java/darkknight/jewelrycraft/model/ModelMask.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java b/src/main/java/darkknight/jewelrycraft/model/ModelMolder.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowHand.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityFlatShadowFX.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java b/src/main/java/darkknight/jewelrycraft/potions/PotionBase.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionList.java b/src/main/java/darkknight/jewelrycraft/potions/PotionList.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java b/src/main/java/darkknight/jewelrycraft/potions/PotionStun.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomCurse.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java b/src/main/java/darkknight/jewelrycraft/random/WeightedRandomItem.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java b/src/main/java/darkknight/jewelrycraft/thirdparty/EE3.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java b/src/main/java/darkknight/jewelrycraft/thirdparty/IRegistryListener.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java b/src/main/java/darkknight/jewelrycraft/thirdparty/IThirdParty.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java b/src/main/java/darkknight/jewelrycraft/thirdparty/ModIds.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java b/src/main/java/darkknight/jewelrycraft/thirdparty/NEI.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java b/src/main/java/darkknight/jewelrycraft/thirdparty/ThirdPartyManager.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityBlockShadow.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityDisplayer.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityHandPedestal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityJewelrsCraftingTable.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMidasTouch.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMolder.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityMoltenMetal.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowHand.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityHandPedestalRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityJewelrsCraftingTableRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMidasTouchRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowEyeRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityShadowHandRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntitySmelterRender.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java b/src/main/java/darkknight/jewelrycraft/util/BlockUtils.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java b/src/main/java/darkknight/jewelrycraft/util/EntitySelector.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java old mode 100755 new mode 100644 index bab97d1..397f501 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -84,40 +84,20 @@ public class JewelrycraftUtil { jewelry.add(new ItemStack(ItemList.bracelet)); jewelry.add(new ItemStack(ItemList.earrings)); - // Add random modifiers - for (Object item : GameData.getItemRegistry()) { - if (item != null) { - if (Loader.isModLoaded("Mantle") - && ((Item) item).getUnlocalizedName() - .equals("Mantle:item.mantle.manual")) { - continue; - } - - try { - if (itemHasSubtypes(item)) { - ((Item) item).getSubItems( - (Item) item, - null, - items); - } else { - objects.add(new ItemStack( - (Item) item)); - } - - if (!items.isEmpty()) { - objects.addAll(items); - } + for(ItemStack is : gem) { + objects.add(is.copy()); + } - items.removeAll(items); - } catch (Exception e) { - JewelrycraftMod.logger.info( - "Error, tried to add subtypes of item " - + ((Item) item).getUnlocalizedName() - + "\nItem is not added in the list."); - } - } + for(ItemStack is : metal) { + objects.add(is.copy()); } + objects.add(new ItemStack(Items.blaze_powder)); + objects.add(new ItemStack(Items.ender_eye)); + objects.add(new ItemStack(Items.ender_pearl)); + objects.add(new ItemStack(Items.feather)); + objects.add(new ItemStack(Blocks.obsidian)); + // Structures try { for (Field f : Generation.class @@ -139,6 +119,10 @@ public class JewelrycraftUtil { @SideOnly(Side.CLIENT) public static void generateColors() { + /* + * Doesn't seem to do much of anything + */ + /* for (Object item : GameData.getItemRegistry()) { if (item != null) { if (Loader.isModLoaded("Mantle") @@ -177,6 +161,7 @@ public class JewelrycraftUtil { } } } + */ } @SideOnly(Side.CLIENT) @@ -206,36 +191,6 @@ public class JewelrycraftUtil { return (int) Math.random() * 16777215; } - // This takes too long for me - // IResourceManager rm = - // Minecraft.getMinecraft().getResourceManager(); - // ResourceLocation ingot; - // BufferedImage icon; - // try { - // ingot = getLocation(stack); - // } catch (Exception e) { - // ingot = new - // ResourceLocation("textures/items/apple.png"); - // } - // icon = - // ImageIO.read(rm.getResource(ingot).getInputStream()); - // int height = icon.getHeight(); - // int width = icon.getWidth(); - // Map m = new HashMap(); - // for (int i = 0; i < width; i++) - // for (int j = 0; j < height; j++) { - // int rgb = icon.getRGB(i, j); - // int red = rgb >> 16 & 0xff; - // int green = rgb >> 8 & 0xff; - // int blue = rgb & 0xff; - // int[] rgbArr = { red, green, blue }; - // int Cmax = Math.max(red, Math.max(green, blue)); - // int Cmin = Math.min(red, Math.min(green, blue)); - // if (!isGray(rgbArr)) - // m.put(rgb, (Cmax + Cmin) / 2); - // } - // return getMostCommonColour(m); - return stack.getItem().getColorFromItemStack(stack, pass); } @@ -437,49 +392,7 @@ public class JewelrycraftUtil { * Links ores with their appropriate ingot */ public static void addMetals() { - /* - * int index = 0; - * - * while (index < OreDictionary.getOreNames().length) { - * Iterator i = OreDictionary - * .getOres(OreDictionary.getOreNames()[index]) - * .iterator(); - * - * while (i.hasNext()) { ItemStack nextStack = i.next(); - * - * String stackName = - * nextStack.getItem().getUnlocalizedName() .toLowerCase(); - * - * if ((stackName.contains("ingot") || - * stackName.contains("alloy")) && - * !metal.contains(nextStack)) { metal.add(nextStack); } - * - * if - * (nextStack.getItem().getUnlocalizedName().toLowerCase() - * .contains("ore") && !ores.contains(nextStack)) { - * ItemStack ingot = FurnaceRecipes.smelting() - * .getSmeltingResult(nextStack); - * - * if (ingot != null && (ingot.getItem() - * .getUnlocalizedName().toLowerCase() .contains("ingot") - * || ingot.getItem().getUnlocalizedName() - * .toLowerCase().contains("alloy"))) { - * ores.add(nextStack); - * - * oreToIngot.put(nextStack, ingot); - * - * JewelrycraftMod.logger.info(nextStack + " Adding " + - * nextStack.getDisplayName() + " with damage value " + - * nextStack.getItemDamage() + " and with " + - * nextStack.stackSize + " in stack"); - * - * JewelrycraftMod.logger.info(ingot + " Adding ingot " + - * ingot.getDisplayName() + " with damage value " + - * ingot.getItemDamage() + " and with " + ingot.stackSize + - * " in stack"); } } } - * - * index++; } - */ + /* Doesn't do anything, because I've disabled the ingot cast */ } /** diff --git a/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java b/src/main/java/darkknight/jewelrycraft/util/PlayerUtils.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java b/src/main/java/darkknight/jewelrycraft/worldGen/ChestGeneration.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java b/src/main/java/darkknight/jewelrycraft/worldGen/Generation.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure1.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure2.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure3.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure4.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure5.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java b/src/main/java/darkknight/jewelrycraft/worldGen/WorldGenStructure6.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java old mode 100755 new mode 100644 diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/pack.mcmeta b/src/main/resources/assets/jewelrycraft2/pack.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/sounds.json b/src/main/resources/assets/jewelrycraft2/sounds.json old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg b/src/main/resources/assets/jewelrycraft2/sounds/Ritual.ogg old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockCrystal.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow0.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow1.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow10.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow11.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow12.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow13.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow14.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow15.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow2.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow3.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow4.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow5.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow6.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow7.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow8.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/blockShadow9.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/molder.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalFlow.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/blocks/moltenMetalStill.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png b/src/main/resources/assets/jewelrycraft2/textures/blocks/oreShadow.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/BlackHeart.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/BlueHeart.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Bracelet.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Earrings.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Mask.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Necklace.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/RedHeart.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png b/src/main/resources/assets/jewelrycraft2/textures/entities/Ring.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png b/src/main/resources/assets/jewelrycraft2/textures/entities/WhiteHeart.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png b/src/main/resources/assets/jewelrycraft2/textures/entities/jeweler.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png b/src/main/resources/assets/jewelrycraft2/textures/gui/chest_ring.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png b/src/main/resources/assets/jewelrycraft2/textures/gui/curses_tab.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_modifier.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelry_tab.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png b/src/main/resources/assets/jewelrycraft2/textures/gui/potions.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png b/src/main/resources/assets/jewelrycraft2/textures/items/bracelet.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/braceletMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png b/src/main/resources/assets/jewelrycraft2/textures/items/bucketOverlay.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayBraceletMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayEarringsMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayIngotMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayNecklaceMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/clayRingMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png b/src/main/resources/assets/jewelrycraft2/textures/items/crystal.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png b/src/main/resources/assets/jewelrycraft2/textures/items/crystalOverlay.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png b/src/main/resources/assets/jewelrycraft2/textures/items/earrings.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/earringsMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingotMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png b/src/main/resources/assets/jewelrycraft2/textures/items/ingotShadow.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelBracelet.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelEarrings.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelNecklace.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelRing.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png b/src/main/resources/assets/jewelrycraft2/textures/items/jewelryModifier.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta b/src/main/resources/assets/jewelrycraft2/textures/items/moltenMetalStill.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png b/src/main/resources/assets/jewelrycraft2/textures/items/necklace.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/necklaceMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ring.png b/src/main/resources/assets/jewelrycraft2/textures/items/ring.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/ringMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png b/src/main/resources/assets/jewelrycraft2/textures/items/structureGen.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png b/src/main/resources/assets/jewelrycraft2/textures/items/thiefGloves.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/blockMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/clayBlockMold.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot2.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot3.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot4.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot5.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot6.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/ingot7.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png b/src/main/resources/assets/jewelrycraft2/textures/particle/shadows.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/BricksPedestal.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Displayer.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/JewelrsCraftingBench.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Molder.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye1.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye2.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye3.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowEye4.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/ShadowHand.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png b/src/main/resources/assets/jewelrycraft2/textures/tileentities/Smelter.png old mode 100755 new mode 100644 diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png old mode 100755 new mode 100644 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info old mode 100755 new mode 100644 -- cgit v1.2.3