diff --git a/build.properties b/build.properties index d3cc98c..54de011 100644 --- a/build.properties +++ b/build.properties @@ -14,4 +14,4 @@ forgeMultipart_version=1.2.0.345 tconstruct_version=1.8.5.build958 forge_version=10.13.4.1448 -build_number=10 \ No newline at end of file +build_number=12 \ No newline at end of file diff --git a/src/main/java/api/java/baubles/api/BaubleType.java b/src/main/api/java/baubles/api/BaubleType.java similarity index 100% rename from src/main/java/api/java/baubles/api/BaubleType.java rename to src/main/api/java/baubles/api/BaubleType.java diff --git a/src/main/java/api/java/baubles/api/BaublesApi.java b/src/main/api/java/baubles/api/BaublesApi.java similarity index 100% rename from src/main/java/api/java/baubles/api/BaublesApi.java rename to src/main/api/java/baubles/api/BaublesApi.java diff --git a/src/main/java/api/java/baubles/api/IBauble.java b/src/main/api/java/baubles/api/IBauble.java similarity index 100% rename from src/main/java/api/java/baubles/api/IBauble.java rename to src/main/api/java/baubles/api/IBauble.java diff --git a/src/main/java/api/java/baubles/api/package-info.java b/src/main/api/java/baubles/api/package-info.java similarity index 100% rename from src/main/java/api/java/baubles/api/package-info.java rename to src/main/api/java/baubles/api/package-info.java diff --git a/src/main/java/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/api/java/cofh/api/energy/IEnergyContainerItem.java similarity index 100% rename from src/main/java/api/java/cofh/api/energy/IEnergyContainerItem.java rename to src/main/api/java/cofh/api/energy/IEnergyContainerItem.java diff --git a/src/main/java/api/java/cofh/core/item/IEqualityOverrideItem.java b/src/main/api/java/cofh/core/item/IEqualityOverrideItem.java similarity index 100% rename from src/main/java/api/java/cofh/core/item/IEqualityOverrideItem.java rename to src/main/api/java/cofh/core/item/IEqualityOverrideItem.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaBlock.java b/src/main/api/java/mcp/mobius/waila/api/IWailaBlock.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaBlock.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaBlock.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/main/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaBlockDecorator.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaDataProvider.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaDataProvider.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaDataProvider.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaEntityAccessor.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaEntityProvider.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaFMPAccessor.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaFMPDecorator.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaFMPProvider.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/api/java/mcp/mobius/waila/api/IWailaRegistrar.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaRegistrar.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaRegistrar.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java rename to src/main/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/api/java/mcp/mobius/waila/api/SpecialChars.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/SpecialChars.java rename to src/main/api/java/mcp/mobius/waila/api/SpecialChars.java diff --git a/src/main/java/api/java/mcp/mobius/waila/api/package-info.java b/src/main/api/java/mcp/mobius/waila/api/package-info.java similarity index 100% rename from src/main/java/api/java/mcp/mobius/waila/api/package-info.java rename to src/main/api/java/mcp/mobius/waila/api/package-info.java diff --git a/src/main/java/api/java/morph/api/Ability.java b/src/main/api/java/morph/api/Ability.java similarity index 100% rename from src/main/java/api/java/morph/api/Ability.java rename to src/main/api/java/morph/api/Ability.java diff --git a/src/main/java/api/java/morph/api/Api.java b/src/main/api/java/morph/api/Api.java similarity index 100% rename from src/main/java/api/java/morph/api/Api.java rename to src/main/api/java/morph/api/Api.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java diff --git a/src/main/java/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java similarity index 100% rename from src/main/java/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java rename to src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java diff --git a/src/main/java/api/java/thaumcraft/api/IGoggles.java b/src/main/api/java/thaumcraft/api/IGoggles.java similarity index 100% rename from src/main/java/api/java/thaumcraft/api/IGoggles.java rename to src/main/api/java/thaumcraft/api/IGoggles.java diff --git a/src/main/java/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/main/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java similarity index 100% rename from src/main/java/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java rename to src/main/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java index 061a2f3..109e5f6 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java @@ -41,7 +41,7 @@ import java.util.Calendar; public class BloodArsenal { public final static String MODID = "BloodArsenal"; - public final static String VERSION = "1.1-11"; + public final static String VERSION = "1.1-12"; @SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy") public static CommonProxy proxy; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java b/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java index c4def53..58479fc 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java +++ b/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java @@ -120,7 +120,7 @@ public class GlassSacrificialDagger extends Item } Random random = new Random(); - if (random.nextInt(2) < 2) + if (random.nextInt(4) < 1) { player.addPotionEffect(new PotionEffect(BloodArsenalConfig.bleedingID, random.nextInt(5) * 20, 0)); } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 240584c..a6241fe 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "BloodArsenal", "name": "Blood Arsenal", "description": "Blood-themed tools, weapons, armor and much more!", - "version": "1.1-11", + "version": "1.1-12", "mcversion": "1.7.10", "url": "", "updateUrl": "",