Skip to content

Commit

Permalink
Update with changes for v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tungstonminer committed Sep 27, 2021
1 parent d53ac3f commit f6a28d3
Show file tree
Hide file tree
Showing 17 changed files with 143 additions and 17 deletions.
2 changes: 1 addition & 1 deletion config/EnderStorage.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ item.storage-size=1


#The name of the item used to set the chest to personal. Diamond by default
personalItemID=diamond
personalItemID=lotr:item.diamond
2 changes: 1 addition & 1 deletion config/InvTweaks.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Inventory Tweaks Configuration
#(Regarding shortcuts, all key names can be found at: http://www.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
#Fri Sep 24 18:42:37 MDT 2021
#Mon Sep 27 09:50:44 MDT 2021
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
1 change: 1 addition & 0 deletions config/InvTweaksTree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<stuff treeVersion="1.7.0">
<pouches>
<enderPouch id="EnderStorage:enderPouch"/>
<lensPouch id="ThaumicHorizons:lensCase"/>
<focusPouch id="Thaumcraft:FocusPouch"/>
<bottomlessPouch id="ThaumicTinkerer:ichorPouch"/>
<largePouch id="lotr:item.pouch" damage="2"/>
Expand Down
2 changes: 1 addition & 1 deletion config/MobProperties.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

