Skip to content

Commit

Permalink
Remove Disjunction Cloth
Browse files Browse the repository at this point in the history
A similar item is already added by Thaumic Tinkerer
  • Loading branch information
IcarussOne committed Aug 13, 2024
1 parent 015b8cb commit 3a280a3
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 210 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.jvmargs = -Xmx3G
mod_id = thaumicwonders
mod_version = 1.8.4
maven_group = com.verdantartifice.thaumicwonders
archives_base_name = Thaumic-Wonders
archives_base_name = Thaumic-Wonders-1.12.2

# If any properties changes below this line, run `gradlew setupDecompWorkspace` and refresh gradle again to ensure everything is working correctly.

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.verdantartifice.thaumicwonders.common.items.consumables.ItemLetheWater;
import com.verdantartifice.thaumicwonders.common.items.consumables.ItemPanacea;
import com.verdantartifice.thaumicwonders.common.items.entities.ItemFlyingCarpet;
import com.verdantartifice.thaumicwonders.common.items.misc.ItemDisjunctionCloth;
import com.verdantartifice.thaumicwonders.common.items.misc.ItemStructureDiviner;
import com.verdantartifice.thaumicwonders.common.items.misc.ItemTimewinder;
import com.verdantartifice.thaumicwonders.common.items.plants.ItemCinderpearlSeed;
Expand All @@ -31,7 +30,6 @@ public class InitItems {
public static final Set<IVariantItem> ITEM_VARIANT_HOLDERS = new HashSet<IVariantItem>();

public static void initItems(IForgeRegistry<Item> forgeRegistry) {
registerItem(forgeRegistry, new ItemDisjunctionCloth());
registerItem(forgeRegistry, new ItemPrimalDestroyer());
registerItem(forgeRegistry, new ItemFlyingCarpet());
registerItem(forgeRegistry, new ItemTimewinder());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import com.verdantartifice.thaumicwonders.ThaumicWonders;
import com.verdantartifice.thaumicwonders.common.blocks.BlocksTW;
import com.verdantartifice.thaumicwonders.common.crafting.recipes.RecipeDisjunctionClothUse;
import com.verdantartifice.thaumicwonders.common.crafting.recipes.RecipeFlyingCarpetDyes;
import com.verdantartifice.thaumicwonders.common.fluids.FluidQuicksilver;
import com.verdantartifice.thaumicwonders.common.items.ItemsTW;
Expand Down Expand Up @@ -193,7 +192,6 @@ private static void initCoalescencePlatform() {
}

private static void initNormalRecipes(IForgeRegistry<IRecipe> forgeRegistry) {
forgeRegistry.register(new RecipeDisjunctionClothUse());
forgeRegistry.register(new RecipeFlyingCarpetDyes());

ResourceLocation qsGroup = new ResourceLocation(ThaumicWonders.MODID, "quicksilver_bucket_group");
Expand Down Expand Up @@ -364,12 +362,6 @@ private static void initCrucibleRecipes() {
new ItemStack(Items.ENDER_PEARL),
new AspectList().add(Aspect.MOTION, 15).add(Aspect.ELDRITCH, 10)
));
ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "disjunction_cloth"), new CrucibleRecipe(
"TWOND_DISJUNCTION_CLOTH",
new ItemStack(ItemsTW.DISJUNCTION_CLOTH),
new ItemStack(ItemsTC.fabric),
new AspectList().add(Aspect.MAGIC, 40).add(Aspect.VOID, 40).add(Aspect.AURA, 20)
));
ThaumcraftApi.addCrucibleRecipe(new ResourceLocation(ThaumicWonders.MODID, "alchemist_stone"), new CrucibleRecipe(
"TWOND_CATALYZATION_CHAMBER",
new ItemStack(ItemsTW.ALCHEMIST_STONE),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

@GameRegistry.ObjectHolder(ThaumicWonders.MODID)
public class ItemsTW {
public static final Item DISJUNCTION_CLOTH = null;
public static final ItemSword PRIMAL_DESTROYER = null;
public static final Item FLYING_CARPET = null;
public static final Item TIMEWINDER = null;
Expand Down

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/resources/assets/thaumicwonders/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ tile.thaumicwonders.cinderpearl_crop.name=Cinderpearl
tile.thaumicwonders.vishroom_crop.name=Vishroom

// Items
item.thaumicwonders.disjunction_cloth.name=Disjunction Cloth
item.thaumicwonders.primal_destroyer.name=Primal Destroyer
item.thaumicwonders.flying_carpet.name=Flying Carpet
item.thaumicwonders.timewinder.name=Timewinder
Expand Down Expand Up @@ -99,10 +98,6 @@ thaumicwonders.research.everburning_urn.title=Everburning Urn
thaumicwonders.research.everburning_urn.text.stage.1=The Everfull Urn is an incredibly useful device, but I'm convinced that I can do better. Something similar, but for other types of fluids. Fluids like, say... lava?
thaumicwonders.research.everburning_urn.text.stage.2=By infusing the Everfull Urn with a series of microscopic portals to the Nether, I'm able to siphon all the lava that I could ever need. The process is not perfect, however.<BR>For one thing, it's slow. Whereas its watery brethren fills up in moments, this device, which I've dubbed the Everburning Urn, takes about a minute to generate a single bucket.<BR>The process is much more draining to the aura, as well. My calculations indicate that maintaining the portal mesh consumes about 25 points of vis from the aura.<BR>Finally, for safety's sake, I've disabled the urn's ability to automatically fill nearby vessels. Can't have liquid hot magma just flying around the place.

thaumicwonders.research.disjunction_cloth.title=Disjunction Cloth
thaumicwonders.research.disjunction_cloth.text.stage.1=Augh! This enchantment table is so incredibly frustrating at times. It's so... random! And then when I don't get what I want, I have to craft a new item from scratch! There has to be a better way to do this.<BR>I believe that alchemy may hold the solution to this problem. I just need something to soak up the magical energy bound to these enchanted items. Of course, I'll need an enchanted item to test on. It doesn't need to be anything too advanced, a simple Protection enchantment should serve my needs nicely.
thaumicwonders.research.disjunction_cloth.text.stage.2=My research has borne fruit! It may not solve the problem of randomized enchantment, but this new Disjunction Cloth will get rid of any unwanted enchantments beautifully.<BR>As a bonus, it doesn't just soak up enchantment energy, it unbinds it! The unbound energy is then dispersed into the aura as vis. My calculations indicate that the cloth will release 5 points of vis into the aura for every level of enchantment that it unbinds.

thaumicwonders.research.dimensional_ripper.title=Dimensional Ripper
thaumicwonders.research.dimensional_ripper.text.stage.1=I can't believe I'm seriously considering this, but...<BR>If I'm going to continue to study these flux rifts, I'll need better tools. Right now, I just dump a bunch of flux into the aura and hope a rift forms somewhere nearby. That's far too haphazard.<BR>I need something more precise, more controlled.<BR>Less costly would be nice, too.
thaumicwonders.research.dimensional_ripper.text.stage.2=I do believe I've outdone myself. By channeling the destructive power of an Arcane Bore through a Primordial Pearl, I'm able to breach the walls of reality itself!<BR>A single Dimensional Ripper isn't enough, however, nor could it ever be. The energies required would be completely infeasible. Rather, a pair of the devices must be used. By placing them precisely ten blocks apart and facing each other, the machines can resonate together, amplifying their power enough to serve my needs. When so placed, small amounts of energy will flit between them, confirming that they are connected.<BR>Each of the two devices must be fueled with at least fifty Vitium essentia to reach critical mass. Applying a redstone signal to either ripper will disable the pair and prevent any reaction from taking place. Rippers disabled in this way can be fed additional essentia, beyond the minimum of fifty, to result in a larger rift once they're finally activated.<BR>If a rift already exists at the target point, the rippers will enlarge it when activated. This is subject to diminishing returns, however, and the process will significantly destabilize the rift.<BR>Finally, as a safety measure, the Rippers will not activate if they sense another rift already open nearby, but not at the target point. The veil between us and the void can only take so much tampering before it fails completely, and I'm not *that* crazy.
Expand Down
5 changes: 0 additions & 5 deletions src/main/resources/assets/thaumicwonders/lang/ru_ru.lang
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ tile.thaumicwonders.cinderpearl_crop.name=Тлеющая Жемчужина
tile.thaumicwonders.vishroom_crop.name=Висомор

// Items
item.thaumicwonders.disjunction_cloth.name=Ткань Дизъюнкции
item.thaumicwonders.primal_destroyer.name=Первобытный Разрушитель
item.thaumicwonders.flying_carpet.name=Летающий Ковер
item.thaumicwonders.timewinder.name=Маховик Времени
Expand Down Expand Up @@ -101,10 +100,6 @@ thaumicwonders.research.everburning_urn.title=Вечнопылающая Урн
thaumicwonders.research.everburning_urn.text.stage.1=The Everfull Urn is an incredibly useful device, but I'm convinced that I can do better. Something similar, but for other types of fluids. Fluids like, say... lava?
thaumicwonders.research.everburning_urn.text.stage.2=By infusing the Everfull Urn with a series of microscopic portals to the Nether, I'm able to siphon all the lava that I could ever need. The process is not perfect, however.<BR>For one thing, it's slow. Whereas its watery brethren fills up in moments, this device, which I've dubbed the Everburning Urn, takes about a minute to generate a single bucket.<BR>The process is much more draining to the aura, as well. My calculations indicate that maintaining the portal mesh consumes about 25 points of vis from the aura.<BR>Finally, for safety's sake, I've disabled the urn's ability to automatically fill nearby vessels. Can't have liquid hot magma just flying around the place.

thaumicwonders.research.disjunction_cloth.title=Ткань Дизъюнкции
thaumicwonders.research.disjunction_cloth.text.stage.1=Augh! This enchantment table is so incredibly frustrating at times. It's so... random! And then when I don't get what I want, I have to craft a new item from scratch! There has to be a better way to do this.<BR>I believe that alchemy may hold the solution to this problem. I just need something to soak up the magical energy bound to these enchanted items. Of course, I'll need an enchanted item to test on. It doesn't need to be anything too advanced, a simple Protection enchantment should serve my needs nicely.
thaumicwonders.research.disjunction_cloth.text.stage.2=My research has borne fruit! It may not solve the problem of randomized enchantment, but this new Ткань Дизъюнкции will get rid of any unwanted enchantments beautifully.<BR>As a bonus, it doesn't just soak up enchantment energy, it unbinds it! The unbound energy is then dispersed into the aura as vis. My calculations indicate that the cloth will release 5 points of vis into the aura for every level of enchantment that it unbinds.

thaumicwonders.research.dimensional_ripper.title=Пространственный Потрошитель
thaumicwonders.research.dimensional_ripper.text.stage.1=I can't believe I'm seriously considering this, but...<BR>If I'm going to continue to study these flux rifts, I'll need better tools. Right now, I just dump a bunch of flux into the aura and hope a rift forms somewhere nearby. That's far too haphazard.<BR>I need something more precise, more controlled.<BR>Less costly would be nice, too.
thaumicwonders.research.dimensional_ripper.text.stage.2=I do believe I've outdone myself. By channeling the destructive power of an Arcane Bore through a Primordial Pearl, I'm able to breach the walls of reality itself!<BR>A single Dimensional Ripper isn't enough, however, nor could it ever be. The energies required would be completely infeasible. Rather, a pair of the devices must be used. By placing them precisely ten blocks apart and facing each other, the machines can resonate together, amplifying their power enough to serve my needs. When so placed, small amounts of energy will flit between them, confirming that they are connected.<BR>Each of the two devices must be fueled with at least fifty Vitium essentia to reach critical mass. Applying a redstone signal to either ripper will disable the pair and prevent any reaction from taking place. Rippers disabled in this way can be fed additional essentia, beyond the minimum of fifty, to result in a larger rift once they're finally activated.<BR>If a rift already exists at the target point, the rippers will enlarge it when activated. This is subject to diminishing returns, however, and the process will significantly destabilize the rift.<BR>Finally, as a safety measure, the Rippers will not activate if they sense another rift already open nearby, but not at the target point. The veil between us and the void can only take so much tampering before it fails completely, and I'm not *that* crazy.
Expand Down

This file was deleted.

29 changes: 1 addition & 28 deletions src/main/resources/assets/thaumicwonders/research/alchemy.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,33 +56,6 @@
],
"addenda": []
},
{
"key": "TWOND_DISJUNCTION_CLOTH",
"name": "thaumicwonders.research.disjunction_cloth.title",
"icons": ["thaumicwonders:disjunction_cloth"],
"category": "THAUMIC_WONDERS",
"parents": ["TWOND_BASE"],
"siblings": [],
"meta": [],
"location": [2, 0],
"reward_item": [],
"reward_knowledge": [],
"stages": [
{
"text": "thaumicwonders.research.disjunction_cloth.text.stage.1",
"required_knowledge": ["THEORY;ALCHEMY;1","THEORY;AUROMANCY;1"],
"required_research":["!auram"],
"required_item": ["thaumcraft:enchanted_placeholder;1;0;{ench:[{id:0s,lvl:1s}]}"]
},
{
"text": "thaumicwonders.research.disjunction_cloth.text.stage.2",
"recipes": [
"thaumicwonders:disjunction_cloth"
]
}
],
"addenda": []
},
{
"key": "TWOND_CATALYZATION_CHAMBER",
"name": "thaumicwonders.research.catalyzation_chamber.title",
Expand Down Expand Up @@ -210,7 +183,7 @@
"name": "thaumicwonders.research.lethe_water.title",
"icons": ["thaumicwonders:lethe_water"],
"category": "THAUMIC_WONDERS",
"parents": ["TWOND_DISJUNCTION_CLOTH"],
"parents": ["TWOND_BASE"],
"siblings": [],
"meta": [],
"location": [4, 0],
Expand Down
Binary file not shown.

0 comments on commit 3a280a3

Please sign in to comment.