-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.20.1' into ldlib-dump
- Loading branch information
Showing
197 changed files
with
1,537 additions
and
498 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/item/rubber_boat.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "gtceu:item/rubber_boat" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/item/rubber_chest_boat.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "gtceu:item/rubber_chest_boat" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/item/treated_wood_boat.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "gtceu:item/treated_wood_boat" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/item/treated_wood_chest_boat.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "gtceu:item/treated_wood_chest_boat" | ||
| } | ||
| } |
7 changes: 5 additions & 2 deletions
7
src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| { | ||
| "values": [ | ||
| "gtceu:rubber_log" | ||
| "gtceu:rubber_log", | ||
| "gtceu:stripped_rubber_log", | ||
| "gtceu:rubber_wood", | ||
| "gtceu:stripped_rubber_wood" | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/main/java/com/gregtechceu/gtceu/api/codec/DispatchedMapCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package com.gregtechceu.gtceu.api.codec; | ||
|
|
||
| import com.gregtechceu.gtceu.GTCEu; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import com.mojang.datafixers.util.Pair; | ||
| import com.mojang.datafixers.util.Unit; | ||
| import com.mojang.serialization.*; | ||
| import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public record DispatchedMapCodec<K, V>( | ||
| Codec<K> keyCodec, | ||
| Function<K, Codec<? extends V>> valueCodecFunction) | ||
| implements Codec<Map<K, V>> { | ||
|
|
||
| @Override | ||
| public <T> DataResult<T> encode(final Map<K, V> input, final DynamicOps<T> ops, final T prefix) { | ||
| final RecordBuilder<T> mapBuilder = ops.mapBuilder(); | ||
| for (final Map.Entry<K, V> entry : input.entrySet()) { | ||
| mapBuilder.add(keyCodec.encodeStart(ops, entry.getKey()), | ||
| encodeValue(valueCodecFunction.apply(entry.getKey()), entry.getValue(), ops)); | ||
| } | ||
| return mapBuilder.build(prefix); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private <T, V2 extends V> DataResult<T> encodeValue(final Codec<V2> codec, final V input, final DynamicOps<T> ops) { | ||
| return codec.encodeStart(ops, (V2) input); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> DataResult<Pair<Map<K, V>, T>> decode(final DynamicOps<T> ops, final T input) { | ||
| return ops.getMap(input).flatMap(map -> { | ||
| final Map<K, V> entries = new Object2ObjectArrayMap<>(); | ||
| final Stream.Builder<Pair<T, T>> failed = Stream.builder(); | ||
|
|
||
| final DataResult<Unit> finalResult = map.entries().reduce( | ||
| DataResult.success(Unit.INSTANCE, Lifecycle.stable()), | ||
| (result, entry) -> parseEntry(result, ops, entry, entries, failed), | ||
| (r1, r2) -> r1.apply2stable((u1, u2) -> u1, r2)); | ||
|
|
||
| final Pair<Map<K, V>, T> pair = Pair.of(ImmutableMap.copyOf(entries), input); | ||
| final T errors = ops.createMap(failed.build()); | ||
|
|
||
| return finalResult.map(ignored -> pair).setPartial(pair) | ||
| .mapError(error -> error + " missed input: " + errors); | ||
| }); | ||
| } | ||
|
|
||
| private <T> DataResult<Unit> parseEntry(final DataResult<Unit> result, final DynamicOps<T> ops, | ||
| final Pair<T, T> input, final Map<K, V> entries, | ||
| final Stream.Builder<Pair<T, T>> failed) { | ||
| final DataResult<K> keyResult = keyCodec.parse(ops, input.getFirst()); | ||
| final DataResult<V> valueResult = keyResult.map(valueCodecFunction) | ||
| .flatMap(valueCodec -> valueCodec.parse(ops, input.getSecond()).map(Function.identity())); | ||
| final DataResult<Pair<K, V>> entryResult = keyResult.apply2stable(Pair::of, valueResult); | ||
|
|
||
| final Optional<Pair<K, V>> entry = entryResult.resultOrPartial(GTCEu.LOGGER::error); | ||
| if (entry.isPresent()) { | ||
| final K key = entry.get().getFirst(); | ||
| final V value = entry.get().getSecond(); | ||
| if (entries.putIfAbsent(key, value) != null) { | ||
| failed.add(input); | ||
| return result.apply2stable((u, p) -> u, | ||
| DataResult.error(() -> "Duplicate entry for key: '" + key + "'")); | ||
| } | ||
| } | ||
| if (entryResult.error().isPresent()) { | ||
| failed.add(input); | ||
| } | ||
|
|
||
| return result.apply2stable((u, p) -> u, entryResult); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.