Update 0.1.0 (#20)

* Does this fix the build failure? * do it (#16) * Accidently pulled from the wrong branch (#16) * This should work, fixed ItemRedCrown * Update en_US.lang * Infusion matrix (#6) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Fixing all the stuff for the soap * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Infusion matrix (#7) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Fixing a small glitch * This should fix the error I was having Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Bring the two together (#17) * Update README.md * update BS+SA Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Fix the renderer * bringing the two together (#17) * Accidently pulled from the wrong branch (#16) * This should work, fixed ItemRedCrown * Update en_US.lang * Infusion matrix (#6) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Fixing all the stuff for the soap * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Infusion matrix (#7) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Fixing a small glitch * This should fix the error I was having Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Bring the two together (#17) * Update README.md * update BS+SA * Update README.md * Fix server crash with renderer (#18) Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: miozune <[email protected]> * Update README.md * [[Big shot]] Adds in the new soap. * Update README.md * Revert "Update README.md" This reverts commit ec44287a32. * [[Big shot 2]] * Revert "Merge branch 'master' into main" This reverts commit cd71020231, reversing changes made to 01da9d4592. * fixed (#18) * Adding the new soap to the latest version (#19) * Does this fix the build failure? * do it (#16) * Accidently pulled from the wrong branch (#16) * This should work, fixed ItemRedCrown * Update en_US.lang * Infusion matrix (#6) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Fixing all the stuff for the soap * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Infusion matrix (#7) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Fixing a small glitch * This should fix the error I was having Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Bring the two together (#17) * Update README.md * update BS+SA Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Fix the renderer * bringing the two together (#17) * Accidently pulled from the wrong branch (#16) * This should work, fixed ItemRedCrown * Update en_US.lang * Infusion matrix (#6) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Fixing all the stuff for the soap * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Infusion matrix (#7) * Create zh_CN.lang * Update en_US.lang * Some interceptor code cleanup Private fields, pruned unnecessary try/catches, simplified logic, some variables renamed for clarity and consistency * Move all essentia in a single tick if it exists * spotlessApply * Update BS * Update README.md * Update README.md Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: GitHub GTNH Actions <> * Fixing a small glitch * This should fix the error I was having Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> * Bring the two together (#17) * Update README.md * update BS+SA * Update README.md * Fix server crash with renderer (#18) Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: miozune <[email protected]> * Update README.md * [[Big shot]] Adds in the new soap. Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: miozune <[email protected]> * BS+SA Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: miozune <[email protected]> * Update 0.0.11 Co-authored-by: [Kiwi233] <[email protected]> Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: greesyB <[email protected]> Co-authored-by: miozune <[email protected]>
2026-11-13 17:04:12 +00:00 · 2023-01-15 13:43:44 -05:00
1 parent 21975546d9
commit f1e969a4e6
@@ -19,7 +19,7 @@ Curseforge: https://www.curseforge.com/minecraft/mc-mods/thaumic-insurgence

 Modrinth: https://modrinth.com/mod/thaumic_insurgence

-Original Branch: https://github.com/Alastors/thaumicinsurgence
+GTNH Branch: https://github.com/GTNewHorizons/thaumicinsurgence
   - (Sometimes this branch might have a newer update than it might be here, though obviously sometimes this branch might be newer)

 # Ver 0.0.0.4 - Release Saturday September 3rd, 12022/2022
@@ -0,0 +1,72 @@
+package thaumicinsurgence.item.armor;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+import thaumcraft.api.*;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.nodes.IRevealer;
+import thaumcraft.common.items.armor.ItemGoggles;
+import thaumicinsurgence.main.utils.TabThaumicInsurgence;
+
+public class ItemBIGSHOT extends ItemGoggles
+        implements IRepairable, IVisDiscountGear, IRevealer, IGoggles, IRunicArmor, IWarpingGear {
+    public IIcon icon;
+
+    public ItemBIGSHOT(final ArmorMaterial material, final int j, final int k) {
+        super(material, j, k);
+        setCreativeTab(TabThaumicInsurgence.tabThaumicInsurgence);
+        setUnlocalizedName("ItemBIGSHOT");
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(final IIconRegister ir) {
+        icon = ir.registerIcon("thaumicinsurgence:[[big_shot]]");
+    }
+
+    @SideOnly(Side.CLIENT)
+    public IIcon func_77617_a(int par1) {
+        return this.icon;
+    }
+
+    public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
+        return "thaumicinsurgence:model/[[JACKPOT]].png";
+    }
+
+    public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) {
+        return 15;
+    }
+
+    @Override
+    public int getWarp(ItemStack var1, EntityPlayer var2) {
+        return 30;
+    }
+
+    public boolean showNodes(ItemStack itemstack, EntityLivingBase player) {
+        return true;
+    }
+
+    public void onUpdate(final ItemStack stack, final World world, final Entity entity, final int i, final boolean b) {
+        super.onUpdate(stack, world, entity, i, b);
+        if (!world.isRemote
+                && stack.isItemDamaged()
+                && entity.ticksExisted % 20 == 0
+                && entity instanceof EntityLivingBase) {
+            stack.damageItem(-1, (EntityLivingBase) entity);
+        }
+    }
+
+    @Override
+    public void onArmorTick(final World world, final EntityPlayer player, final ItemStack stack) {
+        super.onArmorTick(world, player, stack);
+        if (!world.isRemote && stack.isItemDamaged() && player.ticksExisted % 20 == 0) {
+            stack.damageItem(-1, player);
+        }
+    }
+}
@@ -13,6 +13,8 @@ import thaumicinsurgence.block.BlockInfusionFucker;
 import thaumicinsurgence.item.ItemMiscResources;
 import thaumicinsurgence.item.ItemSanitySoapAlpha;
 import thaumicinsurgence.item.ItemSanitySoapBeta;
+import thaumicinsurgence.item.armor.ItemBIGSHOT;
+
 import thaumicinsurgence.item.armor.ItemEightBitRedCrown;
 import thaumicinsurgence.item.armor.ItemRedCrown;
 import thaumicinsurgence.item.tools.ItemAlastorsWand;
@@ -44,6 +46,8 @@ public class Config {
    public static Item alastorsWand;
    public static Item soapAlpha;
    public static Item soapBetaBitch;
+    public static Item hyperLinkBlocked;
+

    public static BlockInfusionFucker infusionIntercepter;
    public static BlockInfusionMatrixAlpha matrixAlpha;
@@ -111,6 +115,9 @@ public class Config {

        soapBetaBitch = new ItemSanitySoapBeta();
        GameRegistry.registerItem(soapBetaBitch, soapBetaBitch.getUnlocalizedName());
+        hyperLinkBlocked = new ItemBIGSHOT(ThaumcraftApi.armorMatSpecial, 4, 0);
+        GameRegistry.registerItem(hyperLinkBlocked, hyperLinkBlocked.getUnlocalizedName());
+
    }

    private static void processConfigFile() {
@@ -221,6 +221,7 @@ public class ThaumcraftHelper implements IModHelper {
    public static InfusionRecipe thaumicInterfacer;
    public static CrucibleRecipe soapAlpha;
    public static CrucibleRecipe soapBeta;
+    public static CrucibleRecipe bigShot;

    public static void getBlocks() {
        plant = BlockInterface.getBlock(Name, "blockCustomPlant");
@@ -295,6 +296,17 @@ public class ThaumcraftHelper implements IModHelper {
                        .add(Aspect.ELDRITCH, 32)
                        .add(Aspect.EXCHANGE, 64)
                        .add(Aspect.HEAL, 64));
+
+        bigShot = ThaumcraftApi.addCrucibleRecipe(
+                "TI_DeliciousKromer",
+                new ItemStack(Config.hyperLinkBlocked),
+                new ItemStack(ConfigItems.itemGoggles),
+                new AspectList()
+                        .add(Aspect.GREED, 128)
+                        .add(Aspect.ELDRITCH, 64)
+                        .add(Aspect.DARKNESS, 64)
+                        .add(Aspect.EXCHANGE, 64)
+                        .add(Aspect.TRAP, 32));
    }

    public static void setupResearch() {
@@ -320,6 +332,9 @@ public class ThaumcraftHelper implements IModHelper {
        ResearchItem soapBetaPage;
        ResearchPage soapBeta1;
        ResearchPage soapBeta2;
+        ResearchItem littleSponge;
+        ResearchPage unintelligbleLaughter;
+        ResearchPage shootForTheSky;

        soapAlphaPage = new ResearchItem(
                "TI_SanitizingSoapAlpha",
@@ -366,6 +381,20 @@ public class ThaumcraftHelper implements IModHelper {
                -5,
                new ItemStack(Config.thaumicInterfacer));

+        littleSponge = new ResearchItem(
+                "TI_DeliciousKromer",
+                category,
+                new AspectList()
+                        .add(Aspect.GREED, 1)
+                        .add(Aspect.ELDRITCH, 1)
+                        .add(Aspect.DARKNESS, 1)
+                        .add(Aspect.EXCHANGE, 1)
+                        .add(Aspect.TRAP, 1),
+                0,
+                3,
+                0,
+                new ItemStack(Config.hyperLinkBlocked));
+
        intercepter1 = new ResearchPage("InfusionIntercepter.1");
        intercepter2 = new ResearchPage(infusionIntercepter);

@@ -379,6 +408,10 @@ public class ThaumcraftHelper implements IModHelper {
        soapBeta1 = new ResearchPage("SoapBeta.1");
        soapBeta2 = new ResearchPage(soapBeta);

+        unintelligbleLaughter = new ResearchPage("unintelligbleLaughter");
+        shootForTheSky = new ResearchPage(bigShot);
+
+
        infusionIntercepterPage.setPages(intercepter1, intercepter2);
        infusionIntercepterPage.setParents("INFUSION");

@@ -394,12 +427,18 @@ public class ThaumcraftHelper implements IModHelper {
        soapBetaPage.setPages(soapBeta1, soapBeta2);
        soapBetaPage.setParents("TI_SanitizingSoapAlpha");

+        littleSponge.setPages(unintelligbleLaughter, shootForTheSky);
+        littleSponge.setParents("GOGGLES");
+
+
        ThaumcraftApi.addWarpToResearch("TI_InfusionIntercepter", 4);
        ResearchCategories.addResearch(infusionIntercepterPage);
        ResearchCategories.addResearch(redCrownPage);
        ResearchCategories.addResearch(thaumicInterfacerPage);
        ResearchCategories.addResearch(soapAlphaPage);
        ResearchCategories.addResearch(soapBetaPage);
+        ResearchCategories.addResearch(littleSponge);
+
    }

    public static ResearchPage getResearchPage(String ident) {
@@ -27,6 +27,15 @@ tc.research_text.TI_SanitizingSoapAlpha=Every day we inch closer to replacing Az
 tc.research_name.TI_SanitizingSoapBeta=Alastor's Soap
 tc.research_text.TI_SanitizingSoapBeta=Made from Azanor's tears

+unintelligbleLaughter=I USED TO BE NOTHING BUT THE E_MAIL GUY, NOW I'M THE [[It Burns! Ow! Stop! Help Me! It Burns!]] GUY!                                                [[Amazed at thi5 amazing transformation? You too can]] HAVE A [[Communion]] WITH [[Unintelligble Laughter]]
+SoapAlpha.1=[Insert punchline here] boosts the base chance for normal warp removal to 50% from 33%, so now you can guarantee normal warp removal!
+SoapBeta.1=Do you have perm warp that induces constant nightmares foreboding eldritch horrors rending your flesh from your bones? Have you grown a cloaca? Well I have the solution for you!  For the low low price of your [[soul]] you can have a [[miniscule]] chance to lower your perm warp by 1 at the low low price of [[2 normal]]                                                           Warning: This product will cause you to develop 2 points of temp warp for every failed attempt to remove perm warp. Purchase now at [[hyperlink blocked]]!
+
+
+tc.research_name.TI_DeliciousKromer=[[Funky]] LITTLE [[Worm]]
+tc.research_text.TI_DeliciousKromer=THIS IS [One Purchase] YOU WILL [Regret] FOR THE REST OF YOUR LIFE!
+
+
 #Tiles

 #Items
@@ -38,6 +47,9 @@ item.ItemAlastorsWand.name=Alastor's First Wand
 item.ItemSanitySoapAlpha.name=Trosma Sláintíochta Soap
 item.ItemSanitySoapBeta.name=Alastor's Soap

+item.ItemBIGSHOT.name=[Hyperlink Blocked]
+
+

 itemGroup.Thaumic Insurgence=Thaumic Insurgence