From 5065382629f7e729a77c7a5b6b7d208e75f6ceb7 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 13 Sep 2024 11:31:11 +0400 Subject: [PATCH 1/7] Hyperlink fxes --- docs/Development/General-Topics/Energy-Fluid-Item-Storage.md | 2 +- docs/Development/Glossary.md | 4 ++-- docs/Gameplay/Steam/Bronze.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Development/General-Topics/Energy-Fluid-Item-Storage.md b/docs/Development/General-Topics/Energy-Fluid-Item-Storage.md index 5bba069..b478d3a 100644 --- a/docs/Development/General-Topics/Energy-Fluid-Item-Storage.md +++ b/docs/Development/General-Topics/Energy-Fluid-Item-Storage.md @@ -8,7 +8,7 @@ title: Item/Fluid/Energy Storage !!! note In general, these containers should be created as `final` fields (that's what we need for the - [SyncData](./SyncData/index.md) system). + [SyncData](../SyncData/index.md) system). Set their base arguments in the constructor (you can pass args for subclasses to modify). diff --git a/docs/Development/Glossary.md b/docs/Development/Glossary.md index 058fbb5..d0c8645 100644 --- a/docs/Development/Glossary.md +++ b/docs/Development/Glossary.md @@ -38,8 +38,8 @@ connects to a dedicated server instead. The remote side is the part of the game that is **connected to** the game's server side. It always runs on the [client](#client-side). -This side may not have the same amount of data available to it as the server does (see [SyncData](../SyncData) if you -need to automatically synchronize certain data to the remote side). +This side may not have the same amount of data available to it as the server does (see [SyncData](../Development/SyncData/index.md) if you +need to automatically synchronize certain data to the remote side). It also does not perform any tick update logic. diff --git a/docs/Gameplay/Steam/Bronze.md b/docs/Gameplay/Steam/Bronze.md index 91a7624..f3f9a38 100644 --- a/docs/Gameplay/Steam/Bronze.md +++ b/docs/Gameplay/Steam/Bronze.md @@ -6,7 +6,7 @@ title: Bronze Bronze is the most important material in the [Steam Age](./index.md). -To prepare the first batch of it you will need [Tin and Copper](/Gameplay/Ore-Generation) just crush the ingots with a GT mortar. And then mix them in a crafting table in _3_ to _1_ proportion. Then smelting to receive the ingot. +To prepare the first batch of it you will need [Tin and Copper](../Ore-Generation.md) just crush the ingots with a GT mortar. And then mix them in a crafting table in _3_ to _1_ proportion. Then smelting to receive the ingot. ![Ingot crushing recipe](./assets/ingot_crushed.png) ![Bronze dust recipe](./assets/bronze_recipe.png) From d2bf62a00640304081cf62f3f735d686f2c2d062 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:49:34 +0400 Subject: [PATCH 2/7] Fix borked title --- .../Materials-and-Elements/Modifying-Existing-Materials.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index c139b80..62af320 100644 --- a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md @@ -29,7 +29,7 @@ All periodic table elements are present in GT, but some of them don't have any p Adding fluids to existing materials requires a bit of work with the new FluidStorage system -```js title=fluid_property.js" +```js title="fluid_property.js" const $FluidProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidProperty'); const $FluidBuilder = Java.loadClass('com.gregtechceu.gtceu.api.fluids.FluidBuilder'); From a1a3ab532105558ad2d2154feac169cda575cf46 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:54:24 +0400 Subject: [PATCH 3/7] Add docs for editing color --- .../Modifying-Existing-Materials.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index 62af320..34493c6 100644 --- a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md @@ -71,3 +71,12 @@ You can also add flags to existing materials: }); ``` + +Editing the color of an existing material: + + +```js title="material_modification.js" + GTCEuStartupEvents.materialModification(event => { + GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) + }) +``` From a7048011ef46e6f1724aea3e09a7b65380a3f1ad Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:59:34 +0400 Subject: [PATCH 4/7] Add heads up for materialModification --- .../Materials-and-Elements/Modifying-Existing-Materials.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index 34493c6..14d282f 100644 --- a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md @@ -77,6 +77,8 @@ Editing the color of an existing material: ```js title="material_modification.js" GTCEuStartupEvents.materialModification(event => { - GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) + GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) //[*] (1) }) ``` + +1. You can use most methods in the [``Material`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java) in the ``materialModification`` event From cde120d5483ca8e540cf1d67e4aaa2f7720161cc Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:07:38 +0400 Subject: [PATCH 5/7] shi wuh --- .../Materials-and-Elements/Modifying-Existing-Materials.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index 14d282f..3bca474 100644 --- a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md @@ -76,9 +76,10 @@ Editing the color of an existing material: ```js title="material_modification.js" - GTCEuStartupEvents.materialModification(event => { - GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) //[*] (1) + GTCEuStartupEvents.materialModification(event => { //(1) + GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) //(2) }) ``` -1. You can use most methods in the [``Material`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java) in the ``materialModification`` event +1. You can use both the `gtceu:material` event as well as `materialModification` to modify materials from both GT and its addons. However, you cannot register materials in `materialModification`. +2. Most methods in the [``Material`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java) can be used in the ``materialModification`` event \ No newline at end of file From a506268f1aa7c543c2bec3f04de4fea58112ab0b Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:02:11 +0400 Subject: [PATCH 6/7] Fix oreVeins.modifyAll() example --- docs/Modpacks/Ore-Generation/01-Customizing-Veins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Modpacks/Ore-Generation/01-Customizing-Veins.md b/docs/Modpacks/Ore-Generation/01-Customizing-Veins.md index a216bf6..3edf41b 100644 --- a/docs/Modpacks/Ore-Generation/01-Customizing-Veins.md +++ b/docs/Modpacks/Ore-Generation/01-Customizing-Veins.md @@ -135,7 +135,7 @@ The API for vein modifications is the same as for creating new veins. ```js title="server_scripts/modify_all_veins.js" GTCEuServerEvents.oreVeins(event => { - event.modifyAll("gtceu:cassiterite_vein", (id, vein) => { + event.modifyAll((id, vein) => { console.log("Modifying vein: " + id) vein.density(1.0) }) From 1dfc91f3d3d7cf3004e1b30b7216af9a415e70d3 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:05:57 +0400 Subject: [PATCH 7/7] Requested changes --- .../Materials-and-Elements/Modifying-Existing-Materials.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md index 3bca474..20236fd 100644 --- a/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md +++ b/docs/Modpacks/Materials-and-Elements/Modifying-Existing-Materials.md @@ -76,10 +76,9 @@ Editing the color of an existing material: ```js title="material_modification.js" - GTCEuStartupEvents.materialModification(event => { //(1) - GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) //(2) + GTCEuStartupEvents.materialModification(event => { + GTMaterials.BismuthBronze.setMaterialARGB(0x82AD92) //(1) }) ``` -1. You can use both the `gtceu:material` event as well as `materialModification` to modify materials from both GT and its addons. However, you cannot register materials in `materialModification`. -2. Most methods in the [``Material`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java) can be used in the ``materialModification`` event \ No newline at end of file +1. Most methods in the [``Material`` class](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java) can be used in the ``materialModification`` event \ No newline at end of file