Skip to content

Commit

Permalink
Update Neo
Browse files Browse the repository at this point in the history
  • Loading branch information
pupnewfster committed May 4, 2024
1 parent 507c83d commit c4442fc
Show file tree
Hide file tree
Showing 45 changed files with 87 additions and 91 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/general_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
description: What version of Minecraft are you using?
options:
- 1.20.4 (Latest)
- 1.20.6 (Dev Branch, Manually Compiled)
- 1.20.1 or earlier (No longer being developed)
validations:
required: true
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ minecraft_version=1.20.6
previous_minecraft_version=1.20.1
previous_minor_minecraft_version=1.20.4
loader_version_range=[2,)
forge_version=20.6.22-beta
forge_version=20.6.31-beta
mod_version=10.5.20
#This determines the minimum version of forge required to use Mekanism
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
forge_version_range=[20.6.22-beta,)
forge_version_range=[20.6.23-beta,)
minecraft_version_range=[1.20.6]
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
# options are: alpha, beta, release
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public record WalkieData(int channel, boolean running) {
public static final WalkieData DEFAULT = new WalkieData(1, false);

public static final Codec<WalkieData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
//TODO - 1.20.5: Validate this range
ExtraCodecs.intRange(1, 8).fieldOf(NBTConstants.CHANNEL).forGetter(WalkieData::channel),
Codec.BOOL.fieldOf(NBTConstants.RUNNING).forGetter(WalkieData::running)
).apply(instance, WalkieData::new));
Expand Down
2 changes: 0 additions & 2 deletions src/api/java/mekanism/api/chemical/ChemicalStack.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ protected static <CHEMICAL extends Chemical<CHEMICAL>> Codec<CHEMICAL> chemicalN
*/
protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalStack<CHEMICAL>> MapCodec<STACK> codec(Codec<CHEMICAL> nonEmptyCodec,
BiFunction<CHEMICAL, Long, STACK> constructor) {
//TODO - 1.20.5: Figure out if this needs to be lazily initialized. I don't think it does, but for fluids and items it is, probably because of components?
return RecordCodecBuilder.mapCodec(instance -> instance.group(
nonEmptyCodec.fieldOf(NBTConstants.ID).forGetter(ChemicalStack::getChemical),
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(JsonConstants.AMOUNT).forGetter(ChemicalStack::getAmount)
Expand All @@ -78,7 +77,6 @@ protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalSta
*/
protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalStack<CHEMICAL>> Codec<STACK> fixedAmountCodec(
Codec<CHEMICAL> chemicalNonEmptyCodec, BiFunction<CHEMICAL, Long, STACK> constructor, long amount) {
//TODO - 1.20.5: Figure out if this needs to be lazily initialized. I don't think it does, but for fluids and items it is, probably because of components?
return RecordCodecBuilder.create(instance -> instance.group(
chemicalNonEmptyCodec.fieldOf(NBTConstants.ID).forGetter(ChemicalStack::getChemical)
).apply(instance, holder -> constructor.apply(holder, amount)));
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c4442fc

Please sign in to comment.