Skip to content

Commit c97d019

Browse files
ReabstractionPhoenixvine32908zetrock1jurrejellecarbonatek
authored
Re/merge 1.20.1 into 1.21 (#4437)
Co-authored-by: Phoenixvine <82596737+Phoenixvine32908@users.noreply.github.com> Co-authored-by: zetrock1 <144679746+zetrock1@users.noreply.github.com> Co-authored-by: Jurre Groenendijk <jurre@jilles.com> Co-authored-by: carbonatek <78877330+carbonatek@users.noreply.github.com> Co-authored-by: Mqrius <Nuntius.Marii@Gmail.com> Co-authored-by: Petr211071 <55793813+Petr211071@users.noreply.github.com> Co-authored-by: Siber0 <simonbeerli0@gmail.com> Co-authored-by: screret <68943070+screret@users.noreply.github.com> Co-authored-by: Haze <zetateamhazevista@gmail.com> Co-authored-by: remakefactory <215389873+remakefactory@users.noreply.github.com> Co-authored-by: Starman(StarmanMine142) <135715391+StarmanMine142@users.noreply.github.com> Co-authored-by: Conity <rockman.567namako.com@gmail.com> Co-authored-by: Tar Laboratories <159147059+TarLaboratories@users.noreply.github.com> Co-authored-by: Karthi <75553966+JuiceyBeans@users.noreply.github.com> Co-authored-by: 20jonas02 <jogajdosik@gmail.com> Co-authored-by: DilithiumThoride <lilithiumathena@gmail.com> Co-authored-by: esmenard <53749130+esmenard@users.noreply.github.com> Co-authored-by: Justin Kieber-King <jkieberking@gmail.com> Co-authored-by: Gustavo <77560533+gustovafing@users.noreply.github.com> Co-authored-by: Pyritie <pyritie@gmail.com> Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 7bbfeeb commit c97d019

83 files changed

Lines changed: 4919 additions & 4649 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,57 @@
11
# ChangeLog
22

3+
## Version [v7.4.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.4.0-1.20.1...v7.4.1-1.20.1)
4+
### Added
5+
6+
- Improvements to Sodalite and Lazurite by @htmlcsjs in [#4297](https://github.com/GregTechCEu/GregTech-Modern/pull/4297)
7+
- Allow accessing block nbt from placeholders by @TarLaboratories in [#4161](https://github.com/GregTechCEu/GregTech-Modern/pull/4161)
8+
- Fix blackstone and tuff ores not dropping dusts by @JuiceyBeans in [#4376](https://github.com/GregTechCEu/GregTech-Modern/pull/4376)
9+
- Make netherite tools and items fire resistant by @JuiceyBeans in [#4378](https://github.com/GregTechCEu/GregTech-Modern/pull/4378)
10+
- Jade support for Long Distance Pipeline Endpoints by @JuiceyBeans in [#4420](https://github.com/GregTechCEu/GregTech-Modern/pull/4420)
11+
12+
### Fixed
13+
14+
- Fix vanilla fuel not working in boilers by @jurrejelle in [#4249](https://github.com/GregTechCEu/GregTech-Modern/pull/4249)
15+
- Fix manual mode for item/fluid filter covers and conveyors/pumps by @programmer3481 in [#4245](https://github.com/GregTechCEu/GregTech-Modern/pull/4245)
16+
- no more z fighting by @Spicierspace153 in [#4240](https://github.com/GregTechCEu/GregTech-Modern/pull/4240)
17+
- Fix #4154 Charcoal Pile Igniter by @zetrock1 in [#4246](https://github.com/GregTechCEu/GregTech-Modern/pull/4246)
18+
- Add tooltips for link covers by @zetrock1 in [#4265](https://github.com/GregTechCEu/GregTech-Modern/pull/4265)
19+
- Large Boiler throttle modifies burn time of current fuel by @DilithiumThoride in [#4258](https://github.com/GregTechCEu/GregTech-Modern/pull/4258)
20+
- Fix scythe not breaking items in an AOE by @Ujhik in [#4207](https://github.com/GregTechCEu/GregTech-Modern/pull/4207)
21+
- Fix GT Capes not rendering in multiplayer by @DilithiumThoride in [#4271](https://github.com/GregTechCEu/GregTech-Modern/pull/4271)
22+
- Fix dupes of Carbon dust and Coal dust by @zetrock1 in [#4301](https://github.com/GregTechCEu/GregTech-Modern/pull/4301)
23+
- rework the check for decomposition amounts by @jonasGajdosikas in [#4298](https://github.com/GregTechCEu/GregTech-Modern/pull/4298)
24+
- Fix ghost circuit in item detector by @zetrock1 in [#4293](https://github.com/GregTechCEu/GregTech-Modern/pull/4293)
25+
- Fixes shiny material set double plates. by @Flare32 in [#4213](https://github.com/GregTechCEu/GregTech-Modern/pull/4213)
26+
- Add directional setting UI and fix Machine UI TitleBar by @remakefactory in [#4238](https://github.com/GregTechCEu/GregTech-Modern/pull/4238)
27+
- KubeJS Duration Check by @YoungOnionMC in [#4327](https://github.com/GregTechCEu/GregTech-Modern/pull/4327)
28+
- Fixes some cases where handleRecipe() succeeds when it should fail by @DilithiumThoride in [#4300](https://github.com/GregTechCEu/GregTech-Modern/pull/4300)
29+
- Allow tags in shaped recipes to get recycle info by @jurrejelle in [#4292](https://github.com/GregTechCEu/GregTech-Modern/pull/4292)
30+
- Prevent clientside state mutations in QuarkTechSuite helmet by @Mqrius in [#4322](https://github.com/GregTechCEu/GregTech-Modern/pull/4322)
31+
- (Docs) Fix GTValues.VA being used as a function in material property modification, add reference to coil temps in Material Properties by @carbonatek in [#4338](https://github.com/GregTechCEu/GregTech-Modern/pull/4338)
32+
- Update spotless to 8.1.0 by @Reabstraction in [#4323](https://github.com/GregTechCEu/GregTech-Modern/pull/4323)
33+
- PumpBiomeModifier - change priority of tags by @zetrock1 in [#4369](https://github.com/GregTechCEu/GregTech-Modern/pull/4369)
34+
- Make fuel jetpacks work on servers by @Mqrius in [#4341](https://github.com/GregTechCEu/GregTech-Modern/pull/4341)
35+
- Fix facade cover json by @jurrejelle in [#4418](https://github.com/GregTechCEu/GregTech-Modern/pull/4418)
36+
- Correct Data Stick interaction handling by @remakefactory in [#4409](https://github.com/GregTechCEu/GregTech-Modern/pull/4409)
37+
- Fixes to overlay textures on some machines. by @Conity723 in [#4403](https://github.com/GregTechCEu/GregTech-Modern/pull/4403)
38+
- Fix {fromAscii} placeholder by @TarLaboratories in [#4392](https://github.com/GregTechCEu/GregTech-Modern/pull/4392)
39+
- Fix rotor holder Z-fighting by @zetrock1 in [#4335](https://github.com/GregTechCEu/GregTech-Modern/pull/4335)
40+
- Refactor naquadah reactor overlays to a workableMultiblockMachineCasing compatible format by @jonasGajdosikas in [#4353](https://github.com/GregTechCEu/GregTech-Modern/pull/4353)
41+
- Fix ranged output items voiding if there wasn't enough output space by @DilithiumThoride in [#4290](https://github.com/GregTechCEu/GregTech-Modern/pull/4290)
42+
- Add recipe for Copper Ingot disassembling by @esmenard in [#4399](https://github.com/GregTechCEu/GregTech-Modern/pull/4399)
43+
- Fix multiblock controller rotation overlay logic by @jkieberking in [#4199](https://github.com/GregTechCEu/GregTech-Modern/pull/4199)
44+
- Add missing rock types to initializeCobbleReplacements() by @Pyritie in [#4329](https://github.com/GregTechCEu/GregTech-Modern/pull/4329)
45+
46+
### Changed
47+
48+
- Large Boiler throttle modifies burn time of current fuel by @DilithiumThoride in [#4258](https://github.com/GregTechCEu/GregTech-Modern/pull/4258)
49+
- ja_jp fix by @code-onigiri in [#4319](https://github.com/GregTechCEu/GregTech-Modern/pull/4319)
50+
- Change out LDLib client side check to GTCEu one by @jurrejelle in [#4365](https://github.com/GregTechCEu/GregTech-Modern/pull/4365)
51+
- Update uk_ua.json by @StarmanMine142 in [#4411](https://github.com/GregTechCEu/GregTech-Modern/pull/4411)
52+
- Port existing keybinds to new system by @TechLord22 in [#4069](https://github.com/GregTechCEu/GregTech-Modern/pull/4069)
53+
54+
355
## Version [v7.4.0](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.3.0-1.20.1...v7.4.0-1.20.1)
456
### Added
557

‎build.gradle‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id 'eclipse'
55
id 'idea'
66
id 'maven-publish'
7+
id 'jacoco'
78
alias libs.plugins.modDevGradle
89
//alias libs.plugins.shadow
910
alias libs.plugins.spotless
@@ -84,3 +85,34 @@ tasks.withType(JavaCompile).configureEach {
8485
lombok {
8586
version = "1.18.38"
8687
}
88+
89+
jacoco {
90+
applyTo runGameTestServer
91+
}
92+
93+
jacocoTestReport {
94+
doFirst {
95+
try {
96+
runGameTestServer.exec()
97+
} catch (RuntimeException ignored) {}
98+
}
99+
doLast {
100+
println "Coverage report location:"
101+
println " - file://${layout.buildDirectory.dir('coverage').map(a -> a.file('index.html')).get()}"
102+
println " - file://${layout.buildDirectory.dir('coverage').map(a -> a.file('coverage.xml')).get()}"
103+
}
104+
executionData runGameTestServer
105+
sourceSets sourceSets.test
106+
reports {
107+
csv.required = false
108+
xml.required = true
109+
html.outputLocation = layout.buildDirectory.dir('coverage')
110+
xml.outputLocation = layout.buildDirectory.dir('coverage').map(a -> a.file('coverage.xml'))
111+
}
112+
afterEvaluate {
113+
classDirectories.setFrom(files(classDirectories.files.collect {
114+
fileTree(dir: it, exclude: '**/client/**')
115+
fileTree(dir: it, exclude: '**/mixins/**')
116+
}))
117+
}
118+
}

‎docs/content/Gameplay/Steam/Bronze.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ title: Bronze
66

77
Bronze is the most important material in the [Steam Age](./index.md).
88

9-
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.
9+
To prepare the first batch of it you will need [Tin and Copper](../Ore-Generation.md).
10+
Just crush the ingots with a GT mortar and mix them in a crafting table in a _3_ to _1_ proportion. Then smelt the resulting dust to receive the ingot.
1011

1112
![Ingot crushing recipe](./assets/ingot_crushed.png)
1213
![Bronze dust recipe](./assets/bronze_recipe.png)
1314

15+
After you get the steam [alloy smelter](Steam-Usage.md), you can get bronze faster and without needing a mortar.

‎docs/content/Gameplay/Steam/Steam-Generation.md‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ For early game steam generation you have two options:
1414
### Solar Boilers
1515
* generate steam from solar boilers _doesn't work at night_.
1616

17-
For water you can use a **primitive pump**
18-
![Primitive water pump](./assets/p_water_pump.png)
17+
For water, you can use a **primitive pump**
18+
![Primitive water pump](./assets/primitive_water_pump.png)
1919

2020
or use a water connection from any other mod.
2121

@@ -32,18 +32,16 @@ Large boilers allow you to create massive amount of steam in the blink of an eye
3232
### Single Block
3333

3434
| Boiler type | Low pressure | High pressure |
35-
| ----------- | ------------ | ------------- |
36-
| Solar | 6 L/T | 18 L/T |
37-
| Liquid | 12 L/T | 30 L/T |
38-
| Solid | 6 L/T | 15 L/T |
35+
| ----------- |--------------| ------------- |
36+
| Solar | 6 mB/t | 18 mB/t |
37+
| Liquid | 12 mB/t | 30 mB/t |
38+
| Solid | 6 mB/t | 15 mB/t |
3939

4040
### Multiblock
4141

4242
| Boiler | Generation | Boil up | Max temp |
4343
| ------------- | ---------- | ------- | -------- |
44-
| Bronze | 800 L/T | 40s | 1074K |
45-
| Steel | 1800 L/T | 90s | 2074K |
46-
| Titanium | 3200 L/T | 160s | 3474K |
47-
| Tungstensteel | 6400 L/T | 160s | 6674K |
48-
49-
*L/T -> Liters per tick (1L = 1mB)
44+
| Bronze | 800 mB/t | 40s | 1074K |
45+
| Steel | 1800 mB/t | 90s | 2074K |
46+
| Titanium | 3200 mB/t | 160s | 3474K |
47+
| Tungstensteel | 6400 mB/t | 160s | 6674K |

‎docs/content/Gameplay/Steam/Steam-Usage.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
Title: Using Steam
3+
---
4+
5+
# Using Steam
6+
7+
After you've generated some steam, you'll need some place to use it.
8+
That's where the machines come in, they'll provide your first bit of automation and process some recipes cheaper and
9+
without needing durability.
10+
11+
### List of steam machines:
12+
13+
| Name | Recipe types | Examples | Low Pressure | High Pressure |
14+
|---------------|------------------------------|------------------------------------------------------------------------------|-------------------|---------------|
15+
| Extractor | Extracting | Rubber Log -> Raw Rubber Pulp | 2 mB/t | 4 mB/t |
16+
| Macerator | Macerating/Ore Grinding | Copper Ingot -> Copper dust | 2 mB/t | 4 mB/t |
17+
| Compressor | Compressing | Iron Ingot -> Block of Iron | 2 mB/t | 4 mB/t |
18+
| Forge Hammer | Forge Hammer/Ore Crushing | Iron Ingot -> Iron Plate | 16 mB/t | 32 mB/t |
19+
| Furnace | Smelting Ore | Bronze Dust -> Bronze Ingot | 4 mB/t | 8 mB/t |
20+
| Alloy Smelter | Alloy Smelting/Metal Molding | Copper and Tin -> Bronze Ingot | 16 mB/t | 32 mB/t |
21+
| Rock Crusher | Rock Breaking | Cobblestone, Water Source, Lava Source -> Cobblestone | 7 mB/t | 14 mB/t |
22+
| Miner | Automated Mining | Mines from blocks in a 9x9 area. Generates Ores | 16 mB/t | 32 mB/t |
23+
| Steam Grinder | Macerating/Ore Grinding | Same as the Macerator, but it can process up to eight recipes simultaneously | 2 mB/t per recipe | - |
24+
| Steam Oven | Smelting Ore | Same as the Furnace, but it can process up to eight recipes simultaneously | 6 mB/t per recipe | - |
25+
26+
!!! info "Special single block machines"
27+
28+
The Rock Crusher and the Miner are special machines with additional requirements.
29+
30+
* The Rock Crusher requires a Water source and a Lava source next to it.
31+
![Rock Crusher setup](./assets/rock_crusher_setup.png)
32+
* The Miner needs ore blocks below it within the working area.

docs/content/Gameplay/Steam/assets/p_water_pump.png renamed to docs/content/Gameplay/Steam/assets/primitive_water_pump.png

File renamed without changes.

‎docs/content/Gameplay/Steam/assets/rock_crusher_setup.png‎

713 KB
Loading

‎docs/content/Gameplay/Steam/index.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ title: Steam Tier
44

55
# Welcome to Gregtech
66

7-
Steam is the first of many stages that come with the Gregtech mod. It will be your first encounter with GT machines and tools. Be careful _things may get explosive_.
7+
Steam is the first of many stages in GregTech. It'll be your first encounter with GT machines and tools.
8+
Be careful, as _things may get explosive_.
89

9-
So it is important that you learn how to transport and make enough steam for your factory.
10+
It's important that you learn how to make and transport enough steam for your factory.
1011

1112
## In this tier
1213

‎docs/content/Modpacks/Examples/Multiblocks/Example_Turbine.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Below is an example of a multiblock using the LargeTurbineMachine class for maki
1818
.machine((holder) => new $LargeTurbineMachine(holder, GTValues.LuV)) // The value shows one rotor holder tier above the recommended minimum rotor holder. The tier of rotor holder provides a boost based on the efficiency stat.
1919
.rotationState(RotationState.NON_Y_AXIS)
2020
.recipeTypes("gas_turbine")
21-
.recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, GTRecipeModifiers.BATCH_MODE, (machine, recipe) => GTRecipeModifiers.LargeTurbineMachine(machine, recipe)])
21+
.recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT_SUBTICK, GTRecipeModifiers.BATCH_MODE, (machine, recipe) => $LargeTurbineMachine.recipeModifier(machine, recipe)])
2222
.appearanceBlock(GTBlocks.CASING_STAINLESS_TURBINE)
2323
.pattern(definition => FactoryBlockPattern.start()
2424
.aisle("BBBBBBB", "BBBCBBB", "BBBDBBB", "BBBCBBB", "BBBBBBB")

‎docs/content/Modpacks/Materials-and-Elements/02-Element-Creation.md‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,29 @@ title: Element Creation
44

55

66
## Element Creation
7-
7+
!!! Note
8+
You can add only elements that are not yet present on the periodic table.
9+
For those elements, see GTElements.
810
Elements are the base of GT materials. Registering an element WILL NOT add any items.
9-
To make a new element(NOTE: you can add only elements that are NOT present on the periodic table),
10-
write an `event.create()` call in the registry function like in the example below.
11-
Inside the parentheses the following parameters are introduced:
12-
13-
1. Element Name -> use '' or "" to write the element name.
14-
2. Proton Count(use -1 if it is not an element that will get a material).
15-
3. Neutron Count(use -1 if it is not an element that will get a material).
16-
4. Half Life Seconds(decay stuff. Use -1 if you don't need to use decay).
17-
5. Material to decay to(more decay stuff. Use null).
18-
6. Atomic Symbol(what will be displayed as in chemical formulas) -> use '' or "" to write the atomic symbol.
19-
7. Is isotope(ex. Uranium 235 and Uranium 238. Use false if you are not making an isotope)
20-
21-
When a material will be created from this element, the above properties will affect the auto-generated recipes.
2211

2312
```js
2413
GTCEuStartupEvents.registry('gtceu:element', event => {
25-
event.create('test_element', 27, 177, -1, null, 'test', false) // (1)
14+
event.create('test_element')
15+
.protons(27)
16+
.neutrons(177)
17+
.halfLifeSeconds(-1)
18+
.decayTo(null)
19+
.symbol('test')
20+
.isIsotope(false)
2621
})
2722
```
2823

29-
1. Element Name, Protons, Neutrons, Half Life Seconds, Decay To, Atomic Symbol, Is Isotope
24+
1. `.create(String name)` -> The element name.
25+
2. `.protons(int protons)` -> Proton Count. Use `-1` if it is an element that will not get a material.
26+
3. `.neutrons(int neutrons)` -> Neutron Count. Use `-1` if it is an element that will not get a material
27+
4. `.halfLifeSeconds(int seconds)` -> Half Life Decay in Seconds. After N seconds, half of the material will have decayed. Use `-1` if your element doesn't decay.
28+
5. `.decayTo(Material material)` -> Material to decay to. Use `null` if your element doesn't decay.
29+
6. `.symbol(String symbol)` -> Atomic Symbol, which will be displayed as in chemical formulas.
30+
7. `.isIsotope(boolean isotope)` -> Whether the element is an isotope, e.g. Uranium 235 and Uranium 238.
31+
32+
When a material will be created from this element, the above properties will affect the auto-generated recipes.

0 commit comments

Comments
 (0)