Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
5835fe3
Update to MC 1.21.4
rubensworks Jan 25, 2025
98d903a
Fix datapack issues in 1.12.4
rubensworks Jan 26, 2025
e6dbdfc
Restore rendering of basic items
rubensworks Jan 26, 2025
7d066a7
Restore battery item rendering
rubensworks Jan 29, 2025
b05f488
Restore variable rendering
rubensworks Jan 30, 2025
ab6ae1b
Restore cable item rendering
rubensworks Feb 1, 2025
4237242
Fix incorrect Menril Torch item models
rubensworks Feb 1, 2025
a0a9287
Fix empty variable slot rendering broken
rubensworks Feb 1, 2025
3ee33ae
Fix facade name
rubensworks Feb 1, 2025
81536c1
Restore facade item rendering
rubensworks Feb 1, 2025
4d704fd
Fix redstone writer changes not updating neighbours correctly
rubensworks Feb 1, 2025
27ea55b
Fix aspect-based game tests
rubensworks Feb 1, 2025
11d31f7
Fix offset-based redstone writing
rubensworks Feb 2, 2025
2f30bd9
Fix failing itemstack operator tests
rubensworks Feb 2, 2025
2b7ae23
Remove deprecated methods
rubensworks Feb 2, 2025
53bd8a3
Bump CyclopsCore version
rubensworks Feb 2, 2025
cef2379
Fix color overlays not showing
rubensworks Feb 15, 2025
ae4ea2c
Improve performance of block changes to very large networks
Lssikkes Mar 1, 2025
a58e5aa
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 8, 2025
bd59cb1
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 10, 2025
d10b4f1
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 12, 2025
453093e
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 22, 2025
23bf163
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Apr 4, 2025
4d1032b
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Apr 20, 2025
fc4c479
Fix failing CI build
rubensworks Apr 20, 2025
75926bc
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 3, 2025
badf885
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 4, 2025
9941912
Bump gradle memory
rubensworks May 4, 2025
4670125
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 20, 2025
0cda8b2
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 25, 2025
b16c714
Bump ComCaps version
rubensworks May 31, 2025
ec3a344
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 31, 2025
206c2eb
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 31, 2025
5891140
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks May 31, 2025
70979f7
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jun 7, 2025
287ed0b
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jun 12, 2025
e538441
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jun 21, 2025
9f01835
Update to MC 1.21.7
rubensworks Jul 22, 2025
8960da9
Fix console spam when clearing game tests with cables
rubensworks Jul 27, 2025
7c5cf57
Fix offset rendering crash
rubensworks Jul 27, 2025
14c1e3f
Fix world storage
rubensworks Jul 27, 2025
8be6677
Resolve minor TODOs
rubensworks Jul 27, 2025
cd8e654
Fix labels being kept across games
rubensworks Jul 28, 2025
d5ef416
Fix SMP issues in logic programmer
rubensworks Jul 28, 2025
38ec9a1
Fix incorrect item display panel rendering
rubensworks Jul 28, 2025
77319f0
Fix advancements with broken display icons
rubensworks Jul 28, 2025
3d67c4e
Add isNetworkInitializing param to updateActivation
rubensworks Jul 28, 2025
bb9983d
Fix game tests sometimes failing
rubensworks Jul 28, 2025
b8bc682
Remove unnecessary setChanged override in LP
rubensworks Jul 28, 2025
75bea69
Remove deprecated functionality
rubensworks Jul 28, 2025
d2bdb79
Bump CommonCaps version
rubensworks Jul 28, 2025
ae2462c
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jul 29, 2025
fd3624b
Update to MC 1.21.8
rubensworks Jul 29, 2025
602c941
Only run game tests when enabled via system property
rubensworks Aug 3, 2025
ef827bb
Make ItemStack serialization more compact
rubensworks Aug 3, 2025
6062bad
Fix recipe overlay not changing on shift
rubensworks Aug 7, 2025
7dacb87
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Aug 8, 2025
3da5fd9
Add Squeezer dye recipes for new Vanilla items
rubensworks Aug 19, 2025
a2a0336
Restore mod compat
rubensworks Aug 21, 2025
83f3248
Fix crash due to wrong Lists import, Closes #1551
rubensworks Oct 9, 2025
87f2e28
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Oct 9, 2025
0a84600
Deprecate IIngredientComponentHandler
rubensworks Oct 9, 2025
bf4c44c
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Oct 11, 2025
9bdd911
Add side param to onNeighborBlockChange
rubensworks Oct 17, 2025
8c09795
Fix broken wind charge squeezer recipes
rubensworks Oct 17, 2025
f57cb9c
Fix broken block-update-based aspect invalidation
rubensworks Oct 17, 2025
140d571
Fix incorrect item (de)serialization when count is > 99
rubensworks Oct 17, 2025
40f2b1c
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 11, 2025
b9e182e
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 15, 2025
6224eb0
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 16, 2025
a147731
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 18, 2025
d8b01b2
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 18, 2025
8b97dc8
Fix operator deserialization failing with specific serializers
rubensworks Nov 21, 2025
0d4648d
Delegate onBlockNeighborChange to old version for backwards-compat
rubensworks Nov 21, 2025
8d07609
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 22, 2025
45f48bf
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 24, 2025
aac8aea
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Nov 25, 2025
623cd68
Fix rare startup crash due to mod ordering
rubensworks Nov 26, 2025
76a8036
Update to MC 1.21.10
rubensworks Dec 14, 2025
8ec2f2c
Remove deprecations
rubensworks Dec 14, 2025
0813ca3
Fixed nested root transactions in IngredientChannelAdapter
rubensworks Dec 15, 2025
5a856c5
Fix game test coverage not being reported
rubensworks Dec 16, 2025
37ae805
Fix battery items not being modified through the energy capability
rubensworks Dec 16, 2025
a96fdf0
Update to MC 1.21.11
rubensworks Dec 19, 2025
92c87e8
Remove deprecated IIngredientComponentValueHandler
rubensworks Dec 19, 2025
35f6f9f
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Dec 19, 2025
9752f99
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Dec 23, 2025
17a3a4f
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Dec 28, 2025
f7f9ad5
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Dec 31, 2025
d524958
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jan 2, 2026
52e38e0
Bump to MDG 2.0.137
rubensworks Jan 2, 2026
bc5a602
Fix crash on mechanical drying basin auto-export, Closes #1585
rubensworks Jan 3, 2026
08f6944
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jan 17, 2026
7f4e3f7
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Jan 24, 2026
5cbe03c
Let tooltip operators return advanced tooltips instead of basic
rubensworks Feb 4, 2026
ccefcff
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Feb 15, 2026
afcef23
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Feb 17, 2026
1be6283
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Feb 19, 2026
9a98fce
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Feb 19, 2026
2fd4d78
Remove Lombok dependency (#1604)
Copilot Feb 19, 2026
258c9e9
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Feb 28, 2026
de8729e
Fix compilation of GameTestsFuzzing and NetworkFuzzer for MC 1.21.1
rubensworks Feb 28, 2026
c07705d
Fix fuzzing failing due to pre-existing variable stores
rubensworks Feb 28, 2026
1e5e38a
Fix server crash when operators receive empty ItemStack (#1618)
Copilot Feb 28, 2026
79d70e8
Run fuzzing as separate dedicated tests
rubensworks Feb 28, 2026
1ad1486
Fix crash when drying rotten flesh (no fluid input) in drying basin (…
Copilot Mar 6, 2026
2a8824a
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 8, 2026
3bd1dc6
Merge remote-tracking branch 'origin/master-1.21' into master-1.21
rubensworks Mar 8, 2026
2d621f6
Fix 3 failing game tests: update serialized value format in advanceme…
Copilot Mar 8, 2026
3fcf292
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 9, 2026
8c36a3c
Fix changelog compare URL when no release exists for current Minecraf…
rubensworks Mar 13, 2026
95760a8
Fix writer parts breaking after world restart, Closes #1628
rubensworks Mar 20, 2026
3a55607
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 20, 2026
477351a
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
rubensworks Mar 28, 2026
ea7c7a1
Update to MC 26.1.1
rubensworks Apr 5, 2026
d6ca35c
Fix broken energy battery item overlay rendering
rubensworks Apr 6, 2026
fdbc224
Improve recipe variable card rendering
rubensworks Apr 6, 2026
d05cada
Fix broken variable card overlay rendering
rubensworks Apr 7, 2026
dde4709
Fix missing model and texture issues
rubensworks Apr 7, 2026
302ccf1
Migrate to new CyclopsCore fluid config with model registration
rubensworks Apr 7, 2026
19d255f
Fix crash when rendering facade item
rubensworks Apr 7, 2026
a02b8b0
Restore fluid display overlay
rubensworks Apr 7, 2026
ea01c8a
Add jar locations to AGENTS.md
rubensworks Apr 7, 2026
971b3da
Fix world load failure caused by non-singleton recipe instances (#1644)
Copilot Apr 9, 2026
95a091a
Fix intermittent day/night game test failures by explicitly overridin…
Copilot Apr 9, 2026
33330c6
Fix NPE crash when rendering fluids with null fluidTintSource (#1648)
Copilot Apr 9, 2026
a349fe6
Include build number in mod version metadata
rubensworks Apr 10, 2026
55f6bf0
Sync mod versions with 1.21-lts branch
rubensworks Apr 10, 2026
5cef90c
Bump mod version
rubensworks Apr 10, 2026
c75b0c4
Restore JEI and Terrablender mod compats
rubensworks Apr 11, 2026
afa59b5
Add translations through Crowdin
crowdin-bot Apr 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 10 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ mc-1.20:
- 'Minecraft: 1.20'
mc-1.21:
- 'Minecraft: 1.21'
mc-1.22:
- 'Minecraft: 1.22'
mc-1.23:
- 'Minecraft: 1.23'
mc-1.24:
- 'Minecraft: 1.24'
mc-1.25:
- 'Minecraft: 1.25'
mc-26:
- 'Minecraft: 26'
mc-27:
- 'Minecraft: 27'
mc-28:
- 'Minecraft: 28'
mc-29:
- 'Minecraft: 29'
mc-30:
- 'Minecraft: 30'
2 changes: 1 addition & 1 deletion .github/parse_benchmark_results.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set -e

BENCH_FILE="benchmark_results.json"
RESULTS_FILE="runs/gameTestServer/logs/benchmark_results.txt"
RESULTS_FILE="run/logs/benchmark_results.txt"

echo "Parsing benchmark results..."

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'microsoft'
java-version: 21
java-version: 25
- name: 'Setup Gradle'
uses: gradle/actions/setup-gradle@v4
with:
Expand Down Expand Up @@ -86,4 +86,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: build/docs/javadoc
clean: true
clean: true
10 changes: 5 additions & 5 deletions .github/workflows/fuzzing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
workflow_dispatch: # Allow manual triggering for testing
push:
paths:
- src/integrationtest/java/org/cyclops/integrateddynamics/gametest/GameTestsFuzzing.java
- src/integrationtest/java/org/cyclops/integrateddynamics/gametest/fuzzing/**
- src/main/java/org/cyclops/integrateddynamics/gametest/GameTestsFuzzing.java
- src/main/java/org/cyclops/integrateddynamics/gametest/fuzzing/**
- .github/workflows/fuzzing.yml
pull_request:
paths:
- src/integrationtest/java/org/cyclops/integrateddynamics/gametest/GameTestsFuzzing.java
- src/integrationtest/java/org/cyclops/integrateddynamics/gametest/fuzzing/**
- src/main/java/org/cyclops/integrateddynamics/gametest/GameTestsFuzzing.java
- src/main/java/org/cyclops/integrateddynamics/gametest/fuzzing/**
- .github/workflows/fuzzing.yml

concurrency:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
if: always()
with:
name: fuzzing-crash-structures.zip
path: runs/gameTestServer/fuzzing_crashes/
path: run/fuzzing_crashes/
if-no-files-found: ignore
- name: 'Create issue for fuzzing failure'
if: failure() && steps.fuzzing.outcome == 'failure'
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ logs/
# Ignore files specific to dev environments
secrets.properties
changelog.txt

.cache
config
6 changes: 6 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ Understanding this architecture is crucial when making changes:
- **`loader-forge/`**: Forge-specific implementation and integration code (for older Minecraft versions).
- **`loader-neoforge/`**: NeoForge-specific implementation and integration code (for newer Minecraft versions).

For NeoForge, relevant jars can for example be found in the following locations:

- Minecraft merged jar: `build/moddev/artifacts/minecraft-patched-26.1.1.1-beta-merged.jar`
- NeoForge: `~/.gradle/caches/modules-2/files-2.1/net.neoforged/neoforge/26.1.1.1-beta/214ad5aa883deaf6d71298baf4232bb994305f36/neoforge-26.1.1.1-beta-universal.jar`
- CyclopsCore source: `~/.m2/repository/org/cyclops/cyclopscore/cyclopscore-26.1.1-neoforge/1.25.5-DEV/cyclopscore-26.1.1-neoforge-1.25.5-DEV-sources.jar`

### Making Changes in Multi-loader Setups

When adding features or fixing bugs:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG-26.1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changelog for Minecraft 26.1.1
All notable changes to this project will be documented in this file.

<a name="26.1.1-1.32.3"></a>
## [26.1.1-1.32.3] - 2026-04-10 14:38:29


Initial 26.1.1 release
2 changes: 1 addition & 1 deletion CHANGELOG.md
2 changes: 1 addition & 1 deletion PERFORMANCE_BENCHMARKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ This command:
2. Runs `GameTestsPerformance` game tests
3. Generates networks of different sizes with different presets
4. Measures performance metrics
5. Writes results to `runs/gameTestServer/logs/benchmark_results.txt`
5. Writes results to `run/logs/benchmark_results.txt`

Similarly, if you want to run the fuzzing tests, you can use:
```bash
Expand Down
9 changes: 1 addition & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ All stable releases (including deobfuscated builds) can be found on [CurseForge]

### Branching Strategy

For every major Minecraft version, two branches exist:

* `master-{mc_version}`: Latest (potentially unstable) development.
* `release-{mc_version}`: Latest stable release for that Minecraft version. This is also tagged with all mod releases.
For every major Minecraft version, a `master-{mc_version} branch exists.

### Building and setting up a development environment

Expand All @@ -39,10 +36,6 @@ Alternatively, you can use the environment variables `MAVEN_USERNAME` (your gith

Run `./gradlew test` to run the test suite, and `./gradlew build` to build the mod. The resulting jar file will be in `build/libs`.

If you're using IntelliJ, you can also run `./gradlew genIntellijRuns` to set up some useful run configurations, such as the ability to build this mod and run minecraft in one step.

This mod uses [Project Lombok](http://projectlombok.org/) -- an annotation processor that allows us to generate constructors, getters and setters using annotations -- to speed up recurring tasks and keep part of our codebase clean at the same time. Because of this it is advised that you install a plugin for your IDE that supports Project Lombok. Should you encounter any weird errors concerning missing getter or setter methods, it's probably because your code has not been processed by Project Lombok's processor. A list of Project Lombok plugins can be found [here](http://projectlombok.org/download.html).

### License
All code and images are licensed under the [MIT License](https://github.com/CyclopsMC/IntegratedDynamics/blob/master-1.8/LICENSE.txt)
This mod packages [re2j](https://github.com/google/re2j/) in order to provide linear time regex matching.
Loading
Loading