_general {
# If this is true, an empty properties file will be generated for every registered entity id.
B:auto_generate_files=true
B:auto_generate_files=false

# If this is true, all attributes previously added by this mod will be removed from any mobs loaded and this mod will do nothing. Set this to true before (or, preferrably, instead of) uninstalling this mod if you want to undo any attribute changes!
B:disable=false
Expand Down
6 changes: 6 additions & 0 deletions config/MobProperties/gadomancy/FakePlayerEntity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"_name": "gadomancy.FakePlayerEntity",
"drops": [],
"pre_stats": [],
"stats": []
}
2 changes: 1 addition & 1 deletion config/MouseTweaks.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Sep 24 20:11:11 MDT 2021
#Mon Sep 27 10:22:25 MDT 2021
WheelTweak=1
LMBTweakWithoutItem=1
WheelSearchOrder=1
Expand Down
2 changes: 1 addition & 1 deletion config/Thaumcraft.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ general {
I:golem_link_quality=16

# Negative nodes like hungry, tainted or dark nodes will have additional, much nastier, effects.
B:hard_mode_nodes=false
B:hard_mode_nodes=true

# How rare nodes are in the world. The number means there will be (on average) one node per N chunks.
I:node_rarity=36
Expand Down
2 changes: 1 addition & 1 deletion config/fastcraft.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; FastCraft config
; created Sep 24, 2021 6:42:18 PM
; created Sep 27, 2021 8:57:28 AM
;---

; Settings which have some effect on gameplay or visuals.
Expand Down
76 changes: 76 additions & 0 deletions config/gadomancy.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Configuration file

dimension {
# TRUE = Calculating Light values for the Gadomancy-Eldritch Mazes; FALSE = No calculation, but some Light Bugs - Calculating the Light takes ~2 seconds -> Can be measured when trying to enter the eldritch mazed via Gadomancy Eldritch portal. [default: true]
B:calculateEldritchLight=true

# Dimension Id for the eldrich mazes accessed via Node Manipulator [range: -2147483648 ~ 2147483647, default: -73]
I:dimOuterId=-73

# Defines how many Eldritch mazes may exist at the same time using the Gadomancy Eldritch ritual. (-1 = infinite) Note that 1 maze = 1 player; Once the player finishes the maze, the maze closes itself and teleports the player out. [range: -1 ~ 2147483647, default: -1]
I:maxMazeCount=-1
}


##########################################################################################################
# enchantments
#--------------------------------------------------------------------------------------------------------#
# Use the following if you have problems with conflicting enchantment ids. If the entry is set to '-1' it will try to automatically find the lowest free enchantment id.
##########################################################################################################

enchantments {
I:EnchantmentRevealer=-1
}


entities {
# Do not edit unless you know what are you doing! - Datawatcher ID of the Auracore's current aspects [range: 0 ~ 31, default: 21]
I:auraCoreDatawatcherAuraId=21

# Do not edit unless you know what are you doing! - Datawatcher ID of the Fixed-Coordinates for EntityNoClipItem [range: 0 ~ 31, default: 20]
I:itemNoClipDatawatcherFixId=20

# Do not edit unless you know what are you doing! - Datawatcher ID of the Master-Coordinates for EntityNoClipItem [range: 0 ~ 31, default: 19]
I:itemNoClipDatawatcherMasterId=19
}


general {
# Write a list of aspects (e.g. aura,aer) here that should not be active/obtainable with the aura pylon. Multiple aspects can be seperated with ','. Leave it empty to blacklist nothing [default: ]
S:auraPylonBlacklist=

# Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy. [default: true]
B:enableAdditionalNodeTypes=true

# Defines, how close a player has to be towards the particle origin to see the particles created by it. [range: 5 ~ 1000, default: 100]
I:particleRenderDistance=100
}


golem {
# Do not edit unless you know what are you doing! [range: 0 ~ 31, default: 29]
I:datawatcherId=29
}


##########################################################################################################
# potions
#--------------------------------------------------------------------------------------------------------#
# Use the following if you have problems with conflicting potion ids. If the entry is set to '-1' it will try to automatically find the lowest free potion id.
##########################################################################################################

potions {
I:PotionAchromatic=-1
I:PotionBuffGolem=-1
I:PotionEldritch=-1
I:PotionMiningLuck=-1
I:PotionVisAffinity=-1
}


skyblock {
# TRUE = Adds recipes for Ancient Stone and Ancient Stone Pedestal (This may be usefull for severs and skyblock packs to craft the Node Manipulator and get more primodial pearls). You have to change this client- and server-side! [default: false]
B:ancientStoneRecipes=false
}


12 changes: 5 additions & 7 deletions config/lotr.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ gameplay {
B:"Enable Invasions"=true

# Enable or disable the buildable Middle-earth portals (excluding the Ring Portal). If disabled, portals can still be made, but will not function
B:"Enable Middle-earth Portals"=true
B:"Enable Middle-earth Portals"=false
B:"Enable Orc Skirmishes"=true

# Mainly intended for servers. Disable the vanilla potion brewing system, as it is not 'lore-friendly'
Expand Down Expand Up @@ -105,10 +105,10 @@ gameplay {
B:"Middle-earth Respawning: Enable"=true

# Maximum possible range to place the player from their death point
I:"Middle-earth Respawning: Max Respawn Range"=1500
I:"Middle-earth Respawning: Max Respawn Range"=500

# Minimum possible range to place the player from their death point
I:"Middle-earth Respawning: Min Respawn Range"=500
I:"Middle-earth Respawning: Min Respawn Range"=200

# Threshold distance from spawn for applying Middle-earth respawning when the player's spawn point is the world spawn (no bed)
I:"Middle-earth Respawning: World Threshold"=2000
Expand All @@ -117,7 +117,7 @@ gameplay {
B:"Mutton Drops"=true

# Allow NPCs to generate mini-quests to kill enemy players
B:"NPCs give bounty mini-quests"=true
B:"NPCs give bounty mini-quests"=false
B:"NPCs give mini-quests"=true

# Prevent transport of structure-bound traders beyond this distance outside their initial home range (0 = disabled)
Expand Down Expand Up @@ -187,7 +187,7 @@ gui {

misc {
# Disable this if you will be playing offline
B:"Check for updates"=true
B:"Check for updates"=false
B:"Custom Waypoint logging"=false

# Display the name of a LOTR music track when it begins playing
Expand Down Expand Up @@ -229,5 +229,3 @@ misc {
# Structure timelapse interval (in ms) between each block placement
I:"Structure Timelapse Interval"=5
}


4 changes: 2 additions & 2 deletions config/mett.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ general {
B:AvailableEasyRecipeOfCrafter=false

# Disable to remove Compressed Jars
B:AvilableCompressedJars=true
B:AvilableCompressedJars=false

# Disable to remove Extralarge Jars
B:AvilableExtralargeJars=true
B:AvilableExtralargeJars=false

# Set true to be able to craft lotr recipes without alignment on handheldcrafter
B:CheatingFactionRecie=false
Expand Down
2 changes: 1 addition & 1 deletion config/splash.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Splash screen properties
#Fri Sep 24 18:42:19 MDT 2021
#Mon Sep 27 08:57:30 MDT 2021
logoTexture=textures/gui/title/mojang.png
background=0xFFFFFF
font=0x0
Expand Down
Binary file added mods/gadomancy-1.7.10-1.0.7.3.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion scripts/50_lotr.zs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ dale.addShaped(<lotr:item.dalishPastry>, [
# Corn -- allow HarvestCraft corn to be converted
recipes.addShapeless(<lotr:item.corn>, [<harvestcraft:cornItem>]);

# Diamond Horse Armor -- allow vanilla armor to be converted
# Horse Armor -- allow vanilla armor to be converted
recipes.addShapeless(<lotr:item.horseArmorDiamond>, [<minecraft:diamond_horse_armor>]);
recipes.addShapeless(<lotr:item.horseArmorGold>, [<minecraft:golden_horse_armor>]);
recipes.addShapeless(<lotr:item.horseArmorIron>, [<minecraft:iron_horse_armor>]);

# Hobbit Pancake -- use a HarvestCraft-friendly recipe
hobbits.removeShapeless(<lotr:item.hobbitPancake>, null, true);
Expand Down
17 changes: 17 additions & 0 deletions scripts/50_thaumcraft.zs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import mods.thaumcraft.Arcane;
import mods.thaumcraft.Crucible;
import mods.thaumcraft.Infusion;


Expand Down Expand Up @@ -36,6 +37,22 @@ Infusion.addRecipe(
5
);

# Nether Shard -- allow creating Nether Shards in the crucible
Crucible.addRecipe("CRUCIBLE", <minecraft:ghast_tear>, <lotr:item.mithrilNugget>, "aqua 4, spiritus 4");

# Obsidian Totem -- allow creating obsidian totems using LOTR materials
Infusion.addRecipe(
"INFUSION",
<minecraft:obsidian>,
[
<lotr:item.naurite>, <lotr:item.naurite>,
<lotr:item.naurite>, <lotr:item.naurite>,
],
"spiritus 12",
<Thaumcraft:blockCosmeticSolid:0>,
3
);

# Runic Matrix -- use edhelvir instead of ender pearl
Arcane.removeRecipe(<Thaumcraft:blockStoneDevice:2>);
Arcane.addShaped("INFUSION", <Thaumcraft:blockStoneDevice:2>, "ordo 40", [
Expand Down
22 changes: 22 additions & 0 deletions scripts/50_thaumictinkerer.zs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import mods.thaumcraft.Crucible;
import mods.thaumcraft.Infusion;
import mods.thaumcraft.Research;


########################################################################################################################

Research.orphanResearch("ICHORCLOTH_CHEST_GEM");

Research.removeResearch("ICHORCLOTH_BOOTS_GEM");
Research.removeResearch("ICHORCLOTH_CHEST_GEM");
Research.removeResearch("ICHORCLOTH_HELM_GEM");
Research.removeResearch("ICHORCLOTH_LEGS_GEM");

Research.addPrereq("WARP_GATE", "ICHOR", false);
Research.addPrereq("WARP_GATE", "DISLOCATOR", true);


########################################################################################################################

Crucible.addRecipe("DIMENSION_SHARDS", <ThaumicTinkerer:kamiResource:6>, <lotr:item.naurite>, "alienis 2");
Crucible.addRecipe("DIMENSION_SHARDS", <ThaumicTinkerer:kamiResource:7>, <lotr:item.guldurilCrystal>, "alienis 2");
4 changes: 4 additions & 0 deletions scripts/50_vanilla.zs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ recipes.addShapeless(<minecraft:cake>, [
<ore:toolBakeware>, <ore:foodDough>, <ore:listAllmilk>, <ore:listAllsugar>, <ore:dyeRed>
]);

# Diamond -- allow LOTR diamonds to be converted and vice-versa
recipes.addShapeless(<minecraft:diamond>, [<lotr:item.diamond>]);
recipes.addShapeless(<lotr:item.diamond>, [<minecraft:diamond>]);

# Ender Pearl -- allow creating ender pearls using LOTR materials
Infusion.addRecipe(
"INFUSION",
Expand Down

0 comments on commit f6a28d3

Please sign in to comment.