diff --git a/kubejs/assets/emi/recipe/additions/milk_flowing_milk.json b/kubejs/assets/emi/recipe/additions/milk_flowing_milk.json new file mode 100644 index 000000000..3e2d567cd --- /dev/null +++ b/kubejs/assets/emi/recipe/additions/milk_flowing_milk.json @@ -0,0 +1,8 @@ +{ + "type": "emi:info", + "stacks": [ + "fluid:minecraft:milk", + "fluid:ptdye:flowing_milk" + ], + "text": "fluid.ptdye.milk.info" +} diff --git a/kubejs/assets/ptdye/lang/en_us.json b/kubejs/assets/ptdye/lang/en_us.json index 4b13a4582..1225d33a3 100644 --- a/kubejs/assets/ptdye/lang/en_us.json +++ b/kubejs/assets/ptdye/lang/en_us.json @@ -219,6 +219,7 @@ "tag.item.wares.agreements": "Agreements", "tag.item.wares.cardboard_box_blacklisted": "Blacklisted Cardboard Boxes", "tag.item.wares.delivery_boxes": "Delivery Boxes", + "fluid.ptdye.milk.info": "Milk, the ultimate lifeblood of the universe, is a versatile fluid that can be used to fuel rockets, create matter and sate the thirsty. _Can be acquired by milking Betsy_", "ptdye.lang.EOF": "Ignore! This is here so you don't have to keep adding ',' to previous lines adding additional changes to git" -} \ No newline at end of file +} diff --git a/kubejs/client_scripts/tooltips/critical.js b/kubejs/client_scripts/tooltips/critical.js index 599cd606e..a43d8bb1f 100644 --- a/kubejs/client_scripts/tooltips/critical.js +++ b/kubejs/client_scripts/tooltips/critical.js @@ -6,7 +6,7 @@ addTooltip( ); addTooltip( "white_concrete_powder", - "Seems that the _milk_ here, flowing or source, can be purified with _pure daisy_ to make _white powder_" + "Flowing milk can be purified with _pure daisy_ to make _white powder_" ); addTooltip( "lava_bucket", diff --git a/kubejs/server_scripts/base/debugtools.js b/kubejs/server_scripts/base/debugtools.js index 47ea0cf70..65bbd63ee 100644 --- a/kubejs/server_scripts/base/debugtools.js +++ b/kubejs/server_scripts/base/debugtools.js @@ -1,4 +1,4 @@ -// Priority: 1 +// priority: 1 ServerEvents.commandRegistry((event) => { const { commands: Commands, diff --git a/kubejs/server_scripts/base/features/deadPlanet.js b/kubejs/server_scripts/base/features/deadPlanet.js index 5ef951898..c1598d371 100644 --- a/kubejs/server_scripts/base/features/deadPlanet.js +++ b/kubejs/server_scripts/base/features/deadPlanet.js @@ -8,7 +8,6 @@ addCompacting('dirt %75',['4x stick','2x #forge:sand']) addMixing('white_dye %75',['16x snowball', '10mb kubejs:fermented_goop']) addPurify('orange_concrete_powder', 'lava', 15) addPurify('blue_concrete_powder', 'water', 15) -addPurify('white_concrete_powder', 'milk', 15) addPurify('yellow_concrete_powder', 'create:honey', 15) addPurify('brown_concrete_powder', 'create:chocolate', 15) addPurify('green_concrete_powder', 'kubejs:organic_mass', 15) @@ -25,4 +24,4 @@ addDripping('grass', 'dead_bush') removeRecipe({ id: 'supplementaries:soap' }) addMixing('6x supplementaries:soap', ['4x #forge:dusts/ash', '#forge:meat/fat', '1000mb water']) -addMixing('6x supplementaries:soap', ['8x #forge:dusts/ash', '250mb createdieselgenerators:plant_oil', '750mb water']) \ No newline at end of file +addMixing('6x supplementaries:soap', ['8x #forge:dusts/ash', '250mb createdieselgenerators:plant_oil', '750mb water']) diff --git a/kubejs/server_scripts/base/features/milkNerf.js b/kubejs/server_scripts/base/features/milk.js similarity index 55% rename from kubejs/server_scripts/base/features/milkNerf.js rename to kubejs/server_scripts/base/features/milk.js index afa2d9013..de83c0902 100644 --- a/kubejs/server_scripts/base/features/milkNerf.js +++ b/kubejs/server_scripts/base/features/milk.js @@ -1,3 +1,29 @@ +// addPurify('white_concrete_powder', 'milk', 15) +addPurify('white_concrete_powder', 'ptdye:flowing_milk', 15) +ServerEvents.tags("fluid", (event) => {event.add("ptdye:flowing_milk", ["minecraft:flowing_milk"]);}); +ServerEvents.tags("block", (event) => {event.add("ptdye:milk", ["minecraft:milk"]);}); +modpackRecipes.push({//special hack to only work on flowing milk + type: "botania:pure_daisy", + hidden: true, + time: 15, + input: { + type: "tag_excluding", + tag: "ptdye:milk", + exclude: [ + { + type: "state", + name: "minecraft:milk", + properties: { + level: "0", + }, + }, + ], + }, + output: { + name: "minecraft:white_concrete_powder", + }, +}); + ItemEvents.entityInteracted("minecraft:bucket", (event) => { if (event.getTarget().getType() == "minecraft:cow") { let currentTime = event.getTarget().level.getTime(); @@ -17,5 +43,5 @@ ItemEvents.entityInteracted("minecraft:bucket", (event) => { event.getTarget().persistentData.put("lastMilked", currentTime); } } - }); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/base/trading/backwardsCompatEngine.js b/kubejs/server_scripts/base/trading/backwardsCompatEngine.js index cc792173b..3f8b2aa9b 100644 --- a/kubejs/server_scripts/base/trading/backwardsCompatEngine.js +++ b/kubejs/server_scripts/base/trading/backwardsCompatEngine.js @@ -1,7 +1,9 @@ -// Priority: 100 +// priority: 100 global.revision = 1; function isFirstLogin() { + console.log("existing_world_compat_engine: " + Utils.server.persistentData.getBoolean("existing_world_compat_engine")); + console.log("existing_world: " + Utils.server.persistentData.getBoolean("existing_world")); return !( Utils.server.persistentData.getBoolean("existing_world_compat_engine") || Utils.server.persistentData.getBoolean("existing_world") diff --git a/kubejs/startup_scripts/custom_fluids/milk.js b/kubejs/startup_scripts/custom_fluids/milk.js new file mode 100644 index 000000000..477c51314 --- /dev/null +++ b/kubejs/startup_scripts/custom_fluids/milk.js @@ -0,0 +1,9 @@ +//fake flowing milk + +StartupEvents.registry("fluid", (event) => { + event + .create("ptdye:flowing_milk") + .thinTexture(0xE7E7E7) + .noBucket() + .bucketColor(0xE7E7E7); + }); diff --git a/kubejs/startup_scripts/global.js b/kubejs/startup_scripts/global.js index b60dd7a15..8c3b7fea1 100644 --- a/kubejs/startup_scripts/global.js +++ b/kubejs/startup_scripts/global.js @@ -1,4 +1,4 @@ -// Priority: 10000 +// priority: 10000 const IS_CLIENT_ENVIRONMENT = Platform.isClientEnvironment() global.colors = ['white', 'orange', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan', 'purple', 'magenta', 'blue', 'brown', 'green', 'red', 'black']