Skip to content

Commit c8e6e2f

Browse files
committed
1.18-rc1
1 parent eb9a18a commit c8e6e2f

File tree

6 files changed

+9
-19
lines changed

6 files changed

+9
-19
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
# Use these Java versions
14-
java: [16]
14+
java: [17]
1515
# and run on both Linux and Windows
1616
os: [ubuntu-20.04, windows-latest]
1717
runs-on: ${{ matrix.os }}

.github/workflows/javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
- name: Set up JDK 1.8
14+
- name: Set up JDK
1515
uses: actions/setup-java@v1
1616
with:
17-
java-version: 16
17+
java-version: 17
1818
- name: Grant execute permission for gradlew
1919
run: chmod +x gradlew
2020
- name: Build with Gradle

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up JDK
2626
uses: actions/setup-java@v1
2727
with:
28-
java-version: 16
28+
java-version: 17
2929

3030
- name: Grant execute permission for gradlew
3131
run: chmod +x gradlew

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
5-
minecraft_version=1.18-pre1
6-
yarn_mappings=1.18-pre1+build.3
5+
minecraft_version=1.18-rc1
6+
yarn_mappings=1.18-rc1+build.1
77
loader_version=0.12.5
88

99
#Fabric api
10-
fabric_version=0.42.2+1.18
10+
fabric_version=0.43.1+1.18
1111

1212
# Mod Properties
13-
mod_version = 0.4.1
13+
mod_version = 0.4.2
1414
maven_group = org.samo_lego
1515
archives_base_name = golfiv
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https://services.gradle.org/distributions-snapshots/gradle-7.4-20211124232407+0000-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/org/samo_lego/golfiv/mixin/duplication/ItemStackMixin_SavePatch.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,21 @@
1717
public abstract class ItemStackMixin_SavePatch {
1818
@Shadow public abstract void setCount(int count);
1919

20-
@Shadow public abstract String getTranslationKey();
21-
2220
@Shadow public abstract Item getItem();
2321

24-
@Shadow public abstract int getCount();
25-
2622
@Inject(method = "writeNbt(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;", at = @At("HEAD"), cancellable = true)
2723
private void writeStack(NbtCompound nbt, CallbackInfoReturnable<NbtCompound> cir) {
2824
if(golfConfig.duplication.patchItemSave) {
29-
System.out.println("Saving " + this.getTranslationKey());
30-
3125
ItemStack copy = ((ItemStack) (Object) this).copy();
3226
this.setCount(0);
3327

34-
System.out.println("This: " + this.getCount() + " vs copy: " + copy);
35-
3628
Identifier identifier = Registry.ITEM.getId(copy.getItem());
3729
nbt.putString("id", identifier.toString());
3830
nbt.putByte("Count", (byte)copy.getCount());
3931
if (copy.getNbt() != null) {
4032
nbt.put("tag", copy.getNbt().copy());
4133
}
4234

43-
System.out.println(nbt);
44-
4535
cir.setReturnValue(nbt);
4636
}
4737
}

0 commit comments

Comments
 (0)