Merge pull request #1702 from AllTheMods/update-1x

Updates
AllTheMods · Jul 30, 2023 · 41c93c1 · 41c93c1
2 parents 45c12e6 + 03e8726
commit 41c93c1
Show file tree

Hide file tree

Showing 10 changed files with 293 additions and 31 deletions.
diff --git a/changelogs/1.0.0.md b/changelogs/1.0.0.md
@@ -0,0 +1,222 @@
+## Release 1.0.0
+
+Due to significant changes in some of the mods the version has been increased,
+however this release should still be fully compatible with existing worlds from 0.4.34.
+
+There are several new mods, including ModernFix to significantly decrease startup time.
+This update also includes many quest updates and several bugfixes.
+
+### Mod Additions
+- ars_creo-1.18.2-2.2.0.jar
+- AutoRegLib-1.7-53.jar
+- DramaticDoors-Forge-1.18.2-2.3.1_2.jar
+- DynamicSurroundings-5.0.0.4.jar
+- effective_fg-1.2.4.jar
+- everythingcopper-1.18.2-0.1.1.0.jar
+- forgebrainlib-1.18.2-1.0.1.jar
+- fusion-1.0.5-forge-mc1.18.jar
+- integratednbt-1.18.2-1.5.1.jar
+- MaxHealthFix-Forge-1.18.2-5.0.4.jar
+- modernfix-forge-5.4.1+mc1.18.2.jar
+- modonomicon-1.18.2-1.33.1.jar
+- Morph-o-Tool-1.5-32.jar
+- PresenceFootsteps-1.18.2-1.5.1-forge.jar
+- SmartBrainLib-forge-1.18.2-1.9.jar
+- toofast-1.18-0.0.1.3.jar
+### Mod Updates
+- [1.18.2] SecurityCraft v1.9.7.jar
+- AdditionalEnchantedMiner-1.18.2-18.18.jar
+- additionallanterns-1.0.5-forge-mc1.18.jar
+- AdvancedPeripherals-1.18.2-0.7.30r.jar
+- AE2-Things-1.0.5.jar
+- Apotheosis-1.18.2-5.8.1.jar
+- Applied-Botanics-1.0.3.jar
+- appliedenergistics2-forge-11.7.4.jar
+- Aquaculture-1.18.2-2.3.12.jar
+- archers_paradox-1.18.2-3.2.0.12.jar
+- architectury-4.11.93-forge.jar
+- ars_nouveau-1.18.2-2.9.0.jar
+- artifacts-1.18.2-4.2.2.jar
+- balm-3.2.6.jar
+- BambooEverything-forge-1.3.8-build.45+mc1.18.2.jar
+- BetterAdvancements-1.18.2-0.2.0.146.jar
+- biggerreactors-1.18.2-0.6.0-beta.1.4.jar
+- blockui-1.18.2-0.0.71-ALPHA.jar
+- blueflame-1.18.2-0.1.0.2.jar
+- Bookshelf-Forge-1.18.2-13.3.56.jar
+- buildinggadgets-3.13.2-build.21+mc1.18.2.jar
+- cc-tweaked-1.18.2-1.101.3.jar
+- cfm-7.0.0-pre35-1.18.2.jar
+- chipped-forge-1.18.2-2.0.1.jar
+- Clumps-forge-1.18.2-8.0.0+17.jar
+- cofh_core-1.18.2-9.2.1.39.jar
+- colytra-forge-1.18.1-5.2.0.4.jar
+- comforts-forge-1.18.2-5.0.0.6.jar
+- CommonCapabilities-1.18.2-2.9.0.jar
+- configured-2.0.1-1.18.2.jar
+- connectedglass-1.1.7-forge-mc1.18.jar
+- constructionwand-1.18.2-2.9.jar
+- Controlling-forge-1.18.2-9.0+23.jar
+- cookingforblockheads-forge-1.18.2-12.2.0.jar
+- corail_woodcutter-1.18.2-2.3.9.jar
+- craftingtweaks-forge-1.18.2-14.0.7.jar
+- create-1.18.2-0.5.1.c.jar
+- create-confectionery1.18.2_v1.0.9.jar
+- createaddition-1.18.2-20230623a.jar
+- creativecrafter-1.18.2-1.0.jar
+- creeperoverhaul-1.3.1-forge.jar
+- Cucumber-1.18.2-5.1.4.jar
+- curios-forge-1.18.2-5.0.9.1.jar
+- CyclopsCore-1.18.2-1.17.5.jar
+- DarkModeEverywhere-1.18.2-1.1.3.jar
+- DarkPaintings-Forge-1.18.2-10.0.4.jar
+- DarkUtilities-Forge-1.18.2-10.1.7.jar
+- deepresonance-1.18-3.0.19.jar
+- defaultoptions-forge-1.18.2-14.1.2.jar
+- domum_ornamentum-1.18.2-1.0.77-ALPHA-universal.jar
+- dpanvil-1.18.2-3.4.2.jar
+- DungeonCrawl-1.18.2-2.3.14.jar
+- DungeonsArise-1.18.2-2.1.52-release.jar
+- eccentrictome-1.18.2-1.10.1.jar
+- elementalcraft-1.18.2-4.4.30b.jar
+- EnchantmentDescriptions-Forge-1.18.2-10.0.12.jar
+- enderchests-forge-1.18.2-1.9.11.jar
+- endertanks-forge-1.18.2-1.11.13.jar
+- engineersdecor-1.18.2-1.1.28.jar
+- ensorcellation-1.18.2-3.2.0.13.jar
+- entangled-1.3.14-forge-mc1.18.jar
+- entityculling-forge-1.6.1-mc1.18.2.jar
+- EvilCraft-1.18.2-1.2.19.jar
+- ExtraStorage-1.18.2-2.2.1.jar
+- extremesoundmuffler-3.30_forge-1.18.2.jar
+- FarmersDelight-1.18.2-1.2.2.jar
+- ferritecore-4.2.2-forge.jar
+- FluxNetworks-1.18.2-7.0.8.12.jar
+- forbidden_arcanus-1.18.2-2.1.2.jar
+- FramedBlocks-5.11.5.jar
+- ftb-chunks-forge-1802.3.17-build.265.jar
+- ftb-essentials-1802.2.2-build.83.jar
+- ftb-industrial-contraptions-1802.1.6-build.220.jar
+- ftb-library-forge-1802.3.11-build.177.jar
+- ftb-quests-forge-1802.3.14-build.191.jar
+- ftb-ranks-forge-1802.1.11-build.71.jar
+- ftb-teams-forge-1802.2.11-build.107.jar
+- ftb-ultimine-forge-1802.3.3-build.70.jar
+- functionalstorage-1.18.2-1.1.3.jar
+- geckolib-forge-1.18-3.0.57.jar
+- getittogetherdrops-forge-1.18.2-1.3.jar
+- hexcasting-forge-1.18.2-0.9.6.jar
+- HostileNeuralNetworks-1.18.2-3.3.0.jar
+- Iceberg-1.18.2-forge-1.0.49.jar
+- ImmersiveEngineering-1.18.2-8.4.0-161.jar
+- incontrol-1.18-6.1.10.jar
+- industrial-foregoing-1.18.2-3.3.1.6-10.jar
+- IntegratedCrafting-1.18.2-1.1.2.jar
+- IntegratedDynamics-1.18.2-1.13.7.jar
+- IntegratedTerminals-1.18.2-1.4.7.jar
+- IntegratedTunnels-1.18.2-1.8.18.jar
+- ironchests-2.0.5-forge.jar
+- ironfurnaces-1.18.2-3.3.3.jar
+- item-filters-forge-1802.2.8-build.50.jar
+- itemcollectors-1.1.8-forge-mc1.18.jar
+- jei-1.18.2-9.7.2.1001.jar
+- jmi-forge-1.18.2-0.13-43.jar
+- journeymap-1.18.2-5.9.7-forge.jar
+- JustEnoughProfessions-1.18.2-1.3.0.jar
+- Kiwi-1.18.2-forge-6.1.4.jar
+- kotlinforforge-3.12.0-all.jar
+- kubejs-create-forge-1802.2.4-build.5.jar
+- kubejs-forge-1802.5.5-build.554.jar
+- kubejs-thermal-1802.1.5-build.16.jar
+- laserio-1.4.5.jar
+- lazierae2-1.18.2-3.1.5.jar
+- LegendaryTooltips-1.18.2-1.3.1.jar
+- LightingWand-1.18.2-forge-4.1.2.jar
+- littlecontraptions-forge-1.18.2.2.jar
+- littlelogistics-mc1.18.2-v1.2.7.jar
+- logprot-1.18.2-1.7.jar
+- lootr-1.18.2-0.3.25.63.jar
+- lostcities-1.18-5.3.19.jar
+- mahoutsukai-1.18.2-v1.34.52.jar
+- Mantle-1.18.2-1.9.45.jar
+- mcjtylib-1.18-6.0.20.jar
+- mcw-bridges-2.1.0-mc1.18.2forge.jar
+- mcw-doors-1.0.9forge-mc1.18.2.jar
+- mcw-fences-1.0.7-mc1.18.2forge.jar
+- mcw-lights-1.0.6-mc1.18.2forge.jar
+- mcw-roofs-2.2.4-mc1.18.2forge.jar
+- mcw-trapdoors-1.1.1-mc1.18.2forge.jar
+- mcw-windows-2.1.1-mc1.18.2forge.jar
+- minecolonies-1.18.2-1.1.29-BETA.jar
+- mininggadgets-1.11.1.jar
+- mob_grinding_utils-1.18.2-0.4.50.jar
+- moreminecarts-1.4.7.jar
+- moreoverlays-1.20.11-mc1.18.2.jar
+- MysticalAgradditions-1.18.2-5.1.4.jar
+- MysticalAgriculture-1.18.2-5.1.5.jar
+- MythicBotany-1.18.2-2.1.14.jar
+- netherportalfix-forge-1.18.2-9.0.1.jar
+- nomowanderer-1.18.2_1.1.6.jar
+- occultism-1.18.2-1.81.4.jar
+- Oh_The_Biomes_You'll_Go-forge-1.18.2-1.4.7.jar
+- omgourd-1.18.2-3.2.0.11.jar
+- PackMenu-1.18.2-4.1.4.jar
+- parry-2.3.1.jar
+- phosphophyllite-1.18.2-0.6.0-beta.1.6.jar
+- Placebo-1.18.2-6.6.7.jar
+- platforms-forge-1.18.2-1.9.9.jar
+- pneumaticcraft-repressurized-1.18.2-3.6.0-19.jar
+- polymorph-forge-1.18.2-0.49.jar
+- ponderjs-1.18.2-1.1.9.jar
+- Powah-3.0.8.jar
+- productivebees-1.18.2-0.9.3.0.jar
+- pylons-1.18.2-2.2.0.jar
+- quartz-1.18.2-0.0.0-beta.1.4.jar
+- rechiseled-1.1.2-forge-mc1.18.jar
+- refinedstorage-1.10.5.jar
+- rftoolsbase-1.18-3.0.12.jar
+- rftoolsbuilder-1.18-4.1.3.jar
+- rftoolscontrol-1.18-5.0.10.jar
+- rftoolspower-1.18-4.0.9.jar
+- rftoolsstorage-1.18-3.0.12.jar
+- rftoolsutility-1.18-4.0.23.jar
+- RootsClassic-1.18.2-1.1.31.jar
+- rsgauges-1.18.2-1.2.18.jar
+- ScalableCatsForce-2.13.10-build-12-with-library.jar
+- shetiphiancore-forge-1.18.2-3.10.16.jar
+- silent-gear-1.18.2-2.10.17.jar
+- SimpleBackups-1.18.2-1.1.13.jar
+- simplemagnets-1.1.9-forge-mc1.18.jar
+- sophisticatedbackpacks-1.18.2-3.18.57.888.jar
+- sophisticatedcore-1.18.2-0.5.82.393.jar
+- sophisticatedstorage-1.18.2-0.8.38.572.jar
+- spark-1.10.38-forge.jar
+- supermartijn642configlib-1.1.7-forge-mc1.18.jar
+- supermartijn642corelib-1.1.12-forge-mc1.18.jar
+- supplementaries-1.18.2-1.5.18.jar
+- TConstruct-1.18.2-3.6.4.113.jar
+- thermal_cultivation-1.18.2-9.2.0.16.jar
+- thermal_expansion-1.18.2-9.2.0.20.jar
+- thermal_foundation-1.18.2-9.2.0.46.jar
+- thermal_innovation-1.18.2-9.2.0.17.jar
+- thermal_locomotion-1.18.2-9.2.0.13.jar
+- titanium-1.18.2-3.5.9-43.jar
+- tombstone-7.6.5-1.18.2.jar
+- toms_storage-1.18.2-1.4.4.jar
+- ToolBelt-1.18.2-1.18.9.jar
+- torchmaster-18.2.1.jar
+- trashcans-1.0.18-forge-mc1.18.jar
+- trashslot-forge-1.18.2-11.0.3.jar
+- twilightforest-1.18.2-4.1.1494-universal.jar
+- UtilitiX-1.18.2-0.4.8.jar
+- waystones-forge-1.18.2-10.2.1.jar
+- wirelesschargers-1.0.9-forge-mc1.18.jar
+- xnet-1.18-4.0.9.jar
+- YungsApi-1.18.2-Forge-2.2.9.jar
+### Mod Removals
+- flywheel-forge-1.18.2-0.6.5.jar
+
+### Other Changes
+- Update to Forge 40.2.10
+- Quest updates
+- Add tags for crimson iron and azure silver seeds (#1680)
diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
@@ -11,17 +11,17 @@
 [packversionmaj]
 	#Pack Release Version Format : X
 	#Range: 0 ~ 32768
-	major = 0
+	major = 1
 
 [packversionmin]
 	#Pack Minor Version : X
 	#Range: 0 ~ 32768
-	minor = 4
+	minor = 0
 
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 34
+	minorrev = 0
 
 [tweaks]
 	#Chickens randomly shed feathers

diff --git a/config/darkmodeeverywhere-client.toml b/config/darkmodeeverywhere-client.toml
@@ -0,0 +1,27 @@
+#A list of class:method strings (render methods) that the dark shader will not be applied to.
+#Each string consists of the class and the method (or any substring) to block the dark shader.
+#For example, 'renderHunger' is sufficient to block 'net.minecraftforge.client.gui.overlay.ForgeGui:renderFood' (either will work).
+METHOD_SHADER_BLACKLIST = ["mezz.jei.common.render.FluidTankRenderer:drawTextureWithMasking", "mezz.jei.library.render.FluidTankRenderer:drawTextureWithMasking", "renderCrosshair", "m_93080_", "net.minecraft.client.gui.screens.TitleScreen", "renderSky", "m_202423_", "renderHotbar", "m_93009_", "m_193837_", "setupOverlayRenderState", "net.minecraftforge.client.gui.overlay.ForgeGui", "renderFood", "squeek.appleskin.client.HUDOverlayHandler", "renderExperienceBar", "m_93071_", "configured.client.screen.ListMenuScreen", "OnlineServerEntry:drawIcon", "OnlineServerEntry:m_99889_", "WorldSelectionList$WorldListEntry:render", "WorldSelectionList$WorldListEntry:m_6311_", "CubeMap:render", "CubeMap:m_108849_", "squeek.appleskin.client.HUDOverlayHandler", "shadows.packmenu.ExtendedMenuScreen"]
+#Enabling this config will (every 5 seconds) dump which methods were used to render GUIs that the dark shader was applied to
+#The dump will consist of a list of class:method strings, e.g. 'net.minecraftforge.client.gui.overlay.ForgeGui:renderFood'
+#Use this feature to help find the render method strings of GUIs you would like to blacklist.
+METHOD_SHADER_DUMP = false
+
+["Main Menu Button"]
+	#Enabled
+	SHOW = true
+	#Pixels away from the left of the GUI in the x axis
+	#Range: > 0
+	MAIN_X = 4
+	#Pixels away from the bottom of the GUI in the y axis
+	#Range: > 0
+	MAIN_Y = 60
+
+["Inventory Button"]
+	#Pixels away from the left of the GUI in the x axis
+	#Range: > 0
+	X = 32
+	#Pixels away from the bottom of the GUI in the y axis
+	#Range: > 0
+	Y = 2
+
diff --git a/config/jeresources-common.toml b/config/jeresources-common.toml
@@ -0,0 +1 @@
+enchantsBlacklist = ["flimflam", "soulBound", "ars_nouveau:reactive"]
diff --git a/config/jeresources.toml b/config/jeresources.toml
@@ -0,0 +1 @@
+enchantsBlacklist = ["flimflam", "soulBound", "ars_nouveau:reactive"]
diff --git a/...enetworks/data_models/thermal_basalz.json → ...enetworks/data_models/thermal/basalz.json b/...enetworks/data_models/thermal_basalz.json → ...enetworks/data_models/thermal/basalz.json
@@ -1,23 +1,23 @@
-{
-	"type": "thermal:basalz",
-	"name": "entity.thermal.basalz",
-	"name_color": "0xE8E8E8",
-	"gui_scale": 1,
-	"gui_x_offset": 0,
-	"gui_y_offset": 0,
-	"gui_z_offset": 0,
-	"sim_cost": 128,
-	"input": {
-		"item": "hostilenetworks:empty_prediction"
-	},
-	"base_drop": {
-		"item": "hostilenetworks:nether_prediction"
-	},
-	"trivia": "",
-	"fabricator_drops": [
-		{
-			"item": "thermal:basalz_rod",
-			"count": 4
-		}
-	]
-}
+{
+	"type": "thermal:basalz",
+	"name": "entity.thermal.basalz",
+	"name_color": "0xE8E8E8",
+	"gui_scale": 1,
+	"gui_x_offset": 0,
+	"gui_y_offset": 0,
+	"gui_z_offset": 0,
+	"sim_cost": 128,
+	"input": {
+		"item": "hostilenetworks:empty_prediction"
+	},
+	"base_drop": {
+		"item": "hostilenetworks:nether_prediction"
+	},
+	"trivia": "",
+	"fabricator_drops": [
+		{
+			"item": "thermal:basalz_rod",
+			"count": 4
+		}
+	]
+}
diff --git a/...lenetworks/data_models/thermal_blitz.json → ...lenetworks/data_models/thermal/blitz.json b/...lenetworks/data_models/thermal_blitz.json → ...lenetworks/data_models/thermal/blitz.json
diff --git a/...lenetworks/data_models/thermal_blizz.json → ...lenetworks/data_models/thermal/blizz.json b/...lenetworks/data_models/thermal_blizz.json → ...lenetworks/data_models/thermal/blizz.json
diff --git a/kubejs/server_scripts/constants.js b/kubejs/server_scripts/constants.js
@@ -13,6 +13,7 @@ let ftbicMetals = ['tin', 'lead', 'uranium', 'iridium', 'aluminum']
 let ftbicAlloys = ['enderium', 'bronze']
 let thermalMetals = ['tin', 'lead', 'silver', 'nickel']
 let thermalAlloys = ['bronze', 'electrum', 'invar', 'constantan', 'signalum', 'lumium', 'enderium']
+let minecoloniesJobs = ['baker', 'blacksmith', 'cook', 'dyer', 'farmer', 'fletcher', 'glassblower', 'mechanic', 'plantation', 'sawmill', 'stonemason', 'stonesmeltery']
 
 let modifyShaped = (e, result, count, pattern, ingredients) => {
   e.remove({ output: result, type: 'minecraft:crafting_shaped' })

diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js
@@ -22,7 +22,7 @@ onEvent('tags.items', e => {
 
   e.add('forge:ores/quartz', ['byg:blue_nether_quartz_ore', 'byg:brimstone_nether_quartz_ore'])
   e.add('forge:ores/gold', ['byg:blue_nether_gold_ore', 'byg:brimstone_nether_gold_ore'])
-  e.add('forge:ores/inferium',['mysticalagradditions:nether_inferium_ore','mysticalagradditions:end_inferium_ore'])
+  e.add('forge:ores/inferium', ['mysticalagradditions:nether_inferium_ore', 'mysticalagradditions:end_inferium_ore'])
 
   e.add('forge:storage_blocks/raw_crimson_iron', 'silentgear:raw_crimson_iron_block');
   e.add('forge:raw_ores/crimson_iron', 'silentgear:raw_crimson_iron');
@@ -45,16 +45,24 @@ onEvent('tags.items', e => {
   e.add('forge:raw_ores/iridium', 'ftbic:iridium_chunk');
   e.remove('forge:silicon', 'ftbic:silicon')
 
-  e.add('forge:melons','minecraft:melon_slice')
-  e.add('forbidden_arcanus:modifier/eternal_incompatible',[
-    '#alltheores:ore_hammers','@ftbic','#tconstruct:modifiable',
-    'minecraft:nether_star','mythicbotany:faded_nether_star',
+  e.add('forge:melons', 'minecraft:melon_slice')
+  e.add('forbidden_arcanus:modifier/eternal_incompatible', [
+    '#alltheores:ore_hammers', '@ftbic', '#tconstruct:modifiable',
+    'minecraft:nether_star', 'mythicbotany:faded_nether_star',
     'bloodmagic:sanguinereverter', 'elementalcraft:receptacle', 'elementalcraft:receptacle_empty',
     'elementalcraft:receptacle_improved', 'elementalcraft:receptacle_improved_empty'
   ])
 
   e.add('forge:cheese',['croptopia:cheese','thermal:cheese_wedge']);
 
+  e.add('mysticalagriculture:seeds', [
+    'mysticalagriculture:azure_silver_seeds',
+    'mysticalagriculture:crimson_iron_seeds',
+    'mysticalagriculture:allthemodium_seeds',
+    'mysticalagriculture:vibranium_seeds',
+    'mysticalagriculture:unobtainium_seeds',
+  ])
+
   // fix raw block crafting for other mods
   e.add('forge:raw_ores/zinc', 'create:raw_zinc')
   mekanismMetals.forEach(metal => e.add(`forge:raw_ores/${metal}`, `mekanism:raw_${metal}`))
@@ -71,6 +79,8 @@ onEvent('tags.items', e => {
   e.add('minecraft:logs', ['integrateddynamics:menril_log_stripped', 'integrateddynamics:menril_wood_stripped', 'evilcraft:undead_log_stripped', 'evilcraft:undead_wood_stripped', /allthemodium:stripped_\w+_log/, 'hexerei:stripped_willow_log', /hexerei:stripped_\w+_wood/])
   e.add('forge:stripped_logs', [/hexerei:stripped_\w+_log/, 'evilcraft:undead_log_stripped', /allthemodium:stripped_\w+_log/])
   e.add('forge:stripped_wood', [/hexerei:stripped_\w+_wood/, 'evilcraft:undead_wood_stripped'])
+
+  minecoloniesJobs.forEach(job => e.add(`minecolonies:${job}_ingredient_excluded`, 'integrateddynamics:facade'));
 })
 
 onEvent('tags.entity_types', e => {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		enchantsBlacklist = ["flimflam", "soulBound", "ars_nouveau:reactive"]