diff --git a/README.md b/README.md index 4c731e0..f3b2d15 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Submit any bug reports / suggestions via [issue tracker](https://github.com/Jack ## Contact Me - Twitter DM - [@JackyyTV](https://twitter.com/JackyyTV) -- Discord DM - Jacky#3044 +- Discord DM - Jacky#1234 - Twitch PM - [Jackyy](https://www.twitch.tv/jackyy) -- Reddit DM - [Jacky1356400](https://www.reddit.com/message/compose/?to=Jacky1356400) +- Reddit DM - [JackyyTV](https://www.reddit.com/message/compose/?to=JackyyTV) --- @@ -37,7 +37,7 @@ If you would like to set up the workspace yourself to submit PRs of features add - Decompiled source: `gradlew setupDecompWorkspace` - Obfuscated source: `gradlew setupDevWorkspace` - CI server: `gradlew setupCIWorkspace` - + 3. Either use `gradlew build` to build the jar file (Output is in `build/libs`), or setup the IDE if you are going to modify any codes. Both IntelliJ IDEA and Eclipse are included below since they're more popular IDEs. - IntelliJ IDEA: Do `gradlew idea`, open the `.ipr` file and import the gradle file, then execute the `genIntellijRuns` task in the "Gradle" tab. - Eclipse: Do `gradlew eclipse` and open the directory as project. diff --git a/build.gradle b/build.gradle index 97f0080..7e8b9e9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { - repositories { - jcenter() - maven { url = "http://files.minecraftforge.net/maven" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' - } + repositories { + jcenter() + maven { url = "http://files.minecraftforge.net/maven" } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -15,80 +15,79 @@ archivesBaseName = "AvaritiaTweaks" sourceCompatibility = targetCompatibility = "1.8" compileJava { - sourceCompatibility = targetCompatibility = "1.8" + sourceCompatibility = targetCompatibility = "1.8" } minecraft { - version = "${forge_version}" - runDir = "run" - mappings = "${mappings_version}" + version = "${forge_version}" + runDir = "run" + mappings = "${mappings_version}" - replace '@FINGERPRINT@', project.findProperty('signSHA1') - replaceIn "AvaritiaTweaks.java" + replace '@FINGERPRINT@', project.findProperty('signSHA1') + replaceIn "AvaritiaTweaks.java" } repositories { - maven { - name = "JEI Maven" - url = "http://dvs1.progwml6.com/files/maven" - } - maven { - name = "Hwyla Maven" - url = "https://tehnut.info/maven" - } - maven { - name = "CB Maven" - url = "http://chickenbones.net/maven" - } - maven { - name = "CoFH Maven" - url = "http://maven.covers1624.net" - } - maven { - name = "CraftTweaker Maven" - url = "http://maven.blamejared.com" - } + maven { + name = "JEI Maven" + url = "https://dvs1.progwml6.com/files/maven" + } + maven { + name = "CB Maven" + url = "http://chickenbones.net/maven" + } + maven { + name = "CoFH Maven" + url = "http://maven.covers1624.net" + } + maven { + name = "Curse Maven" + url = "https://www.cursemaven.com" + } } dependencies { - compile files('libs/') - deobfCompile "mezz.jei:jei_1.11.2:+" - deobfCompile "mcp.mobius.waila:Hwyla:1.8.22-B37_1.11" - deobfCompile "codechicken:CodeChickenLib:1.11.2-+:universal" - deobfCompile "morph.avaritia:Avaritia:1.11.2-+:universal" + deobfCompile "mezz.jei:jei_1.11.2:+" + deobfCompile "curse.maven:hwyla:2496989" //1.8.22-B37_1.11 + deobfCompile "codechicken:CodeChickenLib:1.11.2-+:universal" + deobfCompile("morph.avaritia:Avaritia:1.11.2-+:universal") { + transitive = false + } + deobfCompile "curse.maven:botania:2451047" //r1.9-345 } processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - expand 'version':project.version, 'mcversion':project.minecraft.version - } - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + expand 'version':project.version, 'mcversion':project.minecraft.version + } + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } } task signJar(type: SignJar, dependsOn: reobfJar) { - onlyIf { - project.hasProperty('keyStore') - } - keyStore = project.findProperty('keyStore') - alias = project.findProperty('keyStoreAlias') - storePass = project.findProperty('keyStorePass') - keyPass = project.findProperty('keyStoreKeyPass') - inputFile = jar.archivePath - outputFile = jar.archivePath + onlyIf { + project.hasProperty('keyStore') + } + keyStore = project.findProperty('keyStore') + alias = project.findProperty('keyStoreAlias') + storePass = project.findProperty('keyStorePass') + keyPass = project.findProperty('keyStoreKeyPass') + inputFile = jar.archivePath + outputFile = jar.archivePath } build.dependsOn signJar task deobfJar(type: Jar) { - from sourceSets.main.output - classifier = 'deobf' + from sourceSets.main.output + classifier = 'deobf' } artifacts { - archives deobfJar + archives deobfJar } + diff --git a/gradle.properties b/gradle.properties index 69ef7fc..fe4e86f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx4G mc_version=1.11.2 forge_version=1.11.2-13.20.1.2563 -mod_version=1.1 +mod_version=1.2 mappings_version=stable_32 diff --git a/libs/Botania r1.9-345-deobf.jar b/libs/Botania r1.9-345-deobf.jar deleted file mode 100644 index d1f4cc1..0000000 Binary files a/libs/Botania r1.9-345-deobf.jar and /dev/null differ diff --git a/src/main/java/jackyy/avaritiatweaks/AvaritiaTweaks.java b/src/main/java/jackyy/avaritiatweaks/AvaritiaTweaks.java index de40386..3619d86 100644 --- a/src/main/java/jackyy/avaritiatweaks/AvaritiaTweaks.java +++ b/src/main/java/jackyy/avaritiatweaks/AvaritiaTweaks.java @@ -18,7 +18,7 @@ public class AvaritiaTweaks { public static final String MODID = "avaritiatweaks"; public static final String MODNAME = "Avaritia Tweaks"; - public static final String VERSION = "1.11.2-1.1"; + public static final String VERSION = "1.11.2-1.2"; public static final String MCVERSION = "[1.11,1.12)"; public static final String DEPENDS = "required-after:avaritia;required-after:codechickenlib;after:botania;"; public static final String COMMON_PROXY = "jackyy.avaritiatweaks.proxy.CommonProxy"; diff --git a/src/main/java/jackyy/avaritiatweaks/tweaks/ModEventsHandler.java b/src/main/java/jackyy/avaritiatweaks/tweaks/ModEventsHandler.java index ab39cbb..02c1f3e 100644 --- a/src/main/java/jackyy/avaritiatweaks/tweaks/ModEventsHandler.java +++ b/src/main/java/jackyy/avaritiatweaks/tweaks/ModEventsHandler.java @@ -4,9 +4,9 @@ import jackyy.avaritiatweaks.config.ModConfig; import jackyy.avaritiatweaks.packet.PacketHandler; import jackyy.avaritiatweaks.packet.PacketToggleNoClip; +import jackyy.avaritiatweaks.util.ModUtils; import morph.avaritia.handler.AvaritiaEventHandler; import morph.avaritia.init.ModItems; -import morph.avaritia.item.ItemArmorInfinity; import morph.avaritia.item.tools.ItemSwordInfinity; import morph.avaritia.util.TextUtils; import net.minecraft.block.Block; @@ -17,8 +17,6 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -72,48 +70,35 @@ public void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { public void armorTick(LivingEvent.LivingUpdateEvent event) { if (event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer)event.getEntityLiving(); - if (isArmorValid(player, EntityEquipmentSlot.HEAD)) { - checkAndAddEffect(player, ModConfig.infinityArmor.infinityHelmetPotionEffects); + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.HEAD)) { + ModUtils.checkAndAddEffect(player, ModConfig.infinityArmor.infinityHelmetPotionEffects); } - if (isArmorValid(player, EntityEquipmentSlot.CHEST)) { - checkAndAddEffect(player, ModConfig.infinityArmor.infinityChestplatePotionEffects); + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.CHEST)) { + ModUtils.checkAndAddEffect(player, ModConfig.infinityArmor.infinityChestplatePotionEffects); } - if (isArmorValid(player, EntityEquipmentSlot.LEGS)) { - checkAndAddEffect(player, ModConfig.infinityArmor.infinityLeggingsPotionEffects); + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.LEGS)) { + ModUtils.checkAndAddEffect(player, ModConfig.infinityArmor.infinityLeggingsPotionEffects); } - if (isArmorValid(player, EntityEquipmentSlot.FEET)) { - checkAndAddEffect(player, ModConfig.infinityArmor.infinityBootsPotionEffects); + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.FEET)) { + ModUtils.checkAndAddEffect(player, ModConfig.infinityArmor.infinityBootsPotionEffects); } - if (isArmorValid(player, EntityEquipmentSlot.CHEST) && AvaritiaEventHandler.isInfinite(player) && noClip) { - player.capabilities.isFlying = true; - player.noClip = true; - } - if (!AvaritiaEventHandler.isInfinite(player) && !noClip) { - player.noClip = false; - } - if (noClip && !player.capabilities.isFlying) { - player.capabilities.isFlying = true; - } - } - } - - private static boolean isArmorValid(EntityPlayer player, EntityEquipmentSlot slot) { - ItemStack armor = player.getItemStackFromSlot(slot); - return armor != ItemStack.EMPTY && armor.getItem() instanceof ItemArmorInfinity - && armor.getTagCompound() != null && armor.getTagCompound().getInteger("enhanced") == 1; - } - - private static void checkAndAddEffect(EntityPlayer player, String[] potions) { - for (String potion : potions) { - Potion effect = Potion.getPotionFromResourceLocation(potion); - if (effect != null) { - player.addPotionEffect(new PotionEffect(effect, 300, 0, false, false)); + if (ModConfig.infinityArmor.infinityArmorNoClip && !player.isSpectator()) { + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.CHEST) && AvaritiaEventHandler.isInfinite(player) && noClip) { + player.capabilities.isFlying = true; + player.noClip = true; + } + if (!AvaritiaEventHandler.isInfinite(player) && !noClip) { + player.noClip = false; + } + if (noClip && !player.capabilities.isFlying) { + player.capabilities.isFlying = true; + } } } } public static void toggleNoClip(EntityPlayer player) { - if (isArmorValid(player, EntityEquipmentSlot.CHEST)) { + if (ModUtils.isArmorValid(player, EntityEquipmentSlot.CHEST)) { if (MAP.containsKey(player) && MAP.get(player)) { MAP.remove(player); noClip = false; @@ -134,7 +119,7 @@ public void onTooltip(ItemTooltipEvent event) { if (item instanceof ItemSwordInfinity && ModConfig.tweaks.fixInfinitySwordTooltip) { for (int x = 0; x < tooltip.size(); x++) { if (tooltip.get(x).contains(I18n.format("attribute.name.generic.attackDamage"))) { - tooltip.set(x, " " + TextUtils.makeFabulous(I18n.format("tip.infinity")) + " " + tooltip.set(x, " " + TextUtils.makeFabulous(I18n.format("tooltips.avaritiatweaks.infinite")) + " " + TextFormatting.GRAY + I18n.format("attribute.name.generic.attackDamage")); return; } diff --git a/src/main/java/jackyy/avaritiatweaks/util/ModUtils.java b/src/main/java/jackyy/avaritiatweaks/util/ModUtils.java index 9fcd662..e56327f 100644 --- a/src/main/java/jackyy/avaritiatweaks/util/ModUtils.java +++ b/src/main/java/jackyy/avaritiatweaks/util/ModUtils.java @@ -1,12 +1,17 @@ package jackyy.avaritiatweaks.util; import jackyy.avaritiatweaks.tweaks.ModTweaks; +import morph.avaritia.item.ItemArmorInfinity; import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -75,4 +80,19 @@ public static void addEnhancementToolsRecipe(ItemStack input, ItemStack output, GameRegistry.addShapelessRecipe(input, output); } + public static boolean isArmorValid(EntityPlayer player, EntityEquipmentSlot slot) { + ItemStack armor = player.getItemStackFromSlot(slot); + return armor != ItemStack.EMPTY && armor.getItem() instanceof ItemArmorInfinity + && armor.getTagCompound() != null && armor.getTagCompound().getInteger("enhanced") == 1; + } + + public static void checkAndAddEffect(EntityPlayer player, String[] potions) { + for (String potion : potions) { + Potion effect = Potion.getPotionFromResourceLocation(potion); + if (effect != null) { + player.addPotionEffect(new PotionEffect(effect, 300, 0, false, false)); + } + } + } + } diff --git a/src/main/resources/assets/avaritiatweaks/lang/en_US.lang b/src/main/resources/assets/avaritiatweaks/lang/en_US.lang index 04eb6dc..362b093 100644 --- a/src/main/resources/assets/avaritiatweaks/lang/en_US.lang +++ b/src/main/resources/assets/avaritiatweaks/lang/en_US.lang @@ -16,6 +16,7 @@ tile.avaritiatweaks.gaia_block.name=Gaia Block tooltips.avaritiatweaks.enhancement_crystal=Infinity isn't even enough. tooltips.avaritiatweaks.noclip.enabled=No Clip Mode: §a§lEnabled§r tooltips.avaritiatweaks.noclip.disabled=No Clip Mode: §c§lDisabled§r +tooltips.avaritiatweaks.infinite=Infinite #Messages msg.avaritiatweaks.noclip.enabled=No Clip Mode is now §aEnabled§r diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index c8bb260..3db912e 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "avaritiatweaks", "name": "Avaritia Tweaks", "description": "Enhances Avaritia to another level!", - "version": "1.11.2-1.1", + "version": "1.11.2-1.2", "mcversion": "1.11.2", "url": "https://github.com/JackyyTV/AvaritiaTweaks", "updateUrl": "",