Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ jobs:
chisel(recommended)
better-builders-wands(recommended)
tinkers-antique(recommended)
ex-nihilo-creatio(recommended)
files: |
build/libs/!(*-@(dev|sources|javadoc)).jar
build/libs/*-@(sources).jar
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# v1.5.0
## Ex Nihiro: Creatio Integration

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Correct the integration name.

Line 2 spells the mod name as Ex Nihiro. Use Ex Nihilo: Creatio.

🧰 Tools
🪛 LanguageTool

[grammar] ~2-~2: Ensure spelling is correct
Context: # v1.5.0 ## Ex Nihiro: Creatio Integration - _Crooking Compati...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@CHANGELOG.md` at line 2, Correct the changelog heading from “Ex Nihiro:
Creatio Integration” to use the mod name “Ex Nihilo: Creatio,” preserving the
existing heading format.

Source: Linters/SAST tools

- _Crooking Compatibility_
- Added GT-style crooks.
- _Hammering Compatibility_
- CEu Hard hammers can now be used as Ex Nihilo hammers.
- _Sieving Compatibility_
- :warning:**_WARNING_**:warning: This feature is temporary and will be removed once GTCEu supports it natively.
- Added Steam and Electric Sieve.
- Added Basalt, Granites, Marble pebble.
- Added GT-material Ore Chunk.

* * *

# v1.4.0
## New: Tools Module
- Per-item tool restrictions (custom max durability), JEI hiding, and recipe removal — all configurable via a single cfg.
Expand Down
45 changes: 45 additions & 0 deletions DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The table below shows current coverage:
| Better Builder's Wands | — | No API yet |
| Chisel | — | No API yet |
| Storage Drawers | `integration.storagedrawers.api` | Available, but for mixin only |
| Ex Nihilo: Creatio | - | No API yet |

All registration calls must happen during your mod's `preInit` phase,
**before** GTMT's `registerBlocks`, unless stated otherwise.
Expand Down Expand Up @@ -231,3 +232,47 @@ P X P
- **X** = If _tier_ is -1, a `stickLong`; otherwise, a `Field Generator` of the specified tier

- _Storage Upgrade_ conversion recipes between StorageDrawers and GTMoreTools are always added for Obsidian / Iron / Gold / Diamond / Emerald.

---

## Ex Nihilo: Creatio Integration

No addon API is currently available. The following describes the internal logic for reference.

### What is added

1. **GT-style Crooks** — registered for every GT material with the `TOOL` property.
2. **Hammer Conversion** - CEu Hard hammers can now be used as Ex Nihilo hammers.
3. **Sieve Compatibility** — added Steam and Electric Sieves, GT pebbles and GT Ore chunk.

### Tool crafting

| Config | Recipe shape | Materials |
|--------|----------------------|--------------|
| Always | `"SS" / " S" / " S"` | Rod (or Gem) |

The original Wood, Iron, Gold, Diamond Crook recipe is removed when `replaceCrook = true`.
Registered as `toolCrook`.

### Electric Sieve Recipe

```
C P C
V H V
W S W
```

- **C** = Circuit (all tier-scaled), **P** = Piston
- **V** = Conveyer, **H** = Hull, **W** = `cableGTSingle` (LV = Tin, MV = Copper, ...)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Correct the component name.

Line 266 uses Conveyer. Use Conveyor.

🧰 Tools
🪛 LanguageTool

[grammar] ~266-~266: Ensure spelling is correct
Context: ... tier-scaled), P = Piston - V = Conveyer, H = Hull, W = cableGTSingle ...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@DEVELOPER.md` at line 266, Update the component name in the referenced
documentation entry from “Conveyer” to “Conveyor,” leaving the other
abbreviations and descriptions unchanged.

Source: Linters/SAST tools

- **S** = Sieve

### Sieving Compatibility

:warning:**_WARNING_**:warning: This feature is temporary and will be removed once GTCEu supports it natively.
- Adds GT stone Pebbles and Rubber Saplings to the Dirt Sieve drop table.
- Allows GT Materials to be added to the Sieve drop tables for Sand, Gravel, Andesite, Granite, Diorite, Netherrack, and Endstone via the config.
- Format: `modid:materialName@chance*meshLevel` (`modid` is optional and defaults to `gregtech`.)
- When `outputVeinProbabilities` is set to `true`, all worldgen vein definitions under `config/gregtech/worldgen/vein/` are scanned, and the generation probability of each ore is written to the log.
> **Note:** GTMT only adds new entries and does not modify the default Sieve drop tables.

---
25 changes: 25 additions & 0 deletions LICENSE-ExNihiloCreatio
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
The MIT License (MIT)

Copyright (c) 2015 MikeLydeamore (original Mod);
Copyright (c) 2017 Jacky1356400 (initial Port);
Copyright (c) 2017 BloodWorkXGaming (current Maintainer)
Copyright (c) 2017 SirLyle (current Maintainer)
Copyright (c) 2019 Wolforce (textures)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
21 changes: 21 additions & 0 deletions LICENSE-Gregification
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 GregTech CE Unofficial Team

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ For full details, see [CHANGELOG.md](CHANGELOG.md).
### Storage Drawers Integration
- Add GT material-based Storage Upgrades.

### Ex Nihilo: Creatio Integration
- Add GT material-based Crook.
- Hammering Compatibility
- Sieving Compatibility

For full details, see [CHANGELOG.md](CHANGELOG.md).

## For Addon Developers

GTMoreTools exposes a public API for extending the Tinkers' Construct integration.
Expand All @@ -40,3 +47,5 @@ See **[DEVELOPER.md](DEVELOPER.md)** for the full guide.
## Credits

- I modified some textures & codes from [GregTech CE: Unofficial](https://www.curseforge.com/minecraft/mc-mods/gregtech-ce-unofficial) under [LGPL-3.0](https://github.com/GregTechCEu/GregTech/blob/main/LICENSE) License
- I modified some texture & codes from [Gregification](https://github.com/GregTechCEu/Gregification) under [MIT](LICENSE-Gregification) Licence
- I modified some textures from [Ex Nihilo: Creatio](https://github.com/BloodyMods/ExNihiloCreatio) under [MIT](LICENSE-ExNihiloCreatio) License
1 change: 1 addition & 0 deletions buildscript.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ debug_chisel = false
debug_bbw = false
debug_tic = false
debug_drawers = false
debug_exnihilocreatio = false

# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
# restart Minecraft in development. Choose this dependent on your mod:
Expand Down
8 changes: 8 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,12 @@ dependencies {
runtimeOnly rfg.deobf("curse.maven:storage-drawers-223852:5981297")
implementation rfg.deobf("curse.maven:topalldependents-1120632:6138503")
}

// Debug Ex Nihilo: Creatio
compileOnly rfg.deobf("curse.maven:shadowfacts-forgelin-248453:2785465") // Shadowfacts' Forgelin-1.8.4
compileOnly rfg.deobf("curse.maven:ex-nihilo-creatio-274456:2817545") // Ex Nihilo: Creatio-1.12.2-0.4.7.2
if (project.debug_all.toBoolean() || project.debug_exnihilocreatio.toBoolean()) {
runtimeOnly rfg.deobf("curse.maven:shadowfacts-forgelin-248453:2785465")
runtimeOnly rfg.deobf("curse.maven:ex-nihilo-creatio-274456:2817545")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.github.gtexpert.gtmt.api.unification.material.info;

import gregtech.api.unification.material.info.MaterialIconType;

public class GTMTMaterialIconType {

// Ex Nihilo: Creatio
public static final MaterialIconType oreChunk = new MaterialIconType("oreChunk");
public static final MaterialIconType oreEnderChunk = new MaterialIconType("oreEnderChunk");
public static final MaterialIconType oreNetherChunk = new MaterialIconType("oreNetherChunk");
public static final MaterialIconType oreSandyChunk = new MaterialIconType("oreSandyChunk");
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.github.gtexpert.gtmt.api.unification.material.ore;

import static gregtech.api.unification.ore.OrePrefix.Conditions.hasOreProperty;
import static gregtech.api.unification.ore.OrePrefix.Flags.ENABLE_UNIFICATION;

import gregtech.api.unification.ore.OrePrefix;

import com.github.gtexpert.gtmt.api.unification.material.info.GTMTMaterialIconType;

public class GTMTOrePrefix {

// Ex Nihilo: Creatio

public static final OrePrefix oreChunk = new OrePrefix("oreChunk", -1, null, GTMTMaterialIconType.oreChunk,
ENABLE_UNIFICATION, hasOreProperty);
public static final OrePrefix oreEnderChunk = new OrePrefix("oreEnderChunk", -1, null,
GTMTMaterialIconType.oreEnderChunk, ENABLE_UNIFICATION, hasOreProperty);
public static final OrePrefix oreNetherChunk = new OrePrefix("oreNetherChunk", -1, null,
GTMTMaterialIconType.oreNetherChunk, ENABLE_UNIFICATION, hasOreProperty);
public static final OrePrefix oreSandyChunk = new OrePrefix("oreSandyChunk", -1, null,
GTMTMaterialIconType.oreSandyChunk, ENABLE_UNIFICATION, hasOreProperty);
}
2 changes: 2 additions & 0 deletions src/main/java/com/github/gtexpert/gtmt/api/util/Mods.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public enum Mods {
EnderIOMachines(Names.ENDER_MACHINES),
EnderIOConduits(Names.ENDER_CONDUITS),
EnderIOAE2Conduits(Names.ENDER_AE2_CONDUITS),
ExNihilo(Names.EX_NIHILO),
ExtraCPUs(Names.EXTRA_CPUS),
GalacticraftCore(Names.GALACTICRAFT_CORE),
GregicalityMultiblocks(Names.GREGICALITY_MULTIBLOCKS),
Expand Down Expand Up @@ -116,6 +117,7 @@ public static class Names {
public static final String ENDER_MACHINES = "enderiomachines";
public static final String ENDER_CONDUITS = "enderioconduits";
public static final String ENDER_AE2_CONDUITS = "enderioconduitsappliedenergistics";
public static final String EX_NIHILO = "exnihilocreatio";
public static final String EXTRA_BEES = "extrabees";
public static final String EXTRA_CPUS = "extracpus";
public static final String EXTRA_TREES = "extratrees";
Expand Down
Loading