Skip to content

Commit

Permalink
I updated the Initial and Rebrand to 1.20.6 but still needs alot of work
Browse files Browse the repository at this point in the history
  • Loading branch information
Pan-cakse committed May 18, 2024
1 parent 1fff90d commit 8b1c96e
Show file tree
Hide file tree
Showing 34 changed files with 495 additions and 1,047 deletions.
12 changes: 5 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.11"
id("io.papermc.paperweight.patcher") version "1.7.1"
}

allprojects {
Expand All @@ -14,7 +13,7 @@ allprojects {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
}
}
Expand All @@ -24,7 +23,7 @@ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
subprojects {
tasks.withType<JavaCompile>().configureEach {
options.encoding = Charsets.UTF_8.name()
options.release = 17
options.release = 21
}
tasks.withType<Javadoc> {
options.encoding = Charsets.UTF_8.name()
Expand Down Expand Up @@ -93,20 +92,19 @@ paperweight {

tasks.generateDevelopmentBundle {
apiCoordinates = "xyz.icecreammc.icecream:icecream-api"
mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
libraryRepositories.set(
listOf(
"https://repo.maven.apache.org/maven2/",
paperMavenPublicUrl,
"https://repo.icecreammc.xyz/snapshots",
"https://repo.purpurmc.org/snapshots",
)
)
}

allprojects {
publishing {
repositories {
maven("https://repo.icecreammc.xyz/snapshots") {
maven("https://repo.purpurmc.org/snapshots") {
name = "icecream"
credentials(PasswordCredentials::class)
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ group = xyz.icecreammc.icecream
icecreamVersion = 1.38

# Minecraft Version
version = 1.20.4-R0.1-SNAPSHOT
mcVersion = 1.20.4
version = 1.20.5-R0.1-SNAPSHOT
mcVersion = 1.20.6

# Upstream
purpurCommit = 6b1ee98f813ee19f8046b3c528feeee61840a35b
purpurCommit = 9dcfdf13c206866ec56b4044f4a7905886a669ea

# Gradle Settings
org.gradle.caching = true
Expand Down
7 changes: 7 additions & 0 deletions history.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
1 git add .
2 ./gradlew rebuildPatches
3 ./gradlew applyPatches
4 ./gradlew createServerJar
5 ./gradlew applyPatches
6 ./gradlew createServerJar
7 history > history.txt
File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
43 changes: 43 additions & 0 deletions patches/api/0001-Initial.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pancakse <84547061+Pan-cakse@users.noreply.github.com>
Date: Sat, 18 May 2024 01:39:05 +0000
Subject: [PATCH] Initial


diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 7107eabf02d9d9b69d97c978ba421ad52031ec3f..6e0237d3f6b2d0c092ffe17e355ea8648ac913f2 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -25,6 +25,14 @@ public interface ServerBuildInfo {
Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
// Purpur end

+ // IceCream start
+ /**
+ * The brand id for IceCream.
+ */
+ Key BRAND_ICECREAM_ID = Key.key("icecreammc", "icecream");
+ // IceCream end
+
+
/**
* Gets the {@code ServerBuildInfo}.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ec8b9b2cbe65838a194281f7d76d0e17defc5211..7002a3b642e728343886c46607e20213ac1b8adf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2269,6 +2269,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Purpur end

+ // IceCream start
+ @NotNull
+ public org.bukkit.configuration.file.YamlConfiguration getIceCreamConfig() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // IceCream end
+
/**
* Sends the component to the player
*
82 changes: 0 additions & 82 deletions patches/api/0002-Disable-Reload-Command.patch

This file was deleted.

0 comments on commit 8b1c96e

Please sign in to comment.