Merge pull request #3 from M0nkeyPr0grammer/v2.1.0

V2.1.0

config/all_the_fan_made_discs.toml

@@ -0,0 +1,3 @@
+[stuff]
+Max_Y = -44
+Min_Y = -56

config/endermanoverhaul-client.jsonc

@@ -0,0 +1,3 @@
+{
+    "replaceDefaultEnderman": true
+}

config/endermanoverhaul.jsonc

@@ -0,0 +1,21 @@
+{
+    "allowSpawning": true,
+    "spawnBadlandsEnderman": true,
+    "spawnCaveEnderman": true,
+    "spawnCrimsonForestEnderman": true,
+    "spawnDarkOakEnderman": true,
+    "spawnDesertEnderman": true,
+    "spawnEndEnderman": true,
+    "spawnEndIslandsEnderman": true,
+    "spawnFlowerFieldsEnderman": true,
+    "spawnIceSpikesEnderman": true,
+    "spawnMushroomFieldsEnderman": true,
+    "spawnNetherWastesEnderman": true,
+    "spawnOceanEnderman": true,
+    "spawnSavannaEnderman": true,
+    "spawnSnowyEnderman": true,
+    "spawnSoulsandValleyEnderman": true,
+    "spawnSwampEnderman": true,
+    "spawnWarpedForestEnderman": true,
+    "spawnWindsweptHillsEnderman": true
+}

config/fancymenu/customization/landscapesreimagined_loadingscreen.txt

@@ -69,7 +69,7 @@ customization {
   enable_scrolling = true
   shadow = true
   scale = 2.0
-  source = v2.0.0
+  source = v2.1.0
   text_border = 0
   case_mode = normal
   source_mode = direct

config/fancymenu/locals/en_us.local

@@ -1365,13 +1365,19 @@ fancymenu.editor.action.screens.manage_screen.actions = Actions
 fancymenu.editor.action.screens.move_action_up = Move Action Up
 fancymenu.editor.action.screens.move_action_up.desc = Move this action up in the list,%n%so it gets executed earlier.
 fancymenu.editor.action.screens.move_action_down = Move Action Down
-fancymenu.editor.action.screens.move_action_down.desc = Move this action down in the list,%n%so it gets executed later.
-
+facymenu.editor.action.screens.move_action_down.desc = Move this action down in the list,%n%so it gets executed later.
 fancymenu.editor.elements.button.manage_actions.desc = Manage the actions this button%n%should execute when clicked.
-
 fancymenu.editor.elements.ticker.manage_actions.desc = Manage the actions this ticker%n%should execute.
-
 fancymenu.guicomponents.confirm = Confirm
+fancymenu.custom_guis.build = Build Custom GUI
+fancymenu.custom_guis.build.identifier = Custom GUI Identifier:
+fancymenu.custom_guis.build.identifier.already_in_use = Identifier already in use! Identifiers need to be unique!
+fancymenu.custom_guis.build.identifier.invalid = Invalid Identifier!
+fancymenu.custom_guis.build.title = Menu Title (Optional):
+fancymenu.custom_guis.build.allow_esc.enabled = Allow ESC to Close GUI: §aEnabled
+fancymenu.custom_guis.build.allow_esc.disabled = Allow ESC to Close GUI: §cDisabled
+fancymenu.ui.screens.string_builder_screen.edit_in_editor = Open in Editor
+
 
 
 

config/heracles/quests/overworld/Get a log.json

@@ -5,7 +5,7 @@
       "type": "heracles:item",
       "amount": 1,
       "collection": "AUTOMATIC",
-      "item": "#c:logs"
+      "item": "#minecraft:logs_that_burn"
     }
   },
   "rewards": {

config/heracles/quests/overworld/Get some planks.json

@@ -7,7 +7,7 @@
       "type": "heracles:item",
       "amount": 4,
       "collection": "AUTOMATIC",
-      "item": "#c:planks"
+      "item": "#minecraft:planks"
     }
   },
   "rewards": {

config/heracles/quests/thenether/Find a nether fortress.json

@@ -4,7 +4,7 @@
   ],
   "tasks": {
     "Enter a Nether Fortress": {
-      "structures": "#minecraft:fortress",
+      "structures": "#betterfortresses:better_fortresses",
       "type": "heracles:structure"
     }
   },

config/veinmining-client.toml

@@ -1,6 +1,6 @@
 #If maxBlocksBase is 0, determines how to activate vein mining.
 #Allowed Values: STANDING, CROUCHING, HOLD_KEY_DOWN
-activationState = "STANDING"
+activationState = "HOLD_KEY_DOWN"
 #If maxBlocksBase is greater than 0, determines how to activate vein mining.
 #Allowed Values: STANDING, CROUCHING, HOLD_KEY_DOWN
 activationStateWithoutEnchantment = "HOLD_KEY_DOWN"

kubejs/client_scripts/LandscapesReimagined_ClientTweaks.js

@@ -177,13 +177,11 @@ REIEvents.groupEntries(event => {
                 InputItem.of('@extendedgears') // New Addition
             ]
         },
-        // V2.0.0 New Mod Additions
         { id: "kubejs:rei_groups/betternether", name: "Better Nether", items: [InputItem.of('@betternether')] },
         { id: "kubejs:rei_groups/betterarch", name: "Better Archeology", items: [InputItem.of('@betterarcheology')] },
         { id: "kubejs:rei_groups/betterend", name: "Better End", items: [InputItem.of('@betterend')] },
         { id: "kubejs:rei_groups/creeperoverhaul", name: "Creeper Overhaul", items: [InputItem.of('@creeperoverhaul')] },
         { id: "kubejs:rei_groups/fishofthieves", name: "Fish of Thieves", items: [InputItem.of('@fishofthieves')] },
-        { id: "kubejs:rei_groups/magnumtorch", name: "Magnmum Torches", items: [InputItem.of('@magnumtorch')] },
         { id: "kubejs:rei_groups/regions", name: "Regions Unexplored", items: [InputItem.of('@regions_unexplored')] },
         { id: "kubejs:rei_groups/waystones", name: "Waystones", items: [InputItem.of('@waystones')] },
         { id: "kubejs:rei_groups/wunderreich", name: "Wunderreich", items: [InputItem.of('@wunderreich')] },
@@ -200,11 +198,25 @@ REIEvents.groupEntries(event => {
         { id: "kubejs:rei_groups/promenade", name: "Promenade", items: [InputItem.of('@promenade')] },
         { id: "kubejs:rei_groups/ptools", name: "Pocket Tools", items: [InputItem.of('@pockettools')] },
         { id: "kubejs:rei_groups/backpacks", name: "Traveler's Backpacks", items: [InputItem.of('#trinkets:chest/back')] },
-        { id: "kubejs:rei_groups/compasses", name: "Compasses", items: [
+        {
+            id: "kubejs:rei_groups/compasses", name: "Compasses", items: [
                 'explorerscompass:explorerscompass',
                 'naturescompass:naturescompass'
-            ] },
-
+            ]
+        },
+        // v2.1 Additions
+        { id: "kubejs:rei_groups/netherite", name: "Advanced Netherite", items: [InputItem.of('@advancednetherite')] },
+        { id: "kubejs:rei_groups/fandiscs", name: "Fan Made Discs", items: [InputItem.of('@all_the_fan_made_discs')] },
+        { id: "kubejs:rei_groups/pots", name: "Botany Pots", items: [InputItem.of('@botanypots')] },
+        { id: "kubejs:rei_groups/enderman", name: "Enderman Overhaul", items: [InputItem.of('@endermanoverhaul')] },
+        {
+            id: "kubejs:rei_groups/fuzs", name: "Fuzs Mods", items: [
+                'echochest:echo_chest',
+                'netherchested:nether_chest',
+                'barteringstation:bartering_station',
+                'tradingpost:trading_post',
+                InputItem.of('@magnumtorch')
+        ] }
     ];
 
     for (const group of groups) {
@@ -234,7 +246,7 @@ REIEvents.groupEntries(event => {
         'railways:green_conductor_cap',
         'railways:red_conductor_cap',
         'railways:black_conductor_cap',
-        Item.of('wunderreich:whisperer', '{Damage:0}'), 
+        Item.of('wunderreich:whisperer', '{Damage:0}')
     ];
 
     useNbt.forEach(id => {
@@ -246,8 +258,7 @@ REIEvents.groupEntries(event => {
     // Groups Fluids in REI
     const fluidGroups = [
         { id: "kubejs:rei_groups/fluid_tagged_as_water", name: "Fluids", fluids: ['minecraft:water', 'minecraft:lava'] },
-        {
-            id: "kubejs:rei_groups/create_fluids", name: "Create Fluids", fluids: [
+        { id: "kubejs:rei_groups/create_fluids", name: "Create Fluids", fluids: [
                 'create:honey',
                 'create:chocolate',
                 'milk:still_milk',
@@ -267,14 +278,11 @@ REIEvents.groupEntries(event => {
                 'createfoundry:molten_lapis',
                 'createfoundry:molten_ancient_debris',
                 'createfoundry:molten_netherite',
-            ]
-        },
-        {
-            id: "kubejs:rei_groups/travelers_fluids", name: "Travelers Backpack Fluids", fluids: [
+            ] },
+        { id: "kubejs:rei_groups/travelers_fluids", name: "Travelers Backpack Fluids", fluids: [
                 'travelersbackpack:potion_still', 'travelersbackpack:milk_still']
         },
-        {
-            id: "kubejs:rei_groups/delightfulcreators_fluids", name: "Delightful Creators Fluids", fluids: [
+        { id: "kubejs:rei_groups/delightfulcreators_fluids", name: "Delightful Creators Fluids", fluids: [
                 'delightfulcreators:tomato_sauce',
                 'delightfulcreators:hot_cocoa',
                 'delightfulcreators:melon_juice',
@@ -294,8 +302,7 @@ REIEvents.groupEntries(event => {
                 'delightfulcreators:baked_cod_stew',
                 'delightfulcreators:ratatouille',
                 'delightfulcreators:dog_food',
-            ]
-        }
+        ] }
     ];
 
     for (const group of fluidGroups) {
@@ -366,7 +373,7 @@ function getID(id) {
         return "Black Conductor Caps";
     }
     else if (id == '1 whisperer') {
-        return "Whisperers";            
+        return "Whisperers";            // New Change
     }
     return id;
 };

kubejs/server_scripts/CraftingTableTweaks.js

@@ -0,0 +1,64 @@
+// Crafting Table Recipes
+ServerEvents.recipes(event => {
+
+	// All Planks to Crafting Table Recipe
+	event.shaped(
+		Item.of('minecraft:crafting_table', 1),
+		[
+			'AA',
+			'AA'
+		],
+		{
+			A: '#minecraft:planks'
+		}
+	)
+
+	// Modded Crafting Tables to Vanilla Crafting Table
+	var table_types = [
+		// More Crafting Tables
+		['minecraft:crafting_table', 'lolmct:warped_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:spruce_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:birch_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:jungle_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:acacia_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:dark_oak_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:mangrove_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:cherry_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:bamboo_crafting_table'],
+		['minecraft:crafting_table', 'lolmct:crimson_crafting_table'],
+
+		// Better Nether Crafting Tables
+		['minecraft:crafting_table', 'betternether:nether_reed_crafting_table'],
+		['minecraft:crafting_table', 'betternether:stalagnate_crafting_table'],
+		['minecraft:crafting_table', 'betternether:willow_crafting_table'],
+		['minecraft:crafting_table', 'betternether:wart_crafting_table'],
+		['minecraft:crafting_table', 'betternether:warped_crafting_table'],
+		['minecraft:crafting_table', 'betternether:crimson_crafting_table'],
+		['minecraft:crafting_table', 'betternether:rubeus_crafting_table'],
+		['minecraft:crafting_table', 'betternether:mushroom_fir_crafting_table'],
+		['minecraft:crafting_table', 'betternether:nether_mushroom_crafting_table'],
+		['minecraft:crafting_table', 'betternether:anchor_tree_crafting_table'],
+		['minecraft:crafting_table', 'betternether:nether_sakura_crafting_table'],
+
+		// Better End Crafting Tables
+		['minecraft:crafting_table', 'betterend:mossy_glowshroom_crafting_table'],
+		['minecraft:crafting_table', 'betterend:pythadendron_crafting_table'],
+		['minecraft:crafting_table', 'betterend:end_lotus_crafting_table'],
+		['minecraft:crafting_table', 'betterend:lacugrove_crafting_table'],
+		['minecraft:crafting_table', 'betterend:dragon_tree_crafting_table'],
+		['minecraft:crafting_table', 'betterend:tenanea_crafting_table'],
+		['minecraft:crafting_table', 'betterend:helix_tree_crafting_table'],
+		['minecraft:crafting_table', 'betterend:umbrella_tree_crafting_table'],
+		['minecraft:crafting_table', 'betterend:jellyshroom_crafting_table'],
+		['minecraft:crafting_table', 'betterend:lucernia_crafting_table'],
+	];
+
+	table_types.forEach(table_type => {
+		event.shapeless(
+			Item.of(table_type[0], 1),
+			[
+				table_type[1]
+			]
+		);
+	});
+})