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 --- 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 196 files changed, 19 insertions(+), 104 deletions(-) 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 (limited to 'src/main/java') 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 -- cgit v1.2.3