1.3.1 Update

- Completely removed Infinity Armor no clip mode, closes #11, #12 and #13

- Added a tooltip to indicate when a piece of infinity gear is enhanced

- Code optimizations

build.gradle

@@ -48,13 +48,13 @@ repositories {
 
 dependencies {
   deobfCompile "mezz.jei:jei_1.12.2:+"
-  deobfCompile "curse.maven:hwyla:2568751" //1.8.26-B41_1.12.2
-  deobfCompile "curse.maven:gunpowderlib:2852431" //1.12.2-1.0
+  deobfCompile "curse.maven:hwyla-253449:2568751" //1.8.26-B41_1.12.2
+  deobfCompile "curse.maven:gunpowderlib-356646:3168863" //1.12.2-1.1
   deobfCompile "codechicken:CodeChickenLib:1.12.2-+:universal"
   deobfCompile("morph.avaritia:Avaritia:1.12.2-+:universal") {
       transitive = false
   }
-  deobfCompile "curse.maven:botania:2846950" //r1.10-363
+  deobfCompile "curse.maven:botania-225643:3330934" //r1.10-364.4
 }
 
 processResources {

gradle.properties

@@ -3,5 +3,5 @@
 org.gradle.jvmargs=-Xmx4G
 mc_version=1.12.2
 forge_version=1.12.2-14.23.5.2847
-mod_version=1.3
+mod_version=1.3.1
 mappings_version=stable_39

src/main/java/jackyy/avaritiatweaks/AvaritiaTweaks.java

@@ -1,38 +1,18 @@
 package jackyy.avaritiatweaks;
 
 import jackyy.avaritiatweaks.proxy.CommonProxy;
-import jackyy.avaritiatweaks.tweaks.ModTweaks;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
+import jackyy.avaritiatweaks.util.Reference;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
-@Mod(modid = AvaritiaTweaks.MODID, version = AvaritiaTweaks.VERSION, name = AvaritiaTweaks.MODNAME, dependencies = AvaritiaTweaks.DEPENDS, acceptedMinecraftVersions = AvaritiaTweaks.MCVERSION, certificateFingerprint = "@FINGERPRINT@", useMetadata = true)
+@Mod(modid = Reference.MODID, version = Reference.VERSION, name = Reference.MODNAME, dependencies = Reference.DEPENDS, acceptedMinecraftVersions = Reference.MCVERSION, certificateFingerprint = "@FINGERPRINT@", useMetadata = true)
 public class AvaritiaTweaks {
 
-    public static final String MODID = "avaritiatweaks";
-    public static final String MODNAME = "Avaritia Tweaks";
-    public static final String VERSION = "1.12.2-1.3";
-    public static final String MCVERSION = "[1.12,1.13)";
-    public static final String DEPENDS = "required-after:avaritia;required-after:codechickenlib;required-after:gunpowderlib@[1.12.2-1.0,);after:botania;";
-    public static final String COMMON_PROXY = "jackyy.avaritiatweaks.proxy.CommonProxy";
-    public static final String CLIENT_PROXY = "jackyy.avaritiatweaks.proxy.ClientProxy";
-    public static final CreativeTabs TAB = new CreativeTabs(MODID) {
-        @Override
-        public ItemStack createIcon() {
-            return new ItemStack(ModTweaks.enhancementCrystal);
-        }
-    };
-
-    public static Logger logger = LogManager.getLogger(MODNAME);
-
-    @SidedProxy(serverSide = AvaritiaTweaks.COMMON_PROXY, clientSide = AvaritiaTweaks.CLIENT_PROXY)
+    @SidedProxy(serverSide = Reference.COMMON_PROXY, clientSide = Reference.CLIENT_PROXY)
     public static CommonProxy proxy;
 
     @Mod.EventHandler
@@ -52,7 +32,7 @@ public void postInit(FMLPostInitializationEvent event) {
 
     @Mod.EventHandler
     public void onFingerprintViolation(FMLFingerprintViolationEvent event) {
-        logger.warn("Invalid fingerprint detected! The file " + event.getSource().getName() + " may have been modified. This will NOT be supported by the mod author!");
+        Reference.LOGGER.warn("Invalid fingerprint detected! The file " + event.getSource().getName() + " may have been modified or running in dev environment.");
     }
 
 }

src/main/java/jackyy/avaritiatweaks/compat/botania/BotaniaCompat.java

@@ -1,14 +1,13 @@
 package jackyy.avaritiatweaks.compat.botania;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
 import jackyy.avaritiatweaks.compat.botania.block.BlockGaia;
 import jackyy.avaritiatweaks.compat.botania.block.BlockInfinitato;
 import jackyy.avaritiatweaks.compat.botania.render.RenderTileInfinitato;
 import jackyy.avaritiatweaks.compat.botania.subtile.SubTileAsgardandelion;
 import jackyy.avaritiatweaks.compat.botania.subtile.SubTileSoarleander;
 import jackyy.avaritiatweaks.compat.botania.tile.TileInfinitato;
 import jackyy.avaritiatweaks.config.ModConfig;
-import jackyy.avaritiatweaks.util.ModUtils;
+import jackyy.avaritiatweaks.util.Reference;
 import jackyy.gunpowderlib.helper.ObjectHelper;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -50,7 +49,7 @@ public static void initBlocks(RegistryEvent.Register<Block> e) {
             BotaniaAPI.registerSubTileSignature(SubTileAsgardandelion.class, new BasicSignature("asgardandelion") {
                 @Override
                 public String getUnlocalizedLoreTextForStack(ItemStack stack) {
-                    return "tile.botania.flower.asgardandelion.lore";
+                    return "tile." + Reference.BOTANIA + ".flower.asgardandelion.lore";
                 }
             });
             BotaniaAPI.addSubTileToCreativeMenu("asgardandelion");
@@ -60,31 +59,31 @@ public String getUnlocalizedLoreTextForStack(ItemStack stack) {
             BotaniaAPI.registerSubTileSignature(SubTileSoarleander.class, new BasicSignature("soarleander") {
                 @Override
                 public String getUnlocalizedLoreTextForStack(ItemStack stack) {
-                    return "tile.botania.flower.soarleander.lore";
+                    return "tile." + Reference.BOTANIA + ".flower.soarleander.lore";
                 }
             });
             BotaniaAPI.addSubTileToCreativeMenu("soarleander");
         }
         if (ModConfig.compats.botania.infinitato) {
             e.getRegistry().register(infinitato);
-            GameRegistry.registerTileEntity(TileInfinitato.class, new ResourceLocation(AvaritiaTweaks.MODID, "infinitato_tile"));
+            GameRegistry.registerTileEntity(TileInfinitato.class, new ResourceLocation(Reference.MODID, "infinitato_tile"));
         }
     }
 
     public static void init() {
         if (ModConfig.compats.botania.asgardandelion.enabled) {
             SubTileAsgardandelion.lexicon = new BotaniaLexiconEntry("asgardandelion", BotaniaAPI.categoryGenerationFlowers);
             SubTileAsgardandelion.lexicon.setLexiconPages(
-                    BotaniaAPI.internalHandler.textPage("botania.lexicon.asgardandelion.0")
+                    BotaniaAPI.internalHandler.textPage(Reference.BOTANIA + ".lexicon.asgardandelion.0")
             );
             SubTileAsgardandelion.lexicon.setIcon(asgardandelion);
         }
         if (ModConfig.compats.botania.soarleander.enabled) {
             SubTileSoarleander.lexicon = new BotaniaLexiconEntry("soarleander", BotaniaAPI.categoryGenerationFlowers);
             SubTileSoarleander.lexicon.setLexiconPages(
-                    BotaniaAPI.internalHandler.textPage("botania.lexicon.soarleander.0"),
-                    BotaniaAPI.internalHandler.runeRecipePage("botania.lexicon.soarleander.1", new RecipeRuneAltar(
-                            soarleander, 8000, ModUtils.getFlower("gourmaryllis"),
+                    BotaniaAPI.internalHandler.textPage(Reference.BOTANIA + ".lexicon.soarleander.0"),
+                    BotaniaAPI.internalHandler.runeRecipePage(Reference.BOTANIA + ".lexicon.soarleander.1", new RecipeRuneAltar(
+                            soarleander, 8000, ObjectHelper.getBotaniaFlower("gourmaryllis"),
                             new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),
                             new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),
                             new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),
@@ -99,10 +98,10 @@ public static void init() {
     public static void initModels() {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(gaiaBlock), 0, new ModelResourceLocation(gaiaBlock.getRegistryName(), "inventory"));
         if (ModConfig.compats.botania.asgardandelion.enabled) {
-            BotaniaAPIClient.registerSubtileModel(SubTileAsgardandelion.class, new ModelResourceLocation(AvaritiaTweaks.MODID + ":asgardandelion"));
+            BotaniaAPIClient.registerSubtileModel(SubTileAsgardandelion.class, new ModelResourceLocation(Reference.MODID + ":asgardandelion"));
         }
         if (ModConfig.compats.botania.soarleander.enabled) {
-            BotaniaAPIClient.registerSubtileModel(SubTileSoarleander.class, new ModelResourceLocation(AvaritiaTweaks.MODID + ":soarleander"));
+            BotaniaAPIClient.registerSubtileModel(SubTileSoarleander.class, new ModelResourceLocation(Reference.MODID + ":soarleander"));
         }
         if (ModConfig.compats.botania.infinitato) {
             ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(infinitato), 0, new ModelResourceLocation(infinitato.getRegistryName(), "facing=south"));
@@ -111,19 +110,19 @@ public static void initModels() {
     }
 
     public static void initRecipes() {
-        asgardandelion = ModUtils.getFlower("asgardandelion");
-        soarleander = ModUtils.getFlower("soarleander");
+        asgardandelion = ObjectHelper.getBotaniaFlower("asgardandelion");
+        soarleander = ObjectHelper.getBotaniaFlower("soarleander");
         if (ModConfig.compats.botania.gaiaBlock) {
             GameRegistry.addShapedRecipe(
-                    new ResourceLocation(AvaritiaTweaks.MODID, "gaia_ingots_to_block"), null, new ItemStack(gaiaBlock),
+                    new ResourceLocation(Reference.MODID, "gaia_ingots_to_block"), null, new ItemStack(gaiaBlock),
                     "XXX", "XXX", "XXX",
-                    'X', ObjectHelper.getItemStackByName("botania:manaresource", 1, 14)
+                    'X', ObjectHelper.getItemStackByName(Reference.BOTANIA, "manaresource", 1, 14)
             );
-            GameRegistry.addShapelessRecipe(new ResourceLocation(AvaritiaTweaks.MODID, "gaia_block_to_ingots"), null, ObjectHelper.getItemStackByName("botania:manaresource", 9, 14), Ingredient.fromStacks(new ItemStack(gaiaBlock)));
+            GameRegistry.addShapelessRecipe(new ResourceLocation(Reference.MODID, "gaia_block_to_ingots"), null, ObjectHelper.getItemStackByName(Reference.BOTANIA, "manaresource", 9, 14), Ingredient.fromStacks(new ItemStack(gaiaBlock)));
         }
         if (ModConfig.compats.botania.soarleander.enabled) {
             BotaniaAPI.registerRuneAltarRecipe(
-                    soarleander, 8000, ModUtils.getFlower("gourmaryllis"),
+                    soarleander, 8000, ObjectHelper.getBotaniaFlower("gourmaryllis"),
                     new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),
                     new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),
                     new ItemStack(Items.CHICKEN), new ItemStack(Items.CHICKEN),

src/main/java/jackyy/avaritiatweaks/compat/botania/block/BlockGaia.java

@@ -1,7 +1,7 @@
 package jackyy.avaritiatweaks.compat.botania.block;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
 import jackyy.avaritiatweaks.config.ModConfig;
+import jackyy.avaritiatweaks.util.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -19,18 +19,18 @@ public class BlockGaia extends Block {
     public BlockGaia() {
         super(Material.IRON);
         setRegistryName("gaia_block");
-        setTranslationKey(AvaritiaTweaks.MODID + ".gaia_block");
+        setTranslationKey(Reference.MODID + ".gaia_block");
         setSoundType(SoundType.METAL);
         setHarvestLevel("pickaxe", 3);
         setHardness(50.0F);
         setResistance(2000.0F);
-        setCreativeTab(AvaritiaTweaks.TAB);
+        setCreativeTab(Reference.TAB);
     }
 
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
         if (ModConfig.compats.botaniaCompat) {
-            if (ModConfig.compats.botania.gaiaBlock && Loader.isModLoaded("botania")) {
+            if (ModConfig.compats.botania.gaiaBlock && Loader.isModLoaded(Reference.BOTANIA)) {
                 list.add(new ItemStack(this));
             }
         }

src/main/java/jackyy/avaritiatweaks/compat/botania/block/BlockInfinitato.java

@@ -1,7 +1,7 @@
 package jackyy.avaritiatweaks.compat.botania.block;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
 import jackyy.avaritiatweaks.compat.botania.tile.TileInfinitato;
+import jackyy.avaritiatweaks.util.Reference;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockStateContainer;
@@ -31,9 +31,9 @@ public class BlockInfinitato extends BlockContainer implements ILexiconable {
     public BlockInfinitato() {
         super(Material.CLOTH);
         setRegistryName("infinitato");
-        setTranslationKey(AvaritiaTweaks.MODID + ".infinitato");
+        setTranslationKey(Reference.MODID + ".infinitato");
         setHardness(0.25F);
-        setCreativeTab(AvaritiaTweaks.TAB);
+        setCreativeTab(Reference.TAB);
     }
 
     @Override @SuppressWarnings("deprecation")

src/main/java/jackyy/avaritiatweaks/compat/botania/render/RenderTileInfinitato.java

@@ -1,8 +1,8 @@
 package jackyy.avaritiatweaks.compat.botania.render;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
 import jackyy.avaritiatweaks.compat.botania.BotaniaCompat;
 import jackyy.avaritiatweaks.compat.botania.tile.TileInfinitato;
+import jackyy.avaritiatweaks.util.Reference;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
@@ -17,7 +17,7 @@
 
 public class RenderTileInfinitato extends TileEntitySpecialRenderer<TileInfinitato> {
 
-    private static final ResourceLocation TEXTURE = new ResourceLocation(AvaritiaTweaks.MODID,"textures/blocks/infinitato.png");
+    private static final ResourceLocation TEXTURE = new ResourceLocation(Reference.MODID,"textures/blocks/infinitato.png");
     private static final ModelInfinitato MODEL = new ModelInfinitato();
 
     @Override

src/main/java/jackyy/avaritiatweaks/compat/botania/tile/TileInfinitato.java

@@ -24,7 +24,7 @@ public class TileInfinitato extends TileTinyPotato {
 
     public void interact(EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side) {
         jump();
-        if(name.equalsIgnoreCase("shia labeouf") && !world.isRemote && nextDoIt == 0) {
+        if (name.equalsIgnoreCase("shia labeouf") && !world.isRemote && nextDoIt == 0) {
             nextDoIt = 40;
             world.playSound(player, player.getPosition(), ObjectHelper.getSoundByName("botania", "doit"),
                     SoundCategory.BLOCKS, 2.5F, 0.7F);
@@ -66,13 +66,13 @@ public void jump() {
 
     @Override
     public void update() {
-        if(jumpTicks > 0) {
+        if (jumpTicks > 0) {
             jumpTicks--;
             if (jumpTicks == 20 || jumpTicks == 0) {
                 this.world.createExplosion(null, getPos().getX() + 0.5, getPos().getY(), getPos().getZ() + 0.5, 0.0f, true);
             }
         }
-        if(nextDoIt > 0)
+        if (nextDoIt > 0)
             nextDoIt--;
     }
 

src/main/java/jackyy/avaritiatweaks/config/ModConfig.java

@@ -1,13 +1,13 @@
 package jackyy.avaritiatweaks.config;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
+import jackyy.avaritiatweaks.util.Reference;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-@Config(modid = AvaritiaTweaks.MODID, name = "AvaritiaTweaks", category = AvaritiaTweaks.MODID)
+@Config(modid = Reference.MODID, name = "AvaritiaTweaks", category = Reference.MODID)
 public class ModConfig {
 
     public static Tweaks tweaks = new Tweaks();
@@ -90,11 +90,6 @@ public static class InfinityArmor {
                 "Requires Enhancement Crystal to be installed on Infinity Boots"
         })
         public String[] infinityBootsPotionEffects = new String[0];
-        @Config.Comment({
-                "If true, enables No Clip mode for Infinity Armor",
-                "Requires Enhancement Crystal to be installed on Infinity Chestplate"
-        })
-        public boolean infinityArmorNoClip = true;
     }
 
     public static class InfinityTools {
@@ -140,8 +135,8 @@ public static class InfinityTools {
     public static class ConfigHolder {
         @SubscribeEvent
         public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
-            if (event.getModID().equals(AvaritiaTweaks.MODID)) {
-                ConfigManager.sync(AvaritiaTweaks.MODID, Config.Type.INSTANCE);
+            if (event.getModID().equals(Reference.MODID)) {
+                ConfigManager.sync(Reference.MODID, Config.Type.INSTANCE);
             }
         }
     }

src/main/java/jackyy/avaritiatweaks/item/ItemEnhancementCrystal.java

@@ -1,7 +1,7 @@
 package jackyy.avaritiatweaks.item;
 
-import jackyy.avaritiatweaks.AvaritiaTweaks;
 import jackyy.avaritiatweaks.config.ModConfig;
+import jackyy.avaritiatweaks.util.Reference;
 import morph.avaritia.api.IHaloRenderItem;
 import morph.avaritia.entity.EntityImmortalItem;
 import morph.avaritia.init.AvaritiaTextures;
@@ -26,8 +26,8 @@ public class ItemEnhancementCrystal extends Item implements IHaloRenderItem {
 
     public ItemEnhancementCrystal() {
         setRegistryName("enhancement_crystal");
-        setTranslationKey(AvaritiaTweaks.MODID + ".enhancement_crystal");
-        setCreativeTab(AvaritiaTweaks.TAB);
+        setTranslationKey(Reference.MODID + ".enhancement_crystal");
+        setCreativeTab(Reference.TAB);
     }
 
     @Override @SideOnly(Side.CLIENT